Merge pull request #6260 from nextcloud/backport/6213/stable-24.0

mahibi · web-flow · commit 63916d76f704 · 2026-05-29T17:05:01.000+02:00
[stable-24.0] Improve mark as read logic
diff --git a/app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt b/app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt
@@ -303,15 +303,13 @@ fun ChatView(
         }
     }
 
-    LaunchedEffect(isAtNewest) {
+    LaunchedEffect(isAtNewest, state.chatItems) {
         if (!isAtNewest) return@LaunchedEffect
 
-        latestChatItems
-            .getOrNull(listState.firstVisibleItemIndex)
-            ?.let { item ->
-                if (item is ChatViewModel.ChatItem.MessageItem) {
-                    callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(item.uiMessage.id)
-                }
+        state.chatItems
+            .firstNotNullOfOrNull { (it as? ChatViewModel.ChatItem.MessageItem)?.uiMessage?.id }
+            ?.let { newestId ->
+                callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(newestId)
             }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -303,15 +303,13 @@ fun ChatView(`
`303`	`303`	`}`
`304`	`304`	`}`
`305`	`305`
`306`		`- LaunchedEffect(isAtNewest) {`
	`306`	`+ LaunchedEffect(isAtNewest, state.chatItems) {`
`307`	`307`	`if (!isAtNewest) return@LaunchedEffect`
`308`	`308`
`309`		`- latestChatItems`
`310`		`- .getOrNull(listState.firstVisibleItemIndex)`
`311`		`- ?.let { item ->`
`312`		`- if (item is ChatViewModel.ChatItem.MessageItem) {`
`313`		`- callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(item.uiMessage.id)`
`314`		`- }`
	`309`	`+ state.chatItems`
	`310`	`+ .firstNotNullOfOrNull { (it as? ChatViewModel.ChatItem.MessageItem)?.uiMessage?.id }`
	`311`	`+ ?.let { newestId ->`
	`312`	`+ callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(newestId)`
`315`	`313`	`}`
`316`	`314`	`}`
`317`	`315`