no "unread messages" popup for invisible messages

if chatMessageList is empty after handleSystemMessages it makes no sense to call the following methods. Also processMessagesFromTheFuture was executed which caused that the popup was shown. A better solution for the future should be to handle(remove) the "to-hide" system messages already in the repo or viewmodel Signed-off-by: Marcel Hibbe <[email protected]>
nextcloud · Jan 17, 2025 · 5535bed · 5535bed
1 parent 779c162
commit 5535bed
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -861,14 +861,15 @@ class ChatActivity :
                     var chatMessageList = triple.third
 
                     chatMessageList = handleSystemMessages(chatMessageList)
+                    if (chatMessageList.isEmpty()) {
+                        return@onEach
+                    }
 
                     determinePreviousMessageIds(chatMessageList)
 
                     handleExpandableSystemMessages(chatMessageList)
 
-                    if (chatMessageList.isNotEmpty() &&
-                        ChatMessage.SystemMessageType.CLEARED_CHAT == chatMessageList[0].systemMessageType
-                    ) {
+                    if (ChatMessage.SystemMessageType.CLEARED_CHAT == chatMessageList[0].systemMessageType) {
                         adapter?.clear()
                         adapter?.notifyDataSetChanged()
                     }