Merge pull request #16316 from nextcloud/fix/dismiss-upload-error-notification

fix(upload-notification): dismiss error notification

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt

@@ -57,6 +57,10 @@ open class WorkerNotificationManager(
         notificationManager.notify(id, notification)
     }
 
+    fun dismissNotification(id: Int) {
+        notificationManager.cancel(id)
+    }
+
     @Suppress("MagicNumber")
     fun setProgress(percent: Int, progressText: String?, indeterminate: Boolean) {
         notificationBuilder.run {

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

@@ -116,22 +116,11 @@ class UploadNotificationManager(private val context: Context, viewThemeUtils: Vi
             return
         }
 
-        dismissOldErrorNotification(operation.file.remotePath, operation.file.storagePath)
-
-        operation.oldFile?.let {
-            dismissOldErrorNotification(it.remotePath, it.storagePath)
-        }
+        dismissNotification(operation.ocUploadId.toInt())
     }
 
     fun dismissErrorNotification() = notificationManager.cancel(FileUploadWorker.NOTIFICATION_ERROR_ID)
 
-    fun dismissOldErrorNotification(remotePath: String, localPath: String) {
-        notificationManager.cancel(
-            NotificationUtils.createUploadNotificationTag(remotePath, localPath),
-            FileUploadWorker.NOTIFICATION_ERROR_ID
-        )
-    }
-
     fun notifyPaused(intent: PendingIntent) {
         notificationBuilder.run {
             setContentTitle(context.getString(R.string.upload_global_pause_title))

app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

@@ -230,12 +230,13 @@ class ConflictsResolveActivity :
 
         upload?.let {
             FileUploadHelper.instance().removeFileUpload(it.remotePath, it.accountName)
-
-            UploadNotificationManager(
+            val id = it.uploadId.toInt()
+            val nm = UploadNotificationManager(
                 applicationContext,
                 viewThemeUtils,
-                upload.uploadId.toInt()
-            ).dismissOldErrorNotification(it.remotePath, it.localPath)
+                id
+            )
+            nm.dismissNotification(id)
         }
     }
 

app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.kt

@@ -22,7 +22,4 @@ object NotificationUtils {
     const val NOTIFICATION_CHANNEL_BACKGROUND_OPERATIONS: String = "NOTIFICATION_CHANNEL_BACKGROUND_OPERATIONS"
     const val NOTIFICATION_CHANNEL_OFFLINE_OPERATIONS: String = "NOTIFICATION_CHANNEL_OFFLINE_OPERATIONS"
     const val NOTIFICATION_CHANNEL_CONTENT_OBSERVER: String = "NOTIFICATION_CHANNEL_CONTENT_OBSERVER"
-
-    @JvmStatic
-    fun createUploadNotificationTag(remotePath: String?, localPath: String): String = remotePath + localPath
 }