allow user to delete normal files together with auto upload folders

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

Author: alperozturk96

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

@@ -640,11 +640,31 @@ class FileUploadHelper {
             }
     }
 
-    suspend fun getAutoUploadFolder(files: List<OCFile>, accountName: String): List<SyncedFolderEntity> =
-        files.mapNotNull { file ->
-            getAutoUploadFolderEntity(file, accountName)
+    /**
+     * Splits a list of files into:
+     * 1. Files that have an auto-upload folder configured.
+     * 2. Files that don't.
+     */
+    suspend fun splitFilesByAutoUpload(
+        files: List<OCFile>,
+        accountName: String
+    ): Pair<List<SyncedFolderEntity>, List<OCFile>> {
+
+        val autoUploadFolders = mutableListOf<SyncedFolderEntity>()
+        val nonAutoUploadFiles = mutableListOf<OCFile>()
+
+        for (file in files) {
+            val entity = getAutoUploadFolderEntity(file, accountName)
+            if (entity != null) {
+                autoUploadFolders.add(entity)
+            } else {
+                nonAutoUploadFiles.add(file)
+            }
         }
 
+        return autoUploadFolders to nonAutoUploadFiles
+    }
+
     suspend fun getAutoUploadFolderEntity(file: ServerFileInterface, accountName: String): SyncedFolderEntity? {
         val dao = uploadsStorageManager.syncedFolderDao
         val normalizedRemotePath = file.remotePath.trimEnd()

app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt

@@ -112,20 +112,19 @@ class RemoveFilesDialogFragment :
         val listener = getTypedActivity(OnFilesRemovedListener::class.java)
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val autoUploadEntities =
-                FileUploadHelper.instance().getAutoUploadFolder(files, userAccountManager.user.accountName)
+            val (autoUploadEntities, filesToRemove) =
+                FileUploadHelper.instance().splitFilesByAutoUpload(files, userAccountManager.user.accountName)
             withContext(Dispatchers.Main) {
                 if (autoUploadEntities.isNotEmpty()) {
                     listener?.onAutoUploadFolderRemoved(
                         entities = autoUploadEntities,
                         filesToRemove = files,
                         onlyLocalCopy = onlyLocalCopy
                     )
-                    return@withContext
                 }
 
                 val fileActivity = getTypedActivity(FileActivity::class.java)
-                fileActivity?.removeFiles(offlineFiles, files, onlyLocalCopy, listener)
+                fileActivity?.removeFiles(offlineFiles, filesToRemove, onlyLocalCopy, listener)
                 finishActionMode()
             }
         }