fix(auto-upload): handle upload results

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

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadEntityResult.kt

@@ -11,7 +11,7 @@ import com.nextcloud.client.database.entity.UploadEntity
 import com.owncloud.android.db.OCUpload
 
 sealed class AutoUploadEntityResult {
-    data object SyncConflict : AutoUploadEntityResult()
+    data object PermanentFailure : AutoUploadEntityResult()
     data object CreationError : AutoUploadEntityResult()
     data object Uploaded : AutoUploadEntityResult()
     data class Success(val data: Pair<UploadEntity, OCUpload>) : AutoUploadEntityResult()

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt

@@ -26,6 +26,7 @@ import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.jobs.utils.UploadErrorNotificationManager
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.SubFolderRule
+import com.nextcloud.utils.extensions.isPermanentFailure
 import com.nextcloud.utils.extensions.updateStatus
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
@@ -415,9 +416,13 @@ class AutoUploadWorker(
         )
 
         val lastUploadResult = uploadEntity?.lastResult?.let { UploadResult.fromValue(it) }
-        if (lastUploadResult == UploadResult.SYNC_CONFLICT) {
-            Log_OC.w(TAG, "Conflict already exists, skipping auto-upload: $localPath")
-            return AutoUploadEntityResult.SyncConflict
+        if (lastUploadResult?.isPermanentFailure() == true) {
+            Log_OC.w(
+                TAG,
+                "last upload failed with permanent failure, skipping auto-upload: $localPath," +
+                    " failure: ${lastUploadResult.value}"
+            )
+            return AutoUploadEntityResult.PermanentFailure
         }
 
         val upload = try {

app/src/main/java/com/nextcloud/utils/extensions/RemoteOperationResultExtensions.kt

@@ -9,13 +9,10 @@ package com.nextcloud.utils.extensions
 
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
-import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
-import com.owncloud.android.lib.resources.files.model.RemoteFile
 import com.owncloud.android.utils.ErrorMessageAdapter
-import com.owncloud.android.utils.FileStorageUtils
 
 @Suppress("ReturnCount")
 fun Pair<RemoteOperationResult<*>?, RemoteOperation<*>?>?.getErrorMessage(): String {
@@ -45,20 +42,3 @@ fun ResultCode.isFileSpecificError(): Boolean {
 
     return !errorCodes.contains(this)
 }
-
-@Suppress("Deprecation")
-fun RemoteOperationResult<*>?.toOCFile(): List<OCFile>? = if (this?.isSuccess == true) {
-    data?.toOCFileList()
-} else {
-    null
-}
-
-private fun ArrayList<Any>.toOCFileList(): List<OCFile> = this.mapNotNull {
-    val remoteFile = (it as? RemoteFile)
-
-    remoteFile?.let {
-        remoteFile.toOCFile()
-    }
-}
-
-private fun RemoteFile?.toOCFile(): OCFile = FileStorageUtils.fillOCFile(this)

app/src/main/java/com/nextcloud/utils/extensions/UploadResultExtensions.kt

@@ -0,0 +1,31 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils.extensions
+
+import com.owncloud.android.db.UploadResult
+
+fun UploadResult.isPermanentFailure(): Boolean = when (this) {
+    UploadResult.FILE_NOT_FOUND,
+    UploadResult.FILE_ERROR,
+    UploadResult.FOLDER_ERROR,
+    UploadResult.CANNOT_CREATE_FILE,
+    UploadResult.SYNC_CONFLICT,
+    UploadResult.LOCAL_STORAGE_NOT_COPIED,
+    UploadResult.VIRUS_DETECTED,
+    UploadResult.QUOTA_EXCEEDED,
+    UploadResult.SAME_FILE_CONFLICT,
+    UploadResult.PRIVILEGES_ERROR,
+    UploadResult.CREDENTIAL_ERROR,
+    UploadResult.UNKNOWN,
+
+    // user's choice
+    UploadResult.CANCELLED -> true
+
+    // Everything else may succeed after retry
+    else -> false
+}