fix(upload-list-adapter): do not refresh list after immediately async call

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -264,9 +264,11 @@ class FileUploadHelper {
         uploadsStorageManager.uploadDao.deleteByRemotePathAndAccountName(remotePath, accountName)
     }
 
-    fun updateUploadStatus(remotePath: String, accountName: String, status: UploadStatus) {
+    @JvmOverloads
+    fun updateUploadStatus(remotePath: String, accountName: String, status: UploadStatus, onCompleted: () -> Unit = {}) {
         ioScope.launch {
             uploadsStorageManager.uploadDao.updateStatus(remotePath, accountName, status.value)
+            onCompleted()
         }
     }
 

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

@@ -317,9 +317,7 @@ public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationRe
     private class UploadFinishReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb(() -> {
-
-            }));
+            throttler.run("update_upload_list", () -> uploadListAdapter.loadUploadItemsFromDb(() -> {}));
         }
     }
 }

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

@@ -64,6 +64,7 @@
 
 import androidx.annotation.NonNull;
 import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 
 /**
  * This Adapter populates a ListView with following types of uploads: pending, active, completed. Filtering possible.
@@ -176,11 +177,31 @@ public void onBindHeaderViewHolder(SectionedViewHolder holder, int section, bool
                 case CURRENT -> {
                     String accountName = group.items()[0].getAccountName();
 
-                    for (OCUpload upload: group.items) {
-                        uploadHelper.updateUploadStatus(upload.getRemotePath(), accountName, UploadStatus.UPLOAD_CANCELLED);
-                        FileUploadWorker.Companion.cancelCurrentUpload(upload.getRemotePath(), accountName, () -> Unit.INSTANCE);
+                    final int totalUploads = group.items().length;
+                    final int[] completedCount = {0};
+
+                    for (int i=0; i<group.items.length; i++) {
+                        OCUpload upload = group.items[i];
+                        uploadHelper.updateUploadStatus(upload.getRemotePath(), accountName, UploadStatus.UPLOAD_CANCELLED, new Function0<Unit>() {
+                            @Override
+                            public Unit invoke() {
+                                FileUploadWorker.Companion.cancelCurrentUpload(upload.getRemotePath(), accountName, new Function0<Unit>() {
+                                    @Override
+                                    public Unit invoke() {
+                                        completedCount[0]++;
+                                        if (completedCount[0] == totalUploads) {
+                                            Log_OC.d(TAG, "refreshing upload items");
+
+                                            // All uploads finished, refresh UI once
+                                            loadUploadItemsFromDb(() -> {});
+                                        }
+                                        return Unit.INSTANCE;
+                                    }
+                                });
+                                return Unit.INSTANCE;
+                            }
+                        });
                     }
-                    loadUploadItemsFromDb(() -> {});
                 }
                 case FINISHED -> {
                     uploadsStorageManager.clearSuccessfulUploads();
@@ -211,7 +232,6 @@ private void showFailedPopupMenu(HeaderViewHolder headerViewHolder) {
                     connectivityService,
                     accountManager,
                     powerManagementService);
-                loadUploadItemsFromDb(() -> {});
             }
 
             return true;
@@ -254,7 +274,6 @@ private void retryCancelledUploads() {
                 connectivityService,
                 accountManager,
                 powerManagementService);
-            loadUploadItemsFromDb(() -> {});
             parentActivity.runOnUiThread(() -> {
                 if (showNotExistMessage) {
                     showNotExistMessage();
@@ -407,9 +426,13 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
             itemViewHolder.binding.uploadRightButton.setImageResource(R.drawable.ic_action_cancel_grey);
             itemViewHolder.binding.uploadRightButton.setVisibility(View.VISIBLE);
             itemViewHolder.binding.uploadRightButton.setOnClickListener(v -> {
-                uploadHelper.updateUploadStatus(item.getRemotePath(), item.getAccountName(), UploadStatus.UPLOAD_CANCELLED);
-                FileUploadWorker.Companion.cancelCurrentUpload(item.getRemotePath(), item.getAccountName(), () -> Unit.INSTANCE);
-                loadUploadItemsFromDb(() -> {});
+                uploadHelper.updateUploadStatus(item.getRemotePath(), item.getAccountName(), UploadStatus.UPLOAD_CANCELLED, () -> {
+                    FileUploadWorker.Companion.cancelCurrentUpload(item.getRemotePath(), item.getAccountName(), () -> {
+                        loadUploadItemsFromDb(() -> {});
+                        return Unit.INSTANCE;
+                    });
+                    return Unit.INSTANCE;
+                });
             });
 
         } else if (item.getUploadStatus() == UploadStatus.UPLOAD_FAILED) {
@@ -456,7 +479,6 @@ public void onBindViewHolder(SectionedViewHolder holder, int section, int relati
                 Optional<User> user = accountManager.getUser(item.getAccountName());
                 if (file.exists() && user.isPresent()) {
                     uploadHelper.retryUpload(item, user.get());
-                    loadUploadItemsFromDb(() -> {});
                 } else {
                     DisplayUtils.showSnackMessage(v.getRootView().findViewById(android.R.id.content), R.string.local_file_not_found_message);
                 }