fix: self deleting ping has no sound (WPB-3175) (#2269)

wireapp · Sep 26, 2023 · 6c62bf9 · 6c62bf9
1 parent 3e508a1
commit 6c62bf9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 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
@@ -220,6 +220,11 @@ class MessageNotificationManager
                                 addAction(getActionReply(context, conversation.id, userIdString))
                             }
 
+                            is NotificationMessage.ObfuscatedKnock -> {
+                                setChannelId(NotificationConstants.getPingsChannelId(userId))
+                                setContentIntent(messagePendingIntent(context, conversation.id, userIdString))
+                            }
+
                             null -> {
                                 setContentIntent(messagePendingIntent(context, conversation.id, userIdString))
                                 addAction(getActionReply(context, conversation.id, userIdString))
@@ -400,7 +405,8 @@ 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.ObfuscatedMessage -> italicTextFromResId(
+            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
@@ -70,6 +70,11 @@ sealed class NotificationMessage(open val messageId: String, open val author: No
         override val time: Long
     ) : NotificationMessage(messageId, null, time)
 
+    data class ObfuscatedKnock(
+        override val messageId: String,
+        override val time: Long
+    ) : NotificationMessage(messageId, null, time)
+
     data class Text(
         override val messageId: String,
         override val author: NotificationMessageAuthor,
@@ -207,6 +212,13 @@ fun LocalNotificationMessage.intoNotificationMessage(): NotificationMessage {
             )
         }
 
+        is LocalNotificationMessage.SelfDeleteKnock -> {
+            NotificationMessage.ObfuscatedKnock(
+                messageId = messageId,
+                time = notificationMessageTime
+            )
+        }
+
         is LocalNotificationMessage.SelfDeleteMessage -> NotificationMessage.ObfuscatedMessage(
             messageId,
             notificationMessageTime

diff --git a/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt b/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt
@@ -438,7 +438,10 @@ class WireNotificationManager @Inject constructor(
                 .any {
                     it.conversationId == conversationId &&
                             it is LocalNotification.Conversation &&
-                            it.messages.any { message -> message is LocalNotificationMessage.Knock }
+                            it.messages.any { message ->
+                                message is LocalNotificationMessage.Knock ||
+                                        message is LocalNotificationMessage.SelfDeleteKnock
+                            }
                 }
 
             if (containsPingMessage) {

diff --git a/kalium b/kalium
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt
+74 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/TypingIndicatorRepository.kt
+19 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/Event.kt
+22 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/event/EventMapper.kt
+11 −5		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
+5 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/notification/LocalNotification.kt
+16 −10		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+8 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ConversationScope.kt
+38 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ObserveUsersTypingUseCase.kt
+4 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/ConversationEventReceiver.kt
+48 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/TypingIndicatorHandler.kt
+13 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/util/CommonUtils.kt
+88 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/TypingIndicatorRepositoryTest.kt
+9 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt
+71 −24		logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/ConversationEventReceiverTest.kt
+83 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/handler/TypingIndicatorHandlerTest.kt
+33 −0		...c/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/conversation/TypingIndicatorStatusDTO.kt
+10 −1		network/src/commonMain/kotlin/com/wire/kalium/network/api/base/authenticated/notification/EventContentDTO.kt