Merge pull request #4440 from nextcloud/bugfix/noid/fixUnreadMarkerCrash

fix crash for unreadMarker
nextcloud · Nov 13, 2024 · 89f3d8a · 89f3d8a
2 parents e268b77 + b766abe
commit 89f3d8a
Showing 1 changed file with 8 additions and 6 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
@@ -2685,12 +2685,14 @@ class ChatActivity :
     private fun isScrolledToBottom() = layoutManager?.findFirstVisibleItemPosition() == 0
 
     private fun setUnreadMessageMarker(chatMessageList: List<ChatMessage>) {
-        val unreadChatMessage = ChatMessage()
-        unreadChatMessage.jsonMessageId = UNREAD_MESSAGES_MARKER_ID
-        unreadChatMessage.actorId = "-1"
-        unreadChatMessage.timestamp = chatMessageList[0].timestamp
-        unreadChatMessage.message = context.getString(R.string.nc_new_messages)
-        adapter?.addToStart(unreadChatMessage, false)
+        if (chatMessageList.isNotEmpty()) {
+            val unreadChatMessage = ChatMessage()
+            unreadChatMessage.jsonMessageId = UNREAD_MESSAGES_MARKER_ID
+            unreadChatMessage.actorId = "-1"
+            unreadChatMessage.timestamp = chatMessageList[0].timestamp
+            unreadChatMessage.message = context.getString(R.string.nc_new_messages)
+            adapter?.addToStart(unreadChatMessage, false)
+        }
     }
 
     private fun processMessagesNotFromTheFuture(chatMessageList: List<ChatMessage>) {