fix: Import files can have a coroutine competition problem

Infomaniak · May 3, 2024 · be85119 · be85119
1 parent f93e7e1
commit be85119
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/addFiles/ImportFilesDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/addFiles/ImportFilesDialog.kt
@@ -42,7 +42,10 @@ import com.infomaniak.drive.utils.getAvailableMemory
 import com.infomaniak.drive.utils.showSnackbar
 import com.infomaniak.lib.core.utils.getFileName
 import io.sentry.Sentry
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.Date
 
 class ImportFilesDialog : DialogFragment() {
@@ -82,21 +85,16 @@ class ImportFilesDialog : DialogFragment() {
 
     private suspend fun importFiles() {
         var errorCount = 0
-        val uploadFilesJobs = mutableListOf<Job>()
         navArgs.uris.forEach { uri ->
-            uploadFilesJobs.add(lifecycleScope.launch {
-                runCatching {
-                    initUpload(uri)
-                }.onFailure {
-                    it.printStackTrace()
-                    Sentry.captureException(it)
-
-                    errorCount++
-                }
-            })
-        }
+            runCatching {
+                initUpload(uri)
+            }.onFailure {
+                it.printStackTrace()
+                Sentry.captureException(it)
 
-        uploadFilesJobs.joinAll()
+                errorCount++
+            }
+        }
 
         if (errorCount > 0) {
             withContext(Dispatchers.Main) {