From 1bf079d2cd85fe4770716bbf02790651290d66c1 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 5 Feb 2020 10:21:56 +0100 Subject: [PATCH 1/2] NAB_NEEDLESS_BOOLEAN_CONSTANT_CONVERSION: Method needlessly boxes a boolean constant This method assigns a Boxed boolean constant to a primitive boolean variable, or assigns a primitive boolean constant to a Boxed boolean variable. Use the correct constant for the variable desired. Signed-off-by: tobiasKaminsky --- .../android/datamodel/FilesystemDataProvider.java | 2 +- .../data/activities/ActivitiesServiceApiImpl.java | 6 +++--- .../activities/data/files/FilesServiceApiImpl.java | 4 ++-- .../activity/ErrorsWhileCopyingHandlerActivity.java | 4 ++-- .../android/ui/asynctasks/CheckRemoteWipeTask.java | 4 ++-- .../ui/asynctasks/NotificationExecuteActionTask.java | 4 ++-- .../android/ui/asynctasks/PrintAsyncTask.java | 10 +++++----- .../android/ui/fragment/OCFileListFragment.java | 8 ++++---- .../fragment/contactsbackup/ContactListFragment.java | 12 ++++++------ .../contactsbackup/ContactsBackupFragment.java | 2 +- .../android/ui/preview/PreviewTextFileFragment.java | 2 +- .../ui/trashbin/RemoteTrashbinRepository.java | 12 ++++-------- 12 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java b/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java index cf858e98fe..0e17c9e22f 100644 --- a/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java +++ b/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java @@ -128,7 +128,7 @@ public class FilesystemDataProvider { cv.put(ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_LOCAL_PATH, localPath); cv.put(ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_IS_FOLDER, isFolderValue); - cv.put(ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_SENT_FOR_UPLOAD, false); + cv.put(ProviderMeta.ProviderTableMeta.FILESYSTEM_FILE_SENT_FOR_UPLOAD, Boolean.FALSE); cv.put(ProviderMeta.ProviderTableMeta.FILESYSTEM_SYNCED_FOLDER_ID, syncedFolder.getId()); long newCrc32 = getFileChecksum(localPath); diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java b/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java index 8492c65569..0f7e2963d3 100644 --- a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java +++ b/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java @@ -106,7 +106,7 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi { activities = (ArrayList) data.get(0); lastGiven = (int) data.get(1); - return true; + return Boolean.TRUE; } else { Log_OC.d(TAG, result.getLogMessage()); // show error @@ -114,7 +114,7 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi { if (result.getHttpCode() == HttpStatus.SC_NOT_MODIFIED) { errorMessage = context.getString(R.string.file_list_empty_headline_server_search); } - return false; + return Boolean.FALSE; } } catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) { @@ -131,7 +131,7 @@ public class ActivitiesServiceApiImpl implements ActivitiesServiceApi { errorMessage = "Authentication Exception"; } - return false; + return Boolean.FALSE; } @Override diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java b/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java index 8f2fd0ba09..c97a4be394 100644 --- a/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java +++ b/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java @@ -116,13 +116,13 @@ public class FilesServiceApiImpl implements FilesServiceApi { synchFolderOp.execute(ownCloudClient); } } - return true; + return Boolean.TRUE; } catch (ClientFactory.CreationException e) { Log_OC.e(TAG, "Account not found", e); errorMessage = baseActivity.getString(R.string.account_not_found); } - return false; + return Boolean.FALSE; } @Override diff --git a/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java index 286214fb82..9111a17741 100644 --- a/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java @@ -243,10 +243,10 @@ public class ErrorsWhileCopyingHandlerActivity extends AppCompatActivity implem } else { // FAIL - return false; + return Boolean.FALSE; } } - return true; + return Boolean.TRUE; } /** diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java b/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java index ac11308ddc..1c52aefafa 100644 --- a/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java +++ b/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java @@ -51,7 +51,7 @@ public class CheckRemoteWipeTask extends AsyncTask { if (fileActivity == null) { Log_OC.e(this, "Check for remote wipe: no context available"); - return false; + return Boolean.FALSE; } RemoteOperationResult checkWipeResult = new CheckRemoteWipeRemoteOperation().execute(account, fileActivity); @@ -75,6 +75,6 @@ public class CheckRemoteWipeTask extends AsyncTask { } - return true; + return Boolean.TRUE; } } diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java b/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java index bb921fe81a..58d6b920ce 100644 --- a/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java +++ b/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java @@ -60,7 +60,7 @@ public class NotificationExecuteActionTask extends AsyncTask { int status = client.executeMethod(getMethod); if (status == HttpStatus.SC_OK) { if (file.exists() && !file.delete()) { - return false; + return Boolean.FALSE; } file.getParentFile().mkdirs(); if (!file.getParentFile().exists()) { Log_OC.d(TAG, file.getParentFile().getAbsolutePath() + " does not exist"); - return false; + return Boolean.FALSE; } if (!file.createNewFile()) { Log_OC.d(TAG, file.getAbsolutePath() + " could not be created"); - return false; + return Boolean.FALSE; } BufferedInputStream bis = new BufferedInputStream(getMethod.getResponseBodyAsStream()); @@ -113,7 +113,7 @@ public class PrintAsyncTask extends AsyncTask { } // Check if the file is completed if (transferred != totalToTransfer) { - return false; + return Boolean.FALSE; } if (getMethod.getResponseBodyAsStream() != null) { @@ -124,7 +124,7 @@ public class PrintAsyncTask extends AsyncTask { Log_OC.e(TAG, "Error reading file", e); } - return true; + return Boolean.TRUE; } @Override diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 6ee6f6e35e..b558d67a17 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -1551,9 +1551,9 @@ public class OCFileListFragment extends ExtendedListFragment implements remoteOperation = new GetSharesRemoteOperation(); } - remoteOperationAsyncTask = new AsyncTask() { + remoteOperationAsyncTask = new AsyncTask() { @Override - protected Object doInBackground(Object[] params) { + protected Boolean doInBackground(Void... voids) { setTitle(); if (getContext() != null && !isCancelled()) { RemoteOperationResult remoteOperationResult = remoteOperation.execute( @@ -1592,12 +1592,12 @@ public class OCFileListFragment extends ExtendedListFragment implements return remoteOperationResult.isSuccess(); } else { - return false; + return Boolean.FALSE; } } @Override - protected void onPostExecute(Object o) { + protected void onPostExecute(Boolean bool) { if (!isCancelled()) { mAdapter.notifyDataSetChanged(); } diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java index a2c3acd7ea..ebda886c18 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java @@ -535,7 +535,7 @@ public class ContactListFragment extends FileFragment implements Injectable { } - private AsyncTask loadContactsTask = new AsyncTask() { + private AsyncTask loadContactsTask = new AsyncTask() { @Override protected void onPreExecute() { @@ -543,7 +543,7 @@ public class ContactListFragment extends FileFragment implements Injectable { } @Override - protected Object doInBackground(Object[] params) { + protected Boolean doInBackground(Void... voids) { if (!isCancelled()) { File file = new File(ocFile.getStoragePath()); try { @@ -551,15 +551,15 @@ public class ContactListFragment extends FileFragment implements Injectable { Collections.sort(vCards, new VCardComparator()); } catch (IOException e) { Log_OC.e(TAG, "IO Exception: " + file.getAbsolutePath()); - return false; + return Boolean.FALSE; } - return true; + return Boolean.TRUE; } - return false; + return Boolean.FALSE; } @Override - protected void onPostExecute(Object o) { + protected void onPostExecute(Boolean bool) { if (!isCancelled()) { emptyListContainer.setVisibility(View.GONE); contactListAdapter.replaceVCards(vCards); diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java index 6b9cba657d..9e6c7077dc 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java @@ -225,7 +225,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi RemoteOperationResult result = operation.execute(account, getContext()); return result.isSuccess(); } else { - return false; + return Boolean.FALSE; } } diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java index eb80ee79e5..cb899fb76b 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java @@ -383,7 +383,7 @@ public class PreviewTextFileFragment extends PreviewTextFragment { Log_OC.e(TAG, "onStop"); if (textLoadAsyncTask != null) { - textLoadAsyncTask.cancel(Boolean.TRUE); + textLoadAsyncTask.cancel(true); } } diff --git a/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java b/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java index fcf9ad155b..1371c87320 100644 --- a/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java +++ b/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java @@ -23,16 +23,12 @@ */ package com.owncloud.android.ui.trashbin; -import android.accounts.Account; -import android.content.Context; import android.os.AsyncTask; import com.nextcloud.client.account.User; import com.nextcloud.client.network.ClientFactory; import com.owncloud.android.R; -import com.owncloud.android.lib.common.OwnCloudAccount; import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.trashbin.EmptyTrashbinRemoteOperation; @@ -124,7 +120,7 @@ public class RemoteTrashbinRepository implements TrashbinRepository { return result.isSuccess(); } catch (ClientFactory.CreationException e) { Log_OC.e(this, "Cannot create client", e); - return false; + return Boolean.FALSE; } } @@ -206,12 +202,12 @@ public class RemoteTrashbinRepository implements TrashbinRepository { RemoteOperationResult result = new ReadTrashbinFolderRemoteOperation(remotePath).execute(client); if (result.isSuccess()) { trashbinFiles = result.getData(); - return true; + return Boolean.TRUE; } else { - return false; + return Boolean.FALSE; } } catch (ClientFactory.CreationException e) { - return false; + return Boolean.FALSE; } } From 0d0a4a31989d5d6b964e2cac380afe90066dcc73 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Wed, 5 Feb 2020 09:34:45 +0000 Subject: [PATCH 2/2] Drone: update FindBugs results to reflect reduced error/warning count [skip ci] Signed-off-by: nextcloud-android-bot --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index d1b9f6a9c4..304feabdce 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -414 +387 \ No newline at end of file