From 8b78d826fa1429759dcb656f9d8866fc22bdb020 Mon Sep 17 00:00:00 2001 From: Veli Date: Mon, 22 Jan 2018 19:23:45 +0300 Subject: [PATCH] missing changes --- app/build.gradle | 4 +- .../TrebleShot/activity/HomeActivity.java | 10 +--- .../activity/PreferencesActivity.java | 46 +++++++++++++++++-- .../activity/TransactionActivity.java | 2 - .../adapter/ApplicationListAdapter.java | 1 - .../TrebleShot/adapter/FileListAdapter.java | 10 ++-- .../TrebleShot/adapter/ImageListAdapter.java | 1 - .../TrebleShot/adapter/MusicListAdapter.java | 2 - .../adapter/NetworkDeviceListAdapter.java | 4 -- .../adapter/TextStreamListAdapter.java | 2 - .../adapter/TransactionGroupListAdapter.java | 3 +- .../adapter/TransactionListAdapter.java | 1 - .../TrebleShot/adapter/VideoListAdapter.java | 1 - .../genonbeta/TrebleShot/app/Activity.java | 4 +- .../TrebleShot/app/ShareableListFragment.java | 5 -- .../dialog/ConnectionChooserDialog.java | 2 - .../TrebleShot/dialog/DeviceInfoDialog.java | 2 - .../fragment/FileExplorerFragment.java | 2 - .../TrebleShot/fragment/FileListFragment.java | 2 - .../fragment/ImageListFragment.java | 24 +++++----- .../fragment/NetworkDeviceListFragment.java | 5 -- .../fragment/TextStreamListFragment.java | 1 - .../fragment/TransactionListFragment.java | 1 - .../TrebleShot/object/Comparable.java | 2 + .../TrebleShot/object/Selectable.java | 2 + .../TrebleShot/object/TransferInstance.java | 1 - .../receiver/NetworkStatusReceiver.java | 4 +- .../service/CommunicationService.java | 4 -- .../service/DeviceScannerService.java | 2 - .../TrebleShot/util/NetworkUtils.java | 1 - .../genonbeta/TrebleShot/util/TimeUtils.java | 1 - .../TrebleShot/util/UpdateUtils.java | 1 - .../widget/EditableListAdapter.java | 1 - .../TrebleShot/widget/PowerfulActionMode.java | 4 -- .../activity_transaction.xml | 1 - .../res/menu/action_mode_abs_editable.xml | 2 +- .../res/menu/actions_abs_editable_list.xml | 2 +- .../res/menu/actions_preferences_main.xml | 4 +- app/src/main/res/values-tr/strings.xml | 3 ++ app/src/main/res/values/strings.xml | 3 ++ app/src/main/res/xml/preferences_main.xml | 8 ++++ 41 files changed, 88 insertions(+), 93 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 54291577..87845c93 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.genonbeta.TrebleShot" minSdkVersion 14 targetSdkVersion 26 - versionCode 56 - versionName "1.2.5.1" + versionCode 57 + versionName "1.2.5.2" } lintOptions { diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/HomeActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/HomeActivity.java index a8609748..a905e613 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/activity/HomeActivity.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/activity/HomeActivity.java @@ -9,14 +9,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.os.Message; -import android.os.PersistableBundle; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.NavigationView; -import android.support.design.widget.Snackbar; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.ContextCompat; @@ -25,7 +22,6 @@ import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; @@ -152,8 +148,7 @@ public void onInfoAvailable(boolean newVersion, String versionName, String title .putInt("migrated_version", localDevice.versionNumber) .apply(); - if (!checkCurrentRequestedFragment(getIntent())) - { + if (!checkCurrentRequestedFragment(getIntent())) { changeFragment(mFragmentDeviceList); mNavigationView.setCheckedItem(R.id.menu_activity_main_device_list); } @@ -302,8 +297,7 @@ public void run() if (!mIsStopped) { ft.commit(); mCommitFailedFragment = null; - } - else + } else mCommitFailedFragment = fragment; setTitle(fragment instanceof TitleSupport diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/PreferencesActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/PreferencesActivity.java index 5ad9e1cd..c2786ce6 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/activity/PreferencesActivity.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/activity/PreferencesActivity.java @@ -1,10 +1,18 @@ package com.genonbeta.TrebleShot.activity; +import android.content.DialogInterface; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.preference.PreferenceManager; +import android.support.v7.app.AlertDialog; +import android.view.Menu; import android.view.MenuItem; import com.genonbeta.TrebleShot.R; import com.genonbeta.TrebleShot.app.Activity; +import com.genonbeta.TrebleShot.fragment.PreferencesFragment; +import com.genonbeta.TrebleShot.util.AppUtils; public class PreferencesActivity extends Activity { @@ -23,11 +31,41 @@ public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); - if (id == android.R.id.home) { + if (id == android.R.id.home) finish(); - return true; - } + else if (id == R.id.actions_preference_main_reset_to_defaults) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); - return super.onOptionsItemSelected(item); + builder.setTitle(R.string.ques_resetToDefault); + builder.setMessage(R.string.text_resetPreferencesToDefaultSummary); + builder.setNegativeButton(R.string.butn_cancel, null); + builder.setPositiveButton(R.string.butn_proceed, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + + sharedPreferences.edit() + .clear() + .apply(); + + PreferenceManager.setDefaultValues(PreferencesActivity.this, R.xml.preferences_main, true); + finish(); + } + }); + + builder.show(); + } else + return super.onOptionsItemSelected(item); + + return true; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + getMenuInflater().inflate(R.menu.actions_preferences_main, menu); + return super.onCreateOptionsMenu(menu); } } diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/TransactionActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/TransactionActivity.java index 44b592c5..9d7ec1b4 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/activity/TransactionActivity.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/activity/TransactionActivity.java @@ -45,10 +45,8 @@ import com.genonbeta.TrebleShot.service.CommunicationService; import com.genonbeta.TrebleShot.util.AppUtils; import com.genonbeta.TrebleShot.util.FileUtils; -import com.genonbeta.TrebleShot.util.NetworkUtils; import com.genonbeta.TrebleShot.util.PowerfulActionModeSupported; import com.genonbeta.TrebleShot.util.TextUtils; -import com.genonbeta.TrebleShot.util.TimeUtils; import com.genonbeta.TrebleShot.widget.PowerfulActionMode; import com.genonbeta.android.database.SQLQuery; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/ApplicationListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/ApplicationListAdapter.java index 6e3ba671..79f09e63 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/ApplicationListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/ApplicationListAdapter.java @@ -19,7 +19,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; public class ApplicationListAdapter extends ShareableListAdapter diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/FileListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/FileListAdapter.java index 766f1ded..f9d32a54 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/FileListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/FileListAdapter.java @@ -4,7 +4,6 @@ import android.net.Uri; import android.os.Build; import android.os.Environment; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -20,7 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; public class FileListAdapter extends ShareableListAdapter { @@ -84,8 +82,7 @@ else if (Build.VERSION.SDK_INT >= 19) if (splitPath.length >= 2 && splitPath[1].equals("storage") && splitPath[splitPath.length - 1].equals(getContext().getPackageName())) { - if (splitPath.length >= 4 && splitPath[2].equals("emulated")) - { + if (splitPath.length >= 4 && splitPath[2].equals("emulated")) { File file = new File(buildPath(splitPath, 4)); if (file.canWrite()) { @@ -123,8 +120,7 @@ public String buildPath(String[] splitPath, int count) { StringBuilder stringBuilder = new StringBuilder(); - for (int i = 0; (i < count && i < splitPath.length); i ++) - { + for (int i = 0; (i < count && i < splitPath.length); i++) { stringBuilder.append(File.separator); stringBuilder.append(splitPath[i]); } @@ -194,7 +190,7 @@ public void onClick(View v) }); } - image.setImageResource(holder.isFolder ? R.drawable.ic_folder_white_24dp: R.drawable.ic_whatshot_white_24dp); + image.setImageResource(holder.isFolder ? R.drawable.ic_folder_white_24dp : R.drawable.ic_whatshot_white_24dp); text1.setText(holder.friendlyName); text2.setText(holder.fileInfo); text3.setText(TimeUtils.getTimeAgo(getContext(), holder.file.lastModified())); diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/ImageListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/ImageListAdapter.java index 9d872704..9a720265 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/ImageListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/ImageListAdapter.java @@ -20,7 +20,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.Locale; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/MusicListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/MusicListAdapter.java index b5fd12aa..eb5ce9c5 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/MusicListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/MusicListAdapter.java @@ -7,7 +7,6 @@ import android.net.Uri; import android.provider.MediaStore; import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.util.ArrayMap; import android.view.View; import android.view.ViewGroup; @@ -22,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; public class MusicListAdapter extends ShareableListAdapter diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/NetworkDeviceListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/NetworkDeviceListAdapter.java index 53deb487..44f8cbff 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/NetworkDeviceListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/NetworkDeviceListAdapter.java @@ -1,11 +1,8 @@ package com.genonbeta.TrebleShot.adapter; -import android.content.Context; import android.net.wifi.ScanResult; import android.net.wifi.WifiInfo; -import android.net.wifi.WifiManager; import android.support.v4.content.ContextCompat; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -17,7 +14,6 @@ import com.genonbeta.TrebleShot.database.AccessDatabase; import com.genonbeta.TrebleShot.fragment.NetworkDeviceListFragment; import com.genonbeta.TrebleShot.object.NetworkDevice; -import com.genonbeta.TrebleShot.util.HotspotUtils; import com.genonbeta.TrebleShot.util.TextUtils; import com.genonbeta.TrebleShot.widget.ListAdapter; import com.genonbeta.android.database.SQLQuery; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TextStreamListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TextStreamListAdapter.java index f4793c54..87a956ea 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TextStreamListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TextStreamListAdapter.java @@ -10,12 +10,10 @@ import com.genonbeta.TrebleShot.object.TextStreamObject; import com.genonbeta.TrebleShot.util.TimeUtils; import com.genonbeta.TrebleShot.widget.EditableListAdapter; -import com.genonbeta.TrebleShot.widget.ShareableListAdapter; import com.genonbeta.android.database.SQLQuery; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; /** * created by: Veli diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionGroupListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionGroupListAdapter.java index a7273b52..f0a29df3 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionGroupListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionGroupListAdapter.java @@ -3,7 +3,6 @@ import android.content.Context; import android.database.Cursor; import android.support.v4.content.ContextCompat; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -170,7 +169,7 @@ public TransactionGroupListAdapter setSelect(SQLQuery.Select select) public static class PreloadedGroup extends TransactionObject.Group - implements Editable + implements Editable { public int transactionCount; public String deviceName; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionListAdapter.java index 27d02fd1..3806fc28 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/TransactionListAdapter.java @@ -12,7 +12,6 @@ import com.genonbeta.TrebleShot.util.FileUtils; import com.genonbeta.TrebleShot.util.TextUtils; import com.genonbeta.TrebleShot.widget.EditableListAdapter; -import com.genonbeta.TrebleShot.widget.ShareableListAdapter; import com.genonbeta.android.database.SQLQuery; import java.io.File; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/adapter/VideoListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/adapter/VideoListAdapter.java index abfe3c68..c81b0ee3 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/adapter/VideoListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/adapter/VideoListAdapter.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; /** * created by: Veli diff --git a/app/src/main/java/com/genonbeta/TrebleShot/app/Activity.java b/app/src/main/java/com/genonbeta/TrebleShot/app/Activity.java index 2dc78ee8..4be6463e 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/app/Activity.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/app/Activity.java @@ -6,11 +6,9 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import com.genonbeta.TrebleShot.R; -import com.genonbeta.TrebleShot.activity.HomeActivity; import com.genonbeta.TrebleShot.dialog.RationalePermissionRequest; import com.genonbeta.TrebleShot.service.CommunicationService; import com.genonbeta.TrebleShot.util.AppUtils; @@ -24,6 +22,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + PreferenceManager.setDefaultValues(this, R.xml.preferences_main, false); + if (Build.VERSION.SDK_INT >= 16) { RationalePermissionRequest storagePermission = new RationalePermissionRequest(this, Manifest.permission.WRITE_EXTERNAL_STORAGE); diff --git a/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java index 3f2d7b54..cdba7371 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java @@ -3,12 +3,9 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.content.FileProvider; import android.support.v7.widget.SearchView; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -19,7 +16,6 @@ import com.genonbeta.TrebleShot.R; import com.genonbeta.TrebleShot.activity.ShareActivity; import com.genonbeta.TrebleShot.io.StreamInfo; -import com.genonbeta.TrebleShot.object.Selectable; import com.genonbeta.TrebleShot.object.Shareable; import com.genonbeta.TrebleShot.util.FileUtils; import com.genonbeta.TrebleShot.widget.PowerfulActionMode; @@ -27,7 +23,6 @@ import java.io.File; import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; public abstract class ShareableListFragment> diff --git a/app/src/main/java/com/genonbeta/TrebleShot/dialog/ConnectionChooserDialog.java b/app/src/main/java/com/genonbeta/TrebleShot/dialog/ConnectionChooserDialog.java index fcedad89..a443192a 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/dialog/ConnectionChooserDialog.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/dialog/ConnectionChooserDialog.java @@ -9,8 +9,6 @@ import android.os.Looper; import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/dialog/DeviceInfoDialog.java b/app/src/main/java/com/genonbeta/TrebleShot/dialog/DeviceInfoDialog.java index 8007fb2a..23b00bd6 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/dialog/DeviceInfoDialog.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/dialog/DeviceInfoDialog.java @@ -9,12 +9,10 @@ import android.support.v7.app.AlertDialog; import android.support.v7.widget.AppCompatButton; import android.support.v7.widget.SwitchCompat; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.CompoundButton; import android.widget.TextView; -import android.widget.Toast; import com.genonbeta.CoolSocket.CoolSocket; import com.genonbeta.TrebleShot.R; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileExplorerFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileExplorerFragment.java index 52f16a21..8bdc6ba5 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileExplorerFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileExplorerFragment.java @@ -3,7 +3,6 @@ import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v4.app.Fragment; import android.support.v7.widget.AppCompatImageButton; @@ -20,7 +19,6 @@ import com.genonbeta.TrebleShot.adapter.PathResolverRecyclerAdapter; import com.genonbeta.TrebleShot.dialog.CreateFolderDialog; import com.genonbeta.TrebleShot.util.DetachListener; -import com.genonbeta.TrebleShot.util.FABSupport; import com.genonbeta.TrebleShot.util.TitleSupport; import java.io.File; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileListFragment.java index 8e64801c..bb7a656a 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/FileListFragment.java @@ -8,7 +8,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.Snackbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -18,7 +17,6 @@ import com.genonbeta.TrebleShot.adapter.FileListAdapter; import com.genonbeta.TrebleShot.app.ShareableListFragment; import com.genonbeta.TrebleShot.dialog.FileDeleteDialog; -import com.genonbeta.TrebleShot.util.AppUtils; import com.genonbeta.TrebleShot.util.FileUtils; import com.genonbeta.TrebleShot.widget.PowerfulActionMode; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/ImageListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/ImageListFragment.java index f1a7c359..5855aacc 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/ImageListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/ImageListFragment.java @@ -12,18 +12,18 @@ import com.genonbeta.TrebleShot.util.TitleSupport; public class ImageListFragment - extends ShareableListFragment - implements TitleSupport + extends ShareableListFragment + implements TitleSupport { - @Override - public ImageListAdapter onAdapter() - { - return new ImageListAdapter(getActivity()); - } + @Override + public ImageListAdapter onAdapter() + { + return new ImageListAdapter(getActivity()); + } - @Override - public CharSequence getTitle(Context context) - { - return context.getString(R.string.text_image); - } + @Override + public CharSequence getTitle(Context context) + { + return context.getString(R.string.text_image); + } } diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java index f714ff7b..f8f158ca 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java @@ -12,8 +12,6 @@ import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.Uri; -import android.net.nsd.NsdManager; -import android.net.nsd.NsdServiceInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; @@ -22,13 +20,11 @@ import android.preference.PreferenceManager; import android.provider.Settings; import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.app.AlertDialog; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -52,7 +48,6 @@ import com.genonbeta.TrebleShot.util.AppUtils; import com.genonbeta.TrebleShot.util.FABSupport; import com.genonbeta.TrebleShot.util.HotspotUtils; -import com.genonbeta.TrebleShot.util.NetworkDeviceInfoLoader; import com.genonbeta.TrebleShot.util.NsdDiscovery; import com.genonbeta.TrebleShot.util.TitleSupport; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/TextStreamListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/TextStreamListFragment.java index 07c11186..f4b8d3bf 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/TextStreamListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/TextStreamListFragment.java @@ -6,7 +6,6 @@ import android.content.IntentFilter; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.ArrayMap; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/TransactionListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/TransactionListFragment.java index 0997f7e3..70b2bd03 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/TransactionListFragment.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/TransactionListFragment.java @@ -10,7 +10,6 @@ import android.os.Looper; import android.preference.PreferenceManager; import android.support.v7.app.AlertDialog; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/object/Comparable.java b/app/src/main/java/com/genonbeta/TrebleShot/object/Comparable.java index e321f2ed..007d7d96 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/object/Comparable.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/object/Comparable.java @@ -8,6 +8,8 @@ public interface Comparable { String getComparableName(); + long getComparableDate(); + long getComparableSize(); } diff --git a/app/src/main/java/com/genonbeta/TrebleShot/object/Selectable.java b/app/src/main/java/com/genonbeta/TrebleShot/object/Selectable.java index b4453b86..5d77bedc 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/object/Selectable.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/object/Selectable.java @@ -8,6 +8,8 @@ public interface Selectable { String getSelectableFriendlyName(); + boolean isSelectableSelected(); + void setSelectableSelected(boolean selected); } diff --git a/app/src/main/java/com/genonbeta/TrebleShot/object/TransferInstance.java b/app/src/main/java/com/genonbeta/TrebleShot/object/TransferInstance.java index 73150316..20a04c04 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/object/TransferInstance.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/object/TransferInstance.java @@ -5,7 +5,6 @@ import com.genonbeta.TrebleShot.exception.DeviceNotFoundException; import com.genonbeta.TrebleShot.exception.TransactionGroupNotFoundException; import com.genonbeta.TrebleShot.util.NetworkDeviceInfoLoader; -import com.genonbeta.TrebleShot.util.NetworkDeviceScanner; /** * created by: Veli diff --git a/app/src/main/java/com/genonbeta/TrebleShot/receiver/NetworkStatusReceiver.java b/app/src/main/java/com/genonbeta/TrebleShot/receiver/NetworkStatusReceiver.java index 3c754e8a..9f4d1760 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/receiver/NetworkStatusReceiver.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/receiver/NetworkStatusReceiver.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.net.NetworkInfo; -import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.preference.PreferenceManager; @@ -23,8 +22,7 @@ public void onReceive(Context context, Intent intent) { SharedPreferences preferences = getSharedPreferences(context); - if (WIFI_AP_STATE_CHANGED.equals(intent.getAction())) - { + if (WIFI_AP_STATE_CHANGED.equals(intent.getAction())) { HotspotUtils hotspotUtils = HotspotUtils.getInstance(context); if (WifiManager.WIFI_STATE_DISABLED diff --git a/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java b/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java index 4a57b960..5c708a0f 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java @@ -3,17 +3,13 @@ import android.app.Service; import android.content.ClipData; import android.content.ClipboardManager; -import android.content.Context; import android.content.Intent; import android.media.MediaScannerConnection; import android.net.Uri; -import android.net.nsd.NsdManager; -import android.net.nsd.NsdServiceInfo; import android.net.wifi.WifiManager; import android.os.Build; import android.os.IBinder; import android.provider.Settings; -import android.support.annotation.RequiresApi; import android.support.v4.util.ArrayMap; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/service/DeviceScannerService.java b/app/src/main/java/com/genonbeta/TrebleShot/service/DeviceScannerService.java index 9f1fa288..c51b5fd5 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/service/DeviceScannerService.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/service/DeviceScannerService.java @@ -6,7 +6,6 @@ import android.support.annotation.Nullable; import com.genonbeta.TrebleShot.config.AppConfig; -import com.genonbeta.TrebleShot.config.Keyword; import com.genonbeta.TrebleShot.database.AccessDatabase; import com.genonbeta.TrebleShot.object.NetworkDevice; import com.genonbeta.TrebleShot.util.AddressedInterface; @@ -14,7 +13,6 @@ import com.genonbeta.TrebleShot.util.NetworkDeviceInfoLoader; import com.genonbeta.TrebleShot.util.NetworkDeviceScanner; import com.genonbeta.TrebleShot.util.NetworkUtils; -import com.genonbeta.android.database.SQLQuery; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java b/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java index bf89e234..31207fb3 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java @@ -9,7 +9,6 @@ import java.net.InetSocketAddress; import java.net.NetworkInterface; import java.net.Socket; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/util/TimeUtils.java b/app/src/main/java/com/genonbeta/TrebleShot/util/TimeUtils.java index b63315ca..ce556e06 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/util/TimeUtils.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/util/TimeUtils.java @@ -1,7 +1,6 @@ package com.genonbeta.TrebleShot.util; import android.content.Context; -import android.util.Log; import com.genonbeta.TrebleShot.R; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/util/UpdateUtils.java b/app/src/main/java/com/genonbeta/TrebleShot/util/UpdateUtils.java index dd951b1b..19ec0a79 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/util/UpdateUtils.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/util/UpdateUtils.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.content.pm.PackageManager; -import com.genonbeta.TrebleShot.R; import com.genonbeta.TrebleShot.activity.HomeActivity; import com.genonbeta.TrebleShot.config.AppConfig; import com.genonbeta.TrebleShot.object.NetworkDevice; diff --git a/app/src/main/java/com/genonbeta/TrebleShot/widget/EditableListAdapter.java b/app/src/main/java/com/genonbeta/TrebleShot/widget/EditableListAdapter.java index 2c4904a1..77d4827e 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/widget/EditableListAdapter.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/widget/EditableListAdapter.java @@ -7,7 +7,6 @@ import com.genonbeta.TrebleShot.app.EditableListFragment; import com.genonbeta.TrebleShot.object.Editable; -import java.util.ArrayList; import java.util.Comparator; /** diff --git a/app/src/main/java/com/genonbeta/TrebleShot/widget/PowerfulActionMode.java b/app/src/main/java/com/genonbeta/TrebleShot/widget/PowerfulActionMode.java index 2b010e76..410fc7f5 100644 --- a/app/src/main/java/com/genonbeta/TrebleShot/widget/PowerfulActionMode.java +++ b/app/src/main/java/com/genonbeta/TrebleShot/widget/PowerfulActionMode.java @@ -1,14 +1,11 @@ package com.genonbeta.TrebleShot.widget; import android.content.Context; -import android.os.Handler; -import android.os.Looper; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.util.ArrayMap; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -19,7 +16,6 @@ import com.genonbeta.TrebleShot.R; import com.genonbeta.TrebleShot.object.Selectable; -import com.genonbeta.TrebleShot.object.Shareable; import java.util.ArrayList; diff --git a/app/src/main/res/layout-large-land/activity_transaction.xml b/app/src/main/res/layout-large-land/activity_transaction.xml index 89610a4b..74664c03 100644 --- a/app/src/main/res/layout-large-land/activity_transaction.xml +++ b/app/src/main/res/layout-large-land/activity_transaction.xml @@ -2,7 +2,6 @@ diff --git a/app/src/main/res/menu/action_mode_abs_editable.xml b/app/src/main/res/menu/action_mode_abs_editable.xml index c4e55b70..1894c332 100644 --- a/app/src/main/res/menu/action_mode_abs_editable.xml +++ b/app/src/main/res/menu/action_mode_abs_editable.xml @@ -1,6 +1,6 @@ + > + > - + \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8a08f615..c89c920c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -294,4 +294,7 @@ Boyut Bunu işaretlemek bu cihazın GüvenliBölge etkinken size izin istemeksizin dosyalar göndermesine olanak sağlar İşaretlendiğinde, bu cihaz size bağlanabilir + Varsayılana sıfırla + Varsayılana sıfırlansın mı? + Bu varsayılan ayarları uygulayacak diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 76a23975..e38b57cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -286,4 +286,7 @@ Size Checking this will enable this device to send you files without showing a prompt when TrustZone is turned on When checked, this device can connect to you + Reset to default + Reset to default? + This will apply default settings diff --git a/app/src/main/res/xml/preferences_main.xml b/app/src/main/res/xml/preferences_main.xml index e3e02907..76d95020 100644 --- a/app/src/main/res/xml/preferences_main.xml +++ b/app/src/main/res/xml/preferences_main.xml @@ -4,6 +4,7 @@ @@ -15,6 +16,7 @@ android:dialogTitle="@string/text_deviceNameTitle"/> @@ -24,16 +26,19 @@ @@ -43,16 +48,19 @@