do not show all sync conflict notifications during app launch

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/AndroidManifest.xml

@@ -288,6 +288,9 @@
             android:exported="false"
             tools:replace="android:exported" />
 
+        <receiver
+            android:name="com.nextcloud.client.notifications.action.SyncConflictNotificationBroadcastReceiver"
+            android:exported="false" />
         <receiver
             android:name="com.nextcloud.client.jobs.offlineOperations.receiver.OfflineOperationReceiver"
             android:exported="false" />

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

@@ -19,6 +19,7 @@ import com.nextcloud.client.device.BatteryStatus
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.jobs.BackgroundJobManager
 import com.nextcloud.client.jobs.upload.FileUploadWorker.Companion.currentUploadFileOperation
+import com.nextcloud.client.notifications.AppWideNotificationManager
 import com.nextcloud.client.network.Connectivity
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.utils.extensions.getUploadIds
@@ -170,13 +171,20 @@ class FileUploadHelper {
         uploads: Array<OCUpload>
     ): Boolean {
         var showNotExistMessage = false
+        var showSyncConflictNotification = false
         val isOnline = checkConnectivity(connectivityService)
         val connectivity = connectivityService.connectivity
         val batteryStatus = powerManagementService.battery
 
         val uploadsToRetry = mutableListOf<Long>()
 
         for (upload in uploads) {
+            if (upload.lastResult == UploadResult.SYNC_CONFLICT) {
+                Log_OC.d(TAG, "retry upload skipped, sync conflict: ${upload.remotePath}")
+                showSyncConflictNotification = true
+                continue
+            }
+
             val uploadResult = checkUploadConditions(
                 upload,
                 connectivity,
@@ -214,6 +222,10 @@ class FileUploadHelper {
             )
         }
 
+        if (showSyncConflictNotification) {
+            AppWideNotificationManager.showSyncConflictNotification(MainApp.getAppContext())
+        }
+
         return showNotExistMessage
     }
 

app/src/main/java/com/nextcloud/client/notifications/AppWideNotificationManager.kt

@@ -0,0 +1,79 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.notifications
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.nextcloud.client.notifications.action.SyncConflictNotificationBroadcastReceiver
+import com.owncloud.android.R
+import com.owncloud.android.ui.activity.UploadListActivity
+import com.owncloud.android.ui.notifications.NotificationUtils
+
+/**
+ * Responsible for showing **app-wide notifications** in the app.
+ *
+ * This manager provides a centralized place to create and display notifications
+ * that are not tied to a specific screen or feature.
+ *
+ */
+object AppWideNotificationManager {
+
+    private const val SYNC_CONFLICT_NOTIFICATION_INTENT_REQ_CODE = 16
+    private const val SYNC_CONFLICT_NOTIFICATION_INTENT_ACTION_REQ_CODE = 17
+
+    private const val SYNC_CONFLICT_NOTIFICATION_ID = 112
+
+    fun showSyncConflictNotification(context: Context) {
+        val intent = Intent(context, UploadListActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+
+        val pendingIntent = PendingIntent.getActivity(
+            context,
+            SYNC_CONFLICT_NOTIFICATION_INTENT_REQ_CODE,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val actionIntent = Intent(context, SyncConflictNotificationBroadcastReceiver::class.java).apply {
+            putExtra(SyncConflictNotificationBroadcastReceiver.NOTIFICATION_ID, SYNC_CONFLICT_NOTIFICATION_ID)
+        }
+
+        val actionPendingIntent = PendingIntent.getBroadcast(
+            context,
+            SYNC_CONFLICT_NOTIFICATION_INTENT_ACTION_REQ_CODE,
+            actionIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val notification = NotificationCompat.Builder(context, NotificationUtils.NOTIFICATION_CHANNEL_UPLOAD)
+            .setSmallIcon(R.drawable.uploads)
+            .setContentTitle(context.getString(R.string.uploader_upload_failed_sync_conflict_error))
+            .setContentText(context.getString(R.string.upload_conflict_message))
+            .setStyle(
+                NotificationCompat.BigTextStyle()
+                    .bigText(context.getString(R.string.upload_conflict_message))
+            )
+            .addAction(
+                R.drawable.ic_cloud_upload,
+                context.getString(R.string.upload_list_resolve_conflict),
+                actionPendingIntent
+            )
+            .setContentIntent(pendingIntent)
+            .setAutoCancel(true)
+            .setOnlyAlertOnce(true)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .build()
+
+        NotificationManagerCompat.from(context)
+            .notify(SYNC_CONFLICT_NOTIFICATION_ID, notification)
+    }
+}

app/src/main/java/com/nextcloud/client/notifications/action/SyncConflictNotificationBroadcastReceiver.kt

@@ -0,0 +1,33 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <[email protected]>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.client.notifications.action
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.NotificationManagerCompat
+import com.owncloud.android.ui.activity.UploadListActivity
+
+class SyncConflictNotificationBroadcastReceiver : BroadcastReceiver() {
+    companion object {
+        const val NOTIFICATION_ID = "NOTIFICATION_ID"
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        val notificationId = intent.getIntExtra(NOTIFICATION_ID, -1)
+
+        if (notificationId != -1) {
+            NotificationManagerCompat.from(context).cancel(notificationId)
+        }
+
+        val intent = Intent(context, UploadListActivity::class.java).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+        context.startActivity(intent)
+    }
+}

app/src/main/res/values/strings.xml

@@ -1474,4 +1474,6 @@
 
     <string name="failed_to_create_conflict_dialog">Failed to create conflict dialog</string>
     <string name="editor_web_view_cannot_open_file">Cannot open file chooser</string>
+
+    <string name="upload_conflict_message">Upload conflicts detected. Open uploads to resolve</string>
 </resources>