From ecc318d0841fa67edec172cd7554b583831c7b76 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 1 Sep 2021 17:14:21 +0200
Subject: [PATCH] Improved how chatRoom.markAsRead() and notifications are
 handled

---
 app/src/main/assets/linphonerc_default           |  1 -
 .../activities/chat_bubble/ChatBubbleActivity.kt |  2 +-
 .../main/chat/adapters/ChatRoomsListAdapter.kt   |  1 -
 .../chat/fragments/DetailChatRoomFragment.kt     |  2 +-
 .../chat/fragments/MasterChatRoomsFragment.kt    |  2 --
 .../chat/viewmodels/ChatMessagesListViewModel.kt |  6 ------
 .../notifications/NotificationsManager.kt        | 16 +++++++---------
 7 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/app/src/main/assets/linphonerc_default b/app/src/main/assets/linphonerc_default
index 1691780b7..48add4247 100644
--- a/app/src/main/assets/linphonerc_default
+++ b/app/src/main/assets/linphonerc_default
@@ -21,7 +21,6 @@ size=vga
 
 [app]
 tunnel=disabled
-push_notification=1
 auto_start=1
 
 [tunnel]
diff --git a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
index 139cba589..11358e07c 100644
--- a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
+++ b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
@@ -146,7 +146,7 @@ class ChatBubbleActivity : GenericActivity() {
         }
 
         binding.setCloseBubbleClickListener {
-            coreContext.notificationsManager.cancelChatNotificationIdForSipUri(viewModel.chatRoom.peerAddress.asStringUriOnly())
+            coreContext.notificationsManager.dismissChatNotification(viewModel.chatRoom)
         }
 
         binding.setSendMessageClickListener {
diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
index 260b60290..796f445be 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatRoomsListAdapter.kt
@@ -83,7 +83,6 @@ class ChatRoomsListAdapter(
                         selectionViewModel.onToggleSelect(adapterPosition)
                     } else {
                         selectedChatRoomEvent.value = Event(chatRoomViewModel.chatRoom)
-                        chatRoomViewModel.chatRoom.markAsRead()
                     }
                 }
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index d2f744f10..70779b967 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -449,7 +449,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             // Prevent notifications for this chat room to be displayed
             val peerAddress = viewModel.chatRoom.peerAddress.asStringUriOnly()
             coreContext.notificationsManager.currentlyDisplayedChatRoomAddress = peerAddress
-            coreContext.notificationsManager.cancelChatNotificationIdForSipUri(peerAddress)
+            viewModel.chatRoom.markAsRead()
         } else {
             Log.e("[Chat Room] Fragment resuming but viewModel lateinit property isn't initialized!")
         }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index 272a4f7c8..2b9b32eb4 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -159,7 +159,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             override fun onLeftToRightSwipe(viewHolder: RecyclerView.ViewHolder) {
                 val chatRoomViewModel = adapter.currentList[viewHolder.adapterPosition]
                 chatRoomViewModel.chatRoom.markAsRead()
-                coreContext.notificationsManager.dismissChatNotification(chatRoomViewModel.chatRoom)
                 adapter.notifyItemChanged(viewHolder.adapterPosition)
             }
 
@@ -266,7 +265,6 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             val chatRoom = coreContext.core.searchChatRoom(null, localAddress, remoteSipAddress, arrayOfNulls(0))
             if (chatRoom != null) {
                 Log.i("[Chat] Found matching chat room $chatRoom")
-                chatRoom.markAsRead()
                 adapter.selectedChatRoomEvent.value = Event(chatRoom)
             }
         } else {
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
index 570d60327..eda186354 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessagesListViewModel.kt
@@ -23,7 +23,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import java.util.*
-import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.activities.main.chat.data.EventLogData
 import org.linphone.core.*
 import org.linphone.core.tools.Log
@@ -58,11 +57,6 @@ class ChatMessagesListViewModel(private val chatRoom: ChatRoom) : ViewModel() {
 
     private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() {
         override fun onChatMessageReceived(chatRoom: ChatRoom, eventLog: EventLog) {
-            // Do not mark as read if DetailChatRoomFragment was opened before app was put in background
-            if (coreContext.notificationsManager.currentlyDisplayedChatRoomAddress == chatRoom.peerAddress.asStringUriOnly()) {
-                chatRoom.markAsRead()
-            }
-
             if (eventLog.type == EventLog.Type.ConferenceChatMessage) {
                 val chatMessage = eventLog.chatMessage
                 chatMessage ?: return
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 101c21eab..91a7b06fc 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -140,7 +140,8 @@ class NotificationsManager(private val context: Context) {
             }
 
             if (currentlyDisplayedChatRoomAddress == room.peerAddress.asStringUriOnly()) {
-                Log.i("[Notifications Manager] Chat room is currently displayed, do not notify received message")
+                Log.i("[Notifications Manager] Chat room is currently displayed, do not notify received message & mark it as read")
+                room.markAsRead()
                 return
             }
 
@@ -162,6 +163,11 @@ class NotificationsManager(private val context: Context) {
             }
             displayIncomingChatNotification(room, message)
         }
+
+        override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
+            Log.i("[Notifications Manager] Chat room [$chatRoom] has been marked as read, removing notification if any")
+            dismissChatNotification(chatRoom)
+        }
     }
 
     val chatListener: ChatMessageListener = object : ChatMessageListenerStub() {
@@ -231,14 +237,6 @@ class NotificationsManager(private val context: Context) {
         notificationManager.cancel(id)
     }
 
-    fun cancelChatNotificationIdForSipUri(sipUri: String) {
-        val notifiable: Notifiable? = chatNotificationsMap[sipUri]
-        if (notifiable != null) {
-            notifiable.messages.clear()
-            cancel(notifiable.notificationId)
-        }
-    }
-
     fun resetChatNotificationCounterForSipUri(sipUri: String) {
         val notifiable: Notifiable? = chatNotificationsMap[sipUri]
         notifiable?.messages?.clear()