Merge pull request #934 from vector-im/feature/bma/clearNotifications

Clear all notifications of the session when the user signs out.
element-hq · Jul 21, 2023 · c94789d · c94789d
2 parents d9be396 + 17c7ecd
commit c94789d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/.../io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt b/.../io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
@@ -23,17 +23,18 @@ import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SingleIn
+import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.user.MatrixUser
-import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
 import io.element.android.libraries.push.api.store.PushDataStore
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
-import io.element.android.services.appnavstate.api.NavigationState
 import io.element.android.services.appnavstate.api.AppNavigationStateService
+import io.element.android.services.appnavstate.api.NavigationState
+import io.element.android.services.appnavstate.api.currentSessionId
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -76,9 +77,16 @@ class DefaultNotificationDrawerManager @Inject constructor(
         }
     }
 
+    private var currentAppNavigationState: NavigationState? = null
+
     private fun onAppNavigationStateChange(navigationState: NavigationState) {
         when (navigationState) {
-            NavigationState.Root -> {}
+            NavigationState.Root -> {
+                currentAppNavigationState?.currentSessionId()?.let { sessionId ->
+                    // User signed out, clear all notifications related to the session.
+                    clearAllEvents(sessionId)
+                }
+            }
             is NavigationState.Session -> {}
             is NavigationState.Space -> {}
             is NavigationState.Room -> {
@@ -93,6 +101,7 @@ class DefaultNotificationDrawerManager @Inject constructor(
                 )
             }
         }
+        currentAppNavigationState = navigationState
     }
 
     private fun createInitialNotificationState(): NotificationState {
@@ -133,12 +142,21 @@ class DefaultNotificationDrawerManager @Inject constructor(
     /**
      * Clear all known events and refresh the notification drawer.
      */
-    fun clearAllEvents(sessionId: SessionId) {
+    fun clearAllMessagesEvents(sessionId: SessionId) {
         updateEvents {
             it.clearMessagesForSession(sessionId)
         }
     }
 
+    /**
+     * Clear all notifications related to the session and refresh the notification drawer.
+     */
+    fun clearAllEvents(sessionId: SessionId) {
+        updateEvents {
+            it.clearAllForSession(sessionId)
+        }
+    }
+
     /**
      * Should be called when the application is currently opened and showing timeline for the given roomId.
      * Used to ignore events related to that room (no need to display notification) and clean any existing notification on this room.

diff --git a/...lin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt b/...lin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
@@ -59,7 +59,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 defaultNotificationDrawerManager.clearMessagesForRoom(sessionId, roomId)
             }
             actionIds.dismissSummary ->
-                defaultNotificationDrawerManager.clearAllEvents(sessionId)
+                defaultNotificationDrawerManager.clearAllMessagesEvents(sessionId)
             actionIds.dismissInvite -> if (roomId != null) {
                 defaultNotificationDrawerManager.clearMembershipNotificationForRoom(sessionId, roomId)
             }

diff --git a/...ain/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventQueue.kt b/...ain/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventQueue.kt
@@ -154,6 +154,11 @@ data class NotificationEventQueue constructor(
         queue.removeAll { it is NotifiableMessageEvent && it.sessionId == sessionId }
     }
 
+    fun clearAllForSession(sessionId: SessionId) {
+        Timber.d("clearAllForSession $sessionId")
+        queue.removeAll { it.sessionId == sessionId }
+    }
+
     fun clearMessagesForRoom(sessionId: SessionId, roomId: RoomId) {
         Timber.d("clearMessageEventOfRoom $sessionId, $roomId")
         queue.removeAll { it is NotifiableMessageEvent && it.sessionId == sessionId && it.roomId == roomId }