Merge pull request #16343 from nextcloud/backport/16336/stable-3.35

[stable-3.35] fix(auto-upload): sync conflict handling

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/upload/FileUploadWorker.kt

@@ -380,7 +380,7 @@ class FileUploadWorker(
                     notificationManager,
                     operation,
                     result,
-                    showSameFileAlreadyExistsNotification = {
+                    onSameFileConflict = {
                         withContext(Dispatchers.Main) {
                             val showSameFileAlreadyExistsNotification =
                                 inputData.getBoolean(SHOW_SAME_FILE_ALREADY_EXISTS_NOTIFICATION, false)

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

@@ -31,39 +31,74 @@ import java.io.File
 object UploadErrorNotificationManager {
     private const val TAG = "UploadErrorNotificationManager"
 
+    /**
+     * Processes the result of an upload operation and manages error notifications.
+     * * It filters out successful or silent results and handles [ResultCode.SYNC_CONFLICT]
+     * by checking if the remote file is identical. If it's a "real" conflict or error,
+     * it displays a notification with relevant actions (e.g., Resolve Conflict, Pause, Cancel).
+     *
+     * @param onSameFileConflict Triggered only if result code is SYNC_CONFLICT and files are identical.
+     */
+    @Suppress("ReturnCount")
     suspend fun handleResult(
         context: Context,
         notificationManager: WorkerNotificationManager,
         operation: UploadFileOperation,
         result: RemoteOperationResult<Any?>,
-        showSameFileAlreadyExistsNotification: suspend () -> Unit = {}
+        onSameFileConflict: suspend () -> Unit = {}
     ) {
         Log_OC.d(TAG, "handle upload result with result code: " + result.code)
 
-        val notification = withContext(Dispatchers.IO) {
-            val isSameFileOnRemote = FileUploadHelper.instance().isSameFileOnRemote(
-                operation.user,
-                File(operation.storagePath),
-                operation.remotePath,
-                context
-            )
+        if (result.isSuccess || result.isCancelled || operation.isMissingPermissionThrown) {
+            Log_OC.d(TAG, "operation is successful, cancelled or lack of storage permission, notification skipped")
+            return
+        }
 
-            getNotification(
-                isSameFileOnRemote,
-                context,
-                notificationManager.notificationBuilder,
-                operation,
-                result,
-                notifyOnSameFileExists = {
-                    showSameFileAlreadyExistsNotification()
-                    operation.handleLocalBehaviour()
-                }
-            )
-        } ?: return
+        val silentCodes = setOf(
+            ResultCode.DELAYED_FOR_WIFI,
+            ResultCode.DELAYED_FOR_CHARGING,
+            ResultCode.DELAYED_IN_POWER_SAVE_MODE,
+            ResultCode.LOCAL_FILE_NOT_FOUND,
+            ResultCode.LOCK_FAILED
+        )
+
+        if (result.code in silentCodes) {
+            Log_OC.d(TAG, "silent error code, notification skipped")
+            return
+        }
+
+        // do not show an error notification when uploading the same file again
+        if (result.code == ResultCode.SYNC_CONFLICT) {
+            val isSameFile = withContext(Dispatchers.IO) {
+                FileUploadHelper.instance().isSameFileOnRemote(
+                    operation.user,
+                    File(operation.storagePath),
+                    operation.remotePath,
+                    context
+                )
+            }
+
+            if (isSameFile) {
+                Log_OC.w(TAG, "exact same file already exists on remote, error notification skipped")
+
+                // only show notification for manual uploads
+                onSameFileConflict()
+                return
+            }
+        }
+
+        // now we can show error notification
+        val notification = getNotification(
+            context,
+            notificationManager.notificationBuilder,
+            operation,
+            result
+        )
 
         Log_OC.d(TAG, "🔔" + "notification created")
 
         withContext(Dispatchers.Main) {
+            // if error code is file specific show new notification for each file
             if (result.code.isFileSpecificError()) {
                 notificationManager.showNotification(operation.ocUploadId.toInt(), notification)
             } else {
@@ -72,16 +107,12 @@ object UploadErrorNotificationManager {
         }
     }
 
-    private suspend fun getNotification(
-        isSameFileOnRemote: Boolean,
+    private fun getNotification(
         context: Context,
         builder: NotificationCompat.Builder,
         operation: UploadFileOperation,
-        result: RemoteOperationResult<Any?>,
-        notifyOnSameFileExists: suspend () -> Unit
-    ): Notification? {
-        if (!shouldShowConflictDialog(isSameFileOnRemote, operation, result, notifyOnSameFileExists)) return null
-
+        result: RemoteOperationResult<Any?>
+    ): Notification {
         val textId = result.code.toFailedResultTitleId()
         val errorMessage = ErrorMessageAdapter.getErrorCauseMessage(result, operation, context.resources)
 
@@ -94,19 +125,19 @@ object UploadErrorNotificationManager {
             setProgress(0, 0, false)
             clearActions()
 
-            result.code.takeIf { it == ResultCode.SYNC_CONFLICT }?.let {
+            // actions for all error types
+            addAction(UploadBroadcastAction.PauseAndCancel(operation).pauseAction(context))
+            addAction(UploadBroadcastAction.PauseAndCancel(operation).cancelAction(context))
+
+            if (result.code == ResultCode.SYNC_CONFLICT) {
                 addAction(
                     R.drawable.ic_cloud_upload,
                     context.getString(R.string.upload_list_resolve_conflict),
                     conflictResolvePendingIntent(context, operation)
                 )
             }
 
-            addAction(UploadBroadcastAction.PauseAndCancel(operation).pauseAction(context))
-
-            addAction(UploadBroadcastAction.PauseAndCancel(operation).cancelAction(context))
-
-            result.code.takeIf { it == ResultCode.UNAUTHORIZED }?.let {
+            if (result.code == ResultCode.UNAUTHORIZED) {
                 setContentIntent(credentialPendingIntent(context, operation))
             }
         }.build()
@@ -159,33 +190,4 @@ object UploadErrorNotificationManager {
             PendingIntent.FLAG_IMMUTABLE
         )
     }
-
-    @Suppress("ReturnCount", "ComplexCondition")
-    private suspend fun shouldShowConflictDialog(
-        isSameFileOnRemote: Boolean,
-        operation: UploadFileOperation,
-        result: RemoteOperationResult<Any?>,
-        notifyOnSameFileExists: suspend () -> Unit
-    ): Boolean {
-        if (result.isSuccess ||
-            result.isCancelled ||
-            result.code == ResultCode.USER_CANCELLED ||
-            operation.isMissingPermissionThrown
-        ) {
-            Log_OC.w(TAG, "operation is successful, cancelled or lack of storage permission")
-            return false
-        }
-
-        if (result.code == ResultCode.SYNC_CONFLICT && isSameFileOnRemote) {
-            Log_OC.w(TAG, "same file exists on remote")
-            notifyOnSameFileExists()
-            return false
-        }
-
-        val delayedCodes =
-            setOf(ResultCode.DELAYED_FOR_WIFI, ResultCode.DELAYED_FOR_CHARGING, ResultCode.DELAYED_IN_POWER_SAVE_MODE)
-        val invalidCodes = setOf(ResultCode.LOCAL_FILE_NOT_FOUND, ResultCode.LOCK_FAILED)
-
-        return result.code !in delayedCodes && result.code !in invalidCodes
-    }
 }

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -1262,27 +1262,6 @@ private RemoteOperationResult checkNameCollision(OCFile parentFile,
         return null;
     }
 
-    public void handleLocalBehaviour() {
-        if (user == null || mFile == null || mContext == null) {
-            Log_OC.d(TAG, "handleLocalBehaviour: user, file, or context is null.");
-            return;
-        }
-
-        final var client = getClient();
-        if (client == null) {
-            Log_OC.d(TAG, "handleLocalBehaviour: client is null");
-            return;
-        }
-
-        String expectedPath = FileStorageUtils.getDefaultSavePathFor(user.getAccountName(), mFile);
-        File expectedFile = new File(expectedPath);
-        File originalFile = new File(mOriginalStoragePath);
-        String temporalPath = FileStorageUtils.getInternalTemporalPath(user.getAccountName(), mContext) + mFile.getRemotePath();
-        File temporalFile = new File(temporalPath);
-
-        handleLocalBehaviour(temporalFile, expectedFile, originalFile, client);
-    }
-
     private void deleteNonExistingFile(File file) {
         if (file.exists()) {
             return;