Bladeren bron

Simplify function and remove nested loop

Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
Jonas Mayer 1 jaar geleden
bovenliggende
commit
77a1eade9b
1 gewijzigde bestanden met toevoegingen van 3 en 18 verwijderingen
  1. 3 18
      app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

+ 3 - 18
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -120,23 +120,7 @@ class FileUploadHelper {
         val charging = batteryStatus.isCharging || batteryStatus.isFull
         val isPowerSaving = powerManagementService.isPowerSavingEnabled
 
-        val uploadUsers = mutableListOf<User>()
         for (failedUpload in failedUploads) {
-            // 1. extract failed upload owner account and cache it between loops (expensive query)
-            var correspondingUploadUser = uploadUsers.stream().filter { uploadUser ->
-                uploadUser.nameEquals(
-                    failedUpload.accountName
-                )
-            }.findFirst()
-
-            if (!correspondingUploadUser.isPresent) {
-                correspondingUploadUser = accountManager.getUser(failedUpload.accountName)
-                if (!correspondingUploadUser.isPresent) {
-                    uploadsStorageManager.removeUpload(failedUpload)
-                    continue
-                }
-                uploadUsers.add(correspondingUploadUser.get())
-            }
 
             val isDeleted = !File(failedUpload.localPath).exists()
             if (isDeleted) {
@@ -156,8 +140,9 @@ class FileUploadHelper {
             }
         }
 
-        uploadUsers.forEach {
-            backgroundJobManager.startFilesUploadJob(it)
+        accountManager.accounts.forEach {
+            val user = accountManager.getUser(it.name)
+            if (user.isPresent) backgroundJobManager.startFilesUploadJob(user.get())
         }
 
         return showNotExistMessage