diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index 9c8a8ffd93..18dd6b80a6 100644 --- a/src/com/owncloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -67,6 +67,7 @@ public class MainApp extends Application { private static boolean mOnlyOnDevice = false; private static SyncedFolderObserverService mObserverService; + @SuppressWarnings("unused") private boolean mBound; diff --git a/src/com/owncloud/android/datamodel/MediaProvider.java b/src/com/owncloud/android/datamodel/MediaProvider.java index 5fd5499dc1..7ee9f1df5a 100644 --- a/src/com/owncloud/android/datamodel/MediaProvider.java +++ b/src/com/owncloud/android/datamodel/MediaProvider.java @@ -40,7 +40,6 @@ public class MediaProvider { private static final Uri MEDIA_URI = android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI; private static final String[] FILE_PROJECTION = new String[]{MediaStore.MediaColumns.DATA}; private static final String FILE_SELECTION = MediaStore.Images.Media.BUCKET_ID + "="; - private static final Uri uri1 = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; private static final String[] FOLDER_PROJECTION = { "Distinct " + MediaStore.Images.Media.BUCKET_ID, MediaStore.Images.Media.BUCKET_DISPLAY_NAME }; private static final String FOLDER_SORT_ORDER = MediaStore.Images.Media.BUCKET_DISPLAY_NAME + " ASC"; diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index cb0d13c220..cbca4ff575 100644 --- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -132,7 +132,7 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { new FileUploader.UploadRequester(); int behaviour = getUploadBehaviour(context); - Boolean subfolderByDate = com.owncloud.android.db.PreferenceManager.instantPictureUploadPathUseSubfolders(context); + Boolean subfolderByDate = PreferenceManager.instantPictureUploadPathUseSubfolders(context); SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context); String uploadPathdef = context.getString(R.string.instant_upload_path); String uploadPath = pref.getString("instant_upload_path", uploadPathdef); diff --git a/src/com/owncloud/android/ui/activity/FolderSyncActivity.java b/src/com/owncloud/android/ui/activity/FolderSyncActivity.java index c70cfd6f56..20fba35aef 100644 --- a/src/com/owncloud/android/ui/activity/FolderSyncActivity.java +++ b/src/com/owncloud/android/ui/activity/FolderSyncActivity.java @@ -356,7 +356,7 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte @Override public void onSaveSyncedFolderPreference(SyncedFolderParcelable syncedFolder) { SyncedFolderDisplayItem item = syncFolderItems.get(syncedFolder.getSection()); - boolean dirty = !(item.isEnabled() == syncedFolder.getEnabled()); + boolean dirty = item.isEnabled() != syncedFolder.getEnabled(); item = updateSyncedFolderItem(item, syncedFolder.getLocalPath(), syncedFolder.getRemotePath(), syncedFolder .getWifiOnly(), syncedFolder.getChargingOnly(), syncedFolder.getSubfolderByDate(), syncedFolder .getUploadAction(), syncedFolder.getEnabled()); diff --git a/src/com/owncloud/android/ui/adapter/FolderSyncAdapter.java b/src/com/owncloud/android/ui/adapter/FolderSyncAdapter.java index a9c84f1ac1..df6de99ca8 100644 --- a/src/com/owncloud/android/ui/adapter/FolderSyncAdapter.java +++ b/src/com/owncloud/android/ui/adapter/FolderSyncAdapter.java @@ -157,13 +157,13 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter