From 53ec4383022e94686df3feb29c04f453fafce403 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Mon, 19 Jan 2026 09:54:01 +0100 Subject: [PATCH] fix(upload-notification): dismiss error notification Signed-off-by: alperozturk96 --- .../jobs/notification/WorkerNotificationManager.kt | 4 ++++ .../client/jobs/upload/UploadNotificationManager.kt | 13 +------------ .../android/ui/activity/ConflictsResolveActivity.kt | 9 +++++---- .../android/ui/notifications/NotificationUtils.kt | 3 --- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt index e5c9f31bb73b..195a11b72a34 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt +++ b/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 { diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt index c01d9a9aa399..912334539c95 100644 --- a/app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt +++ b/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)) diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt index c6901374ca30..0ccc8cf0d810 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt +++ b/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) } } diff --git a/app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.kt b/app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.kt index a116937bebcb..d4172a4f3108 100644 --- a/app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.kt +++ b/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 }