fix(auto-upload): sync conflict handling

alperozturk96 · alperozturk96 · commit 320931c9c58c · 2026-01-22T09:33:53.000+01:00
Signed-off-by: alperozturk96 &lt;alper_ozturk@proton.me&gt;
diff --git a/app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt
@@ -183,8 +183,6 @@ object UploadErrorNotificationManager {
             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

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,6 @@ object UploadErrorNotificationManager {`
`183`	`183`	`if (isSameFileOnRemote) {`
`184`	`184`	`Log_OC.w(TAG, "same file exists on remote")`
`185`	`185`	`notifyOnSameFileExists()`
`186`		`- } else {`
`187`		`- Log_OC.w(TAG, "SYNC_CONFLICT but file not same on remote - no notification needed")`
`188`	`186`	`}`
`189`	`187`
`190`	`188`	`return false`