浏览代码

Merge pull request #4442 from nextcloud/bugfix/noid/fixPreviousChatMessageCrash

fix crash when getting previousChatMessage
Sowjanya Kota 6 月之前
父节点
当前提交
f0a9d6a1e1
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

+ 2 - 2
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 =