separate between permanent failed uploads and retryable uploads

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

Author: alperozturk96

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

@@ -34,6 +34,7 @@ import com.owncloud.android.datamodel.SyncedFolder
 import com.owncloud.android.datamodel.SyncedFolderProvider
 import com.owncloud.android.datamodel.ThumbnailsCacheManager
 import com.owncloud.android.datamodel.UploadsStorageManager
+import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus
 import com.owncloud.android.db.OCUpload
 import com.owncloud.android.db.UploadResult
 import com.owncloud.android.lib.common.OwnCloudAccount
@@ -261,11 +262,17 @@ class FileUploadWorker(
         val client = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, context)
         val syncFolderHelper = SyncFolderHelper(context)
         val syncedFolders = syncedFolderProvider.syncedFolders
-        var uploadFilesResult = UploadFilesResult.Success
+        var hasRetryableFailure = false
+        var hasNonRetryableFailure = false
 
         for ((index, upload) in uploads.withIndex()) {
             ensureActive()
 
+            if (skip(upload)) {
+                Log_OC.d(TAG, "skipping already settled upload: ${upload.remotePath}, ${upload.lastResult}")
+                continue
+            }
+
             delay(retryPolicy.getDelay().milliseconds)
 
             if (!skipAutoUploadCheck && isBelongToAnySyncedFolder(upload, syncFolderHelper, syncedFolders)) {
@@ -320,10 +327,9 @@ class FileUploadWorker(
             if (!result.isSuccess) {
                 Log_OC.e(TAG, "upload failed for ${upload.remotePath}: ${result.code}")
                 if (uploadResult.isNonRetryable()) {
-                    uploadFilesResult = UploadFilesResult.Error
-                } else if (uploadFilesResult != UploadFilesResult.Error) {
-                    // only set retry if any other not failed before
-                    uploadFilesResult = UploadFilesResult.Retry
+                    hasNonRetryableFailure = true
+                } else {
+                    hasRetryableFailure = true
                 }
             }
 
@@ -335,9 +341,21 @@ class FileUploadWorker(
             }
         }
 
+        val uploadFilesResult = when {
+            hasRetryableFailure -> UploadFilesResult.Retry
+            hasNonRetryableFailure -> UploadFilesResult.Error
+            else -> UploadFilesResult.Success
+        }
+
         return@withContext uploadFilesResult.toWorkerResult()
     }
 
+    private fun skip(upload: OCUpload): Boolean = when (upload.uploadStatus) {
+        UploadStatus.UPLOAD_SUCCEEDED -> true
+        UploadStatus.UPLOAD_FAILED -> upload.lastResult.isNonRetryable()
+        else -> false
+    }
+
     @Suppress("ReturnCount")
     suspend fun isBelongToAnySyncedFolder(
         upload: OCUpload,