Merge pull request #4442 from nextcloud/bugfix/noid/fixPreviousChatMe…

…ssageCrash fix crash when getting previousChatMessage
nextcloud · Nov 13, 2024 · f0a9d6a · f0a9d6a
2 parents 89f3d8a + dcec7bd
commit f0a9d6a
Showing 1 changed file with 2 additions and 2 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
@@ -2663,8 +2663,8 @@ class ChatActivity :
             chatMessage.activeUser = conversationUser
 
             adapter?.let {
-                val previousChatMessage = adapter!!.items[1].item
-                if (previousChatMessage is ChatMessage) {
+                val previousChatMessage = it.items?.getOrNull(1)?.item
+                if (previousChatMessage != null && previousChatMessage is ChatMessage) {
                     chatMessage.isGrouped = groupMessages(chatMessage, previousChatMessage)
                 }
                 chatMessage.isOneToOneConversation =