From 35729e57269323895182f4887b955b0203620c05 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 14 Sep 2023 17:13:06 +0200
Subject: [PATCH] Removed reaction from notification if user remove it's
 reaction

---
 .../notifications/NotificationsManager.kt     | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index c25bfa158..449cb7401 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -68,7 +68,10 @@ class NotifiableMessage(
     val senderAvatar: Bitmap? = null,
     var filePath: Uri? = null,
     var fileMime: String? = null,
-    val isOutgoing: Boolean = false
+    val isOutgoing: Boolean = false,
+    val isReaction: Boolean = false,
+    val reactionToMessageId: String? = null,
+    val reactionFrom: String? = null
 )
 
 class NotificationsManager(private val context: Context) {
@@ -204,8 +207,47 @@ class NotificationsManager(private val context: Context) {
         ) {
             Log.i(
                 "[Notifications Manager] [${address.asStringUriOnly()}] removed it's previously sent reaction for chat message [$message]"
-                // TODO: remove notification if any
             )
+            if (corePreferences.disableChat) return
+
+            if (chatRoom.muted) {
+                val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
+                Log.i("[Notifications Manager] Chat room $id has been muted")
+                return
+            }
+
+            val chatRoomPeerAddress = chatRoom.peerAddress.asStringUriOnly()
+            var notifiable: Notifiable? = chatNotificationsMap[chatRoomPeerAddress]
+            if (notifiable == null) {
+                Log.i(
+                    "[Notifications Manager] No notification for chat room [$chatRoomPeerAddress], nothing to do"
+                )
+                return
+            }
+
+            val from = address.asStringUriOnly()
+            val found = notifiable.messages.find {
+                it.isReaction && it.reactionToMessageId == message.messageId && it.reactionFrom == from
+            }
+            if (found != null) {
+                if (notifiable.messages.remove(found)) {
+                    if (notifiable.messages.isNotEmpty()) {
+                        Log.i(
+                            "[Notifications Manager] After removing original reaction notification there is still messages, updating notification"
+                        )
+                        displayChatNotifiable(chatRoom, notifiable)
+                    } else {
+                        Log.i(
+                            "[Notifications Manager] After removing original reaction notification there is nothing left to display, remove notification"
+                        )
+                        notificationManager.cancel(CHAT_TAG, notifiable.notificationId)
+                    }
+                }
+            } else {
+                Log.w(
+                    "[Notifications Manager] Original reaction not found in currently displayed notification"
+                )
+            }
         }
 
         override fun onNewMessageReaction(
@@ -924,7 +966,10 @@ class NotificationsManager(private val context: Context) {
             displayName,
             message.time,
             senderAvatar = roundPicture,
-            isOutgoing = false
+            isOutgoing = false,
+            isReaction = true,
+            reactionToMessageId = message.messageId,
+            reactionFrom = from.asStringUriOnly()
         )
         notifiable.messages.add(notifiableMessage)