Dismiss only content provider specific notification

bitfireAT · Feb 12, 2025 · 291b21d · 291b21d
1 parent 5d5ffab
commit 291b21d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/sync/SyncNotificationManager.kt b/app/src/main/kotlin/at/bitfire/davdroid/sync/SyncNotificationManager.kt
@@ -54,9 +54,9 @@ class SyncNotificationManager @AssistedInject constructor(
     fun dismiss(notificationTag: String) = NotificationManagerCompat.from(context)
         .cancel(notificationTag, NotificationRegistry.NOTIFY_SYNC_ERROR)
 
-    fun notifyContentProviderError() = notificationRegistry.notifyIfPossible(
+    fun notifyContentProviderError(authority: String) = notificationRegistry.notifyIfPossible(
         NotificationRegistry.NOTIFY_SYNC_ERROR,
-        tag = NOTIFICATION_TAG_CONTENT_PROVIDER_ERROR
+        tag = authority
     ) {
         NotificationCompat.Builder(context, notificationRegistry.CHANNEL_SYNC_ERRORS)
             .setSmallIcon(R.drawable.ic_sync_problem_notify)
@@ -229,8 +229,4 @@ class SyncNotificationManager @AssistedInject constructor(
             null
     }
 
-    companion object {
-        const val NOTIFICATION_TAG_CONTENT_PROVIDER_ERROR = "content-provider-error"
-    }
-
 }
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/sync/Syncer.kt b/app/src/main/kotlin/at/bitfire/davdroid/sync/Syncer.kt
@@ -264,14 +264,14 @@ abstract class Syncer<StoreType: LocalDataStore<CollectionType>, CollectionType:
                  - the content provider is not available at all, for instance because the tasks app has been uninstalled
                    or the respective system app (like "calendar storage") is disabled */
                 logger.warning("Couldn't connect to content provider of authority ${dataStore.authority}")
-                syncNotificationManager.notifyContentProviderError()
+                syncNotificationManager.notifyContentProviderError(dataStore.authority)
                 syncResult.contentProviderError = true
 
                 return // Don't continue without provider
             }
 
             // Dismiss previous content provider error notification
-            syncNotificationManager.dismiss(SyncNotificationManager.NOTIFICATION_TAG_CONTENT_PROVIDER_ERROR)
+            syncNotificationManager.dismiss(dataStore.authority)
 
             // run sync
             try {