fix(auto-upload): sync conflict handling

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

Author: alperozturk96

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

@@ -37,6 +37,7 @@ import com.owncloud.android.db.OCUpload
 import com.owncloud.android.db.UploadResult
 import com.owncloud.android.lib.common.OwnCloudAccount
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.operations.UploadFileOperation
 import com.owncloud.android.ui.activity.SettingsActivity
@@ -346,6 +347,12 @@ class AutoUploadWorker(
                                 TAG,
                                 "❌ upload failed $localPath (${upload.accountName}): ${result.logMessage}"
                             )
+
+                            // Mark CONFLICT files as handled to prevent retries
+                            if (result.code == RemoteOperationResult.ResultCode.SYNC_CONFLICT) {
+                                repository.markFileAsHandled(localPath, syncedFolder)
+                                Log_OC.w(TAG, "Marked CONFLICT file as handled: $localPath")
+                            }
                         }
                     } catch (e: Exception) {
                         uploadsStorageManager.updateStatus(

app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt

@@ -80,7 +80,10 @@ object UploadErrorNotificationManager {
         result: RemoteOperationResult<Any?>,
         notifyOnSameFileExists: suspend () -> Unit
     ): Notification? {
-        if (!shouldShowConflictDialog(isSameFileOnRemote, operation, result, notifyOnSameFileExists)) return null
+        if (!shouldShowConflictDialog(isSameFileOnRemote, operation, result, notifyOnSameFileExists)) {
+            Log_OC.d(TAG, "no need to show conflict resolve notification")
+            return null
+        }
 
         val textId = result.code.toFailedResultTitleId()
         val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(result, operation, context.resources)
@@ -176,9 +179,14 @@ object UploadErrorNotificationManager {
             return false
         }
 
-        if (result.code == ResultCode.SYNC_CONFLICT && isSameFileOnRemote) {
-            Log_OC.w(TAG, "same file exists on remote")
-            notifyOnSameFileExists()
+        if (result.code == ResultCode.SYNC_CONFLICT) {
+            if (isSameFileOnRemote) {
+                Log_OC.w(TAG, "same file exists on remote")
+                notifyOnSameFileExists()
+            } else {
+                Log_OC.w(TAG, "SYNC_CONFLICT but file not same on remote - no notification needed")
+            }
+
             return false
         }