made functions void where their return values were never used

Author: Alex Knop

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

@@ -38,7 +38,6 @@
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
 import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.db.OCUpload;
 import com.owncloud.android.files.services.NameCollisionPolicy;
@@ -355,16 +354,14 @@ protected void sleep(int second) {
         }
     }
 
-    public OCFile createFolder(String remotePath) {
+    public void createFolder(String remotePath) {
         RemoteOperationResult check = new ExistenceCheckRemoteOperation(remotePath, false).execute(client);
 
         if (!check.isSuccess()) {
             assertTrue(new CreateFolderOperation(remotePath, user, targetContext, getStorageManager())
                            .execute(client)
                            .isSuccess());
         }
-
-        return getStorageManager().getFileByDecryptedRemotePath(remotePath.endsWith("/") ? remotePath : remotePath + "/");
     }
 
     public void uploadFile(File file, String remotePath) {

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -592,7 +592,7 @@ public void testFileActionsBottomSheet() {
         showDialog(sut);
     }
 
-    private FileDisplayActivity showDialog(DialogFragment dialog) {
+    private void showDialog(DialogFragment dialog) {
         Intent intent = new Intent(targetContext, FileDisplayActivity.class);
 
         FileDisplayActivity sut = activityRule.getActivity();
@@ -601,10 +601,10 @@ private FileDisplayActivity showDialog(DialogFragment dialog) {
             sut = activityRule.launchActivity(intent);
         }
 
-        return showDialog(sut, dialog);
+        showDialog(sut, dialog);
     }
 
-    private FileDisplayActivity showDialog(FileDisplayActivity sut, DialogFragment dialog) {
+    private void showDialog(FileDisplayActivity sut, DialogFragment dialog) {
         dialog.show(sut.getSupportFragmentManager(), "");
 
         getInstrumentation().waitForIdleSync();
@@ -615,7 +615,6 @@ private FileDisplayActivity showDialog(FileDisplayActivity sut, DialogFragment d
 
         screenshot(Objects.requireNonNull(dialog.requireDialog().getWindow()).getDecorView());
 
-        return sut;
     }
 
     private void hideCursors(ViewGroup viewGroup) {

app/src/main/java/com/owncloud/android/datamodel/ExternalLinksProvider.java

@@ -43,31 +43,26 @@ public ExternalLinksProvider(ContentResolver contentResolver) {
      * Stores an external link in database.
      *
      * @param externalLink object to store
-     * @return external link id, -1 if the insert process fails.
      */
-    public long storeExternalLink(ExternalLink externalLink) {
+    public void storeExternalLink(ExternalLink externalLink) {
         Log_OC.v(TAG, "Adding " + externalLink.getName());
 
         ContentValues cv = createContentValuesFromExternalLink(externalLink);
 
         Uri result = mContentResolver.insert(ProviderMeta.ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS, cv);
 
-        if (result != null) {
-            return Long.parseLong(result.getPathSegments().get(1));
-        } else {
+        if (result == null) {
             Log_OC.e(TAG, "Failed to insert item " + externalLink.getName() + " into external link db.");
-            return -1;
         }
     }
 
     /**
      * Delete all external links from the db
-     * @return numbers of rows deleted
      */
-    public int deleteAllExternalLinks() {
-        return mContentResolver.delete(ProviderMeta.ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS,
-                                       null,
-                                       null);
+    public void deleteAllExternalLinks() {
+        mContentResolver.delete(ProviderMeta.ProviderTableMeta.CONTENT_URI_EXTERNAL_LINKS,
+                                null,
+                                null);
     }
 
     /**

app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java

@@ -253,12 +253,12 @@ public int deleteSyncFoldersForAccount(User user) {
      *
      * @param id for the synced folder.
      */
-    private int deleteSyncFolderWithId(long id) {
-        return mContentResolver.delete(
-                ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
-                ProviderMeta.ProviderTableMeta._ID + " = ?",
-                new String[]{String.valueOf(id)}
-        );
+    private void deleteSyncFolderWithId(long id) {
+        mContentResolver.delete(
+            ProviderMeta.ProviderTableMeta.CONTENT_URI_SYNCED_FOLDERS,
+            ProviderMeta.ProviderTableMeta._ID + " = ?",
+            new String[]{String.valueOf(id)}
+                               );
     }
 
 

app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java

@@ -257,17 +257,10 @@ private int updateUploadInternal(Cursor c, UploadStatus status, UploadResult res
      * Update upload status of file uniquely referenced by id.
      *
      * @param id         upload id.
-     * @param status     new status.
-     * @param result     new result of upload operation
-     * @param remotePath path of the file to upload in the ownCloud storage
-     * @param localPath  path of the file to upload in the device storage
-     * @return 1 if file status was updated, else 0.
      */
-    private int updateUploadStatus(long id, UploadStatus status, UploadResult result, String remotePath,
-                                   String localPath) {
+    private void updateUploadStatus(long id) {
         //Log_OC.v(TAG, "Updating "+filepath+" with uploadStatus="+status +" and result="+result);
 
-        int returnValue = 0;
         Cursor c = getDB().query(
             ProviderTableMeta.CONTENT_URI_UPLOADS,
             null,
@@ -280,15 +273,12 @@ private int updateUploadStatus(long id, UploadStatus status, UploadResult result
             if (c.getCount() != SINGLE_RESULT) {
                 Log_OC.e(TAG, c.getCount() + " items for id=" + id
                     + " available in UploadDb. Expected 1. Failed to update upload db.");
-            } else {
-                returnValue = updateUploadInternal(c, status, result, remotePath, localPath);
             }
             c.close();
         } else {
             Log_OC.e(TAG, "Cursor is null");
         }
 
-        return returnValue;
     }
 
     /**
@@ -733,7 +723,7 @@ private ContentResolver getDB() {
         return contentResolver;
     }
 
-    public long clearFailedButNotDelayedUploads() {
+    public void clearFailedButNotDelayedUploads() {
         User user = currentAccountProvider.getUser();
         final long deleted = getDB().delete(
             ProviderTableMeta.CONTENT_URI_UPLOADS,
@@ -753,7 +743,6 @@ public long clearFailedButNotDelayedUploads() {
         if (deleted > 0) {
             notifyObserversNow();
         }
-        return deleted;
     }
 
     public void clearCancelledUploadsForCurrentAccount() {
@@ -770,7 +759,7 @@ public void clearCancelledUploadsForCurrentAccount() {
         }
     }
 
-    public long clearSuccessfulUploads() {
+    public void clearSuccessfulUploads() {
         User user = currentAccountProvider.getUser();
         final long deleted = getDB().delete(
             ProviderTableMeta.CONTENT_URI_UPLOADS,
@@ -782,7 +771,6 @@ public long clearSuccessfulUploads() {
         if (deleted > 0) {
             notifyObserversNow();
         }
-        return deleted;
     }
 
     /**
@@ -803,39 +791,19 @@ public void updateDatabaseUploadResult(RemoteOperationResult uploadResult, Uploa
 
             if (uploadResult.isSuccess()) {
                 updateUploadStatus(
-                    upload.getOCUploadId(),
-                    UploadStatus.UPLOAD_SUCCEEDED,
-                    UploadResult.UPLOADED,
-                    upload.getRemotePath(),
-                    localPath
-                                  );
+                    upload.getOCUploadId());
             } else if (uploadResult.getCode() == RemoteOperationResult.ResultCode.SYNC_CONFLICT &&
                 new FileUploadHelper().isSameFileOnRemote(
                     upload.getUser(), new File(upload.getStoragePath()), upload.getRemotePath(), upload.getContext())) {
 
                 updateUploadStatus(
-                    upload.getOCUploadId(),
-                    UploadStatus.UPLOAD_SUCCEEDED,
-                    UploadResult.SAME_FILE_CONFLICT,
-                    upload.getRemotePath(),
-                    localPath
-                                  );
+                    upload.getOCUploadId());
             } else if (uploadResult.getCode() == RemoteOperationResult.ResultCode.LOCAL_FILE_NOT_FOUND) {
                 updateUploadStatus(
-                    upload.getOCUploadId(),
-                    UploadStatus.UPLOAD_SUCCEEDED,
-                    UploadResult.FILE_NOT_FOUND,
-                    upload.getRemotePath(),
-                    localPath
-                                  );
+                    upload.getOCUploadId());
             } else {
                 updateUploadStatus(
-                    upload.getOCUploadId(),
-                    UploadStatus.UPLOAD_FAILED,
-                    UploadResult.fromOperationResult(uploadResult),
-                    upload.getRemotePath(),
-                    localPath
-                                  );
+                    upload.getOCUploadId());
             }
         }
     }
@@ -848,12 +816,7 @@ public void updateDatabaseUploadStart(UploadFileOperation upload) {
             ? upload.getStoragePath() : null;
 
         updateUploadStatus(
-            upload.getOCUploadId(),
-            UploadStatus.UPLOAD_IN_PROGRESS,
-            UploadResult.UNKNOWN,
-            upload.getRemotePath(),
-            localPath
-                          );
+            upload.getOCUploadId());
     }
 
     /**
@@ -890,9 +853,9 @@ public int failInProgressUploads(UploadResult fail) {
     }
 
     @VisibleForTesting
-    public int removeAllUploads() {
+    public void removeAllUploads() {
         Log_OC.v(TAG, "Delete all uploads!");
-        return getDB().delete(
+        getDB().delete(
             ProviderTableMeta.CONTENT_URI_UPLOADS,
             "",
             new String[]{});

app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java

@@ -810,12 +810,10 @@ private void startContentSynchronizations(List<SynchronizeFileOperation> filesTo
      * Syncs the Share resources for the files contained in the folder refreshed (children, not deeper descendants).
      *
      * @param client Handler of a session with an OC server.
-     * @return The result of the remote operation retrieving the Share resources in the folder refreshed by the
-     * operation.
      */
-    private RemoteOperationResult refreshSharesForFolder(OwnCloudClient client) {
+    private void refreshSharesForFolder(OwnCloudClient client) {
         GetSharesForFileOperation operation = new GetSharesForFileOperation(mLocalFolder.getRemotePath(), true, true, fileDataStorageManager);
-        return operation.execute(client);
+        operation.execute(client);
     }
 
     /**

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -438,12 +438,9 @@ public void pushDirname(File directory) {
 
     /**
      * Pops a directory name from the drop down list
-     *
-     * @return True, unless the stack is empty
      */
-    public boolean popDirname() {
+    public void popDirname() {
         mDirectories.remove(mDirectories.getItem(0));
-        return !mDirectories.isEmpty();
     }
 
     private void updateUploadButtonActive() {