feat: Remove notifications on read from another client

wireapp · Mar 20, 2024 · 701ad06 · 701ad06
1 parent 01a0da9
commit 701ad06
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/notification/MessageNotificationManager.kt b/app/src/main/kotlin/com/wire/android/notification/MessageNotificationManager.kt
@@ -59,6 +59,7 @@ class MessageNotificationManager
 
         addNotifications(newNotifications, userId, userName)
         updateNotifications(newNotifications, userId)
+        removeSeenNotifications(newNotifications, userId)
 
         appLogger.i("$TAG: handled notifications: newNotifications size ${newNotifications.size}; ")
     }
@@ -90,7 +91,20 @@ class MessageNotificationManager
 
         removeSummaryIfNeeded(userId)
 
-        appLogger.i("$TAG: added notifications: newNotifications size ${notificationsToUpdate.size}; ")
+        appLogger.i("$TAG: updated notifications: newNotifications size ${notificationsToUpdate.size}; ")
+    }
+
+    private fun removeSeenNotifications(newNotifications: List<LocalNotification>, userId: QualifiedID) {
+        val notificationsToUpdate: List<LocalNotification.ConversationSeen> = newNotifications
+            .filterIsInstance(LocalNotification.ConversationSeen::class.java)
+
+        notificationsToUpdate.groupBy { it.conversationId }.forEach { (conversationId, _) ->
+            hideNotification(conversationId, userId)
+        }
+
+        removeSummaryIfNeeded(userId)
+
+        appLogger.i("$TAG: removed ${notificationsToUpdate.size} notifications, it was seen;")
     }
 
     fun hideNotification(conversationsId: ConversationId, userId: QualifiedID) {
@@ -228,6 +242,8 @@ class MessageNotificationManager
                                 setContentIntent(messagePendingIntent(context, conversation.id, userIdString))
                             }
 
+                            is NotificationMessage.ConversationSeen -> {}
+
                             null -> {
                                 val isAppLocked = lockCodeTimeManager.isAppLocked()
                                 setContentIntent(messagePendingIntent(context, conversation.id, userIdString))
@@ -409,6 +425,7 @@ class MessageNotificationManager
             is NotificationMessage.ConnectionRequest -> italicTextFromResId(R.string.notification_connection_request)
             is NotificationMessage.ConversationDeleted -> italicTextFromResId(R.string.notification_conversation_deleted)
             is NotificationMessage.Knock -> italicTextFromResId(R.string.notification_knock)
+            is NotificationMessage.ConversationSeen,
             is NotificationMessage.ObfuscatedMessage,
             is NotificationMessage.ObfuscatedKnock -> italicTextFromResId(
                 R.string.notification_obfuscated_message_content

diff --git a/app/src/main/kotlin/com/wire/android/notification/Models.kt b/app/src/main/kotlin/com/wire/android/notification/Models.kt
@@ -98,15 +98,18 @@ sealed class NotificationMessage(open val messageId: String, open val author: No
         override val author: NotificationMessageAuthor,
         override val time: Long,
         val authorId: String
-    ) :
-        NotificationMessage(messageId, author, time)
+    ) : NotificationMessage(messageId, author, time)
 
     data class ConversationDeleted(
         override val messageId: String,
         override val author: NotificationMessageAuthor,
         override val time: Long
-    ) :
-        NotificationMessage(messageId, author, time)
+    ) : NotificationMessage(messageId, author, time)
+
+    data class ConversationSeen(
+        override val messageId: String,
+        override val time: Long
+    ) : NotificationMessage(messageId, null, time)
 }
 
 data class NotificationMessageAuthor(val name: String, val image: ByteArray?) {
@@ -222,6 +225,9 @@ fun LocalNotificationMessage.intoNotificationMessage(): NotificationMessage {
             messageId,
             notificationMessageTime
         )
+
+        is LocalNotificationMessage.ConversationSeen -> NotificationMessage.ConversationSeen(messageId, notificationMessageTime)
+
     }
 }
 

diff --git a/kalium b/kalium
+7 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/notification/LocalNotification.kt
+6 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/notification/LocalNotificationMessageMapper.kt
+6 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+7 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/message/EphemeralEventsNotificationManagerImpl.kt
+9 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/LastReadContentHandler.kt
+11 −0		persistence/src/commonMain/db_user/com/wire/kalium/persistence/UnreadEvents.sq
+1 −1		testservice/src/main/kotlin/com/wire/kalium/testservice/api/v1/ConversationResources.kt