rename functions

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -106,7 +106,7 @@ class FileUploadHelper {
         accountManager: UserAccountManager,
         powerManagementService: PowerManagementService
     ) {
-        val cancelledUploads = uploadsStorageManager.manuallyCancelledUploadsForCurrentAccount
+        val cancelledUploads = uploadsStorageManager.cancelledUploadsForCurrentAccount
         if (cancelledUploads == null || cancelledUploads.isEmpty()) {
             return
         }
@@ -194,11 +194,12 @@ class FileUploadHelper {
         }
     }
 
-    fun manuallyCancelFileUpload(remotePath: String, accountName: String) {
-        val upload = uploadsStorageManager.getUploadByRemotePath(remotePath)
-        removeFileUpload(remotePath, accountName)
-        upload.uploadStatus = UploadStatus.UPLOAD_MANUALLY_CANCELLED
-        uploadsStorageManager.storeUpload(upload)
+    fun cancelFileUpload(remotePath: String, accountName: String) {
+        uploadsStorageManager.getUploadByRemotePath(remotePath).run {
+            removeFileUpload(remotePath, accountName)
+            uploadStatus = UploadStatus.UPLOAD_CANCELLED
+            uploadsStorageManager.storeUpload(this)
+        }
     }
 
     fun cancelAndRestartUploadJob(user: User) {
@@ -334,7 +335,7 @@ class FileUploadHelper {
                     return
                 }
 
-                instance().manuallyCancelFileUpload(remotePath, accountName)
+                instance().cancelFileUpload(remotePath, accountName)
             }
         }
     }

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

@@ -630,10 +630,10 @@ public class UploadsStorageManager extends Observable {
                               ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?", user.getAccountName());
     }
 
-    public OCUpload[] getManuallyCancelledUploadsForCurrentAccount() {
+    public OCUpload[] getCancelledUploadsForCurrentAccount() {
         User user = currentAccountProvider.getUser();
 
-        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_MANUALLY_CANCELLED.value + AND +
+        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_CANCELLED.value + AND +
                               ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?", user.getAccountName());
     }
 
@@ -707,19 +707,18 @@ public class UploadsStorageManager extends Observable {
         return deleted;
     }
 
-    public long clearManuallyCancelledUploadsForCurrentAccount() {
+    public void clearCancelledUploadsForCurrentAccount() {
         User user = currentAccountProvider.getUser();
         final long deleted = getDB().delete(
             ProviderTableMeta.CONTENT_URI_UPLOADS,
-            ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_MANUALLY_CANCELLED.value + AND +
+            ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_CANCELLED.value + AND +
                 ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?", new String[]{user.getAccountName()}
                                            );
 
-        Log_OC.d(TAG, "delete all manually cancelled uploads");
+        Log_OC.d(TAG, "delete all cancelled uploads");
         if (deleted > 0) {
             notifyObserversNow();
         }
-        return deleted;
     }
 
     public long clearSuccessfulUploads() {
@@ -878,7 +877,7 @@ public class UploadsStorageManager extends Observable {
         /**
          * Upload was cancelled by the user.
          */
-        UPLOAD_MANUALLY_CANCELLED(3);
+        UPLOAD_CANCELLED(3);
 
         private final int value;
 
@@ -895,7 +894,7 @@ public class UploadsStorageManager extends Observable {
                 case 2:
                     return UPLOAD_SUCCEEDED;
                 case 3:
-                    return UPLOAD_MANUALLY_CANCELLED;
+                    return UPLOAD_CANCELLED;
             }
             return null;
         }

app/src/main/java/com/owncloud/android/db/UploadResult.java

@@ -46,8 +46,7 @@ public enum UploadResult {
     CANNOT_CREATE_FILE(20),
     LOCAL_STORAGE_NOT_COPIED(21),
     QUOTA_EXCEEDED(22),
-    SAME_FILE_CONFLICT(23),
-    MANUALLY_CANCELLED(24);
+    SAME_FILE_CONFLICT(23);
 
     private final int value;
 
@@ -111,8 +110,6 @@ public enum UploadResult {
                 return QUOTA_EXCEEDED;
             case 23:
                 return SAME_FILE_CONFLICT;
-            case 24:
-                return MANUALLY_CANCELLED;
         }
         return UNKNOWN;
     }

app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java

@@ -130,30 +130,26 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         headerViewHolder.binding.uploadListAction.setOnClickListener(v -> {
             switch (group.type) {
                 case CURRENT -> {
-                    // cancel all current uploads
                     for (OCUpload upload : group.getItems()) {
-                        uploadHelper.manuallyCancelFileUpload(upload.getRemotePath(), upload.getAccountName());
+                        uploadHelper.cancelFileUpload(upload.getRemotePath(), upload.getAccountName());
                     }
                     loadUploadItemsFromDb();
                 }
                 case FINISHED -> {
-                    // clear successfully uploaded section
                     uploadsStorageManager.clearSuccessfulUploads();
                     loadUploadItemsFromDb();
                 }
                 case FAILED -> {
-                    // show popup with option clear or retry filed uploads
-                    createFailedPopupMenu(headerViewHolder);
+                    showFailedPopupMenu(headerViewHolder);
                 }
                 case CANCELLED -> {
-                    // show popup with option clear or retry manually cancelled uploads
-                    createCancelledActionsPopupMenu(headerViewHolder);
+                    showCancelledPopupMenu(headerViewHolder);
                 }
             }
         });
     }
 
-    private void createFailedPopupMenu(HeaderViewHolder headerViewHolder) {
+    private void showFailedPopupMenu(HeaderViewHolder headerViewHolder) {
         PopupMenu failedPopup = new PopupMenu(MainApp.getAppContext(), headerViewHolder.binding.uploadListAction);
         failedPopup.inflate(R.menu.upload_list_failed_options);
         failedPopup.setOnMenuItemClickListener(i -> {
@@ -179,7 +175,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
         failedPopup.show();
     }
 
-    public void createCancelledActionsPopupMenu(HeaderViewHolder headerViewHolder) {
+    public void showCancelledPopupMenu(HeaderViewHolder headerViewHolder) {
         PopupMenu popup = new PopupMenu(MainApp.getAppContext(), headerViewHolder.binding.uploadListAction);
         popup.inflate(R.menu.upload_list_cancelled_options);
 
@@ -187,7 +183,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
             int itemId = i.getItemId();
 
             if (itemId == R.id.action_upload_list_cancelled_clear) {
-                uploadsStorageManager.clearManuallyCancelledUploadsForCurrentAccount();
+                uploadsStorageManager.clearCancelledUploadsForCurrentAccount();
                 loadUploadItemsFromDb();
             } else if (itemId == R.id.action_upload_list_cancelled_resume) {
 
@@ -256,7 +252,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                                               R.string.uploads_view_group_manually_cancelled_uploads)) {
             @Override
             public void refresh() {
-                fixAndSortItems(uploadsStorageManager.getManuallyCancelledUploadsForCurrentAccount());
+                fixAndSortItems(uploadsStorageManager.getCancelledUploadsForCurrentAccount());
             }
         };
 
@@ -367,13 +363,13 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
                 itemViewHolder.binding.uploadProgressBar.invalidate();
             }
             case UPLOAD_FAILED -> itemViewHolder.binding.uploadDate.setVisibility(View.GONE);
-            case UPLOAD_SUCCEEDED, UPLOAD_MANUALLY_CANCELLED ->
+            case UPLOAD_SUCCEEDED, UPLOAD_CANCELLED ->
                 itemViewHolder.binding.uploadStatus.setVisibility(View.GONE);
         }
 
         // show status if same file conflict or local file deleted or upload cancelled
         if ((item.getUploadStatus() == UploadStatus.UPLOAD_SUCCEEDED && item.getLastResult() != UploadResult.UPLOADED)
-            || item.getUploadStatus() == UploadStatus.UPLOAD_MANUALLY_CANCELLED) {
+            || item.getUploadStatus() == UploadStatus.UPLOAD_CANCELLED) {
 
             itemViewHolder.binding.uploadStatus.setVisibility(View.VISIBLE);
             itemViewHolder.binding.uploadDate.setVisibility(View.GONE);
@@ -388,7 +384,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
             itemViewHolder.binding.uploadRightButton.setImageResource(R.drawable.ic_action_cancel_grey);
             itemViewHolder.binding.uploadRightButton.setVisibility(View.VISIBLE);
             itemViewHolder.binding.uploadRightButton.setOnClickListener(v -> {
-                uploadHelper.manuallyCancelFileUpload(item.getRemotePath(), item.getAccountName());
+                uploadHelper.cancelFileUpload(item.getRemotePath(), item.getAccountName());
                 loadUploadItemsFromDb();
             });
 
@@ -418,7 +414,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
 
         // click on item
         if (item.getUploadStatus() == UploadStatus.UPLOAD_FAILED ||
-            item.getUploadStatus() == UploadStatus.UPLOAD_MANUALLY_CANCELLED) {
+            item.getUploadStatus() == UploadStatus.UPLOAD_CANCELLED) {
 
             final UploadResult uploadResult = item.getLastResult();
             itemViewHolder.binding.uploadListItemLayout.setOnClickListener(v -> {
@@ -706,7 +702,7 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
             case UPLOAD_FAILED -> {
                 status = getUploadFailedStatusText(upload.getLastResult());
             }
-            case UPLOAD_MANUALLY_CANCELLED -> {
+            case UPLOAD_CANCELLED -> {
                 status = parentActivity.getString(R.string.upload_manually_cancelled);
             }
 
@@ -799,9 +795,6 @@ public class UploadListAdapter extends SectionedRecyclerViewAdapter<SectionedVie
             case QUOTA_EXCEEDED:
                 status = parentActivity.getString(R.string.upload_quota_exceeded);
                 break;
-            case MANUALLY_CANCELLED:
-                status = parentActivity.getString(R.string.upload_manually_cancelled);
-                break;
             default:
                 status = parentActivity.getString(R.string.upload_unknown_error);
                 break;

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -1015,7 +1015,7 @@ public class FileOperationsHelper {
 
         if (FileUploadHelper.Companion.instance().isUploading(currentUser, file)) {
             try {
-                FileUploadHelper.Companion.instance().manuallyCancelFileUpload(file.getRemotePath(), currentUser.getAccountName());
+                FileUploadHelper.Companion.instance().cancelFileUpload(file.getRemotePath(), currentUser.getAccountName());
             } catch (NoSuchElementException e) {
                 Log_OC.e(TAG, "Error cancelling current upload because user does not exist!");
             }