Skip to content

Commit 219d5a1

Browse files
Merge pull request #6213 from nextcloud/fix/6059/markAsRead
Improve mark as read logic
2 parents e2ed666 + f789bc1 commit 219d5a1

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

  • app/src/main/java/com/nextcloud/talk/ui/chat

app/src/main/java/com/nextcloud/talk/ui/chat/ChatView.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,13 @@ fun ChatView(
302302
}
303303
}
304304

305-
LaunchedEffect(isAtNewest) {
305+
LaunchedEffect(isAtNewest, state.chatItems) {
306306
if (!isAtNewest) return@LaunchedEffect
307307

308-
latestChatItems
309-
.getOrNull(listState.firstVisibleItemIndex)
310-
?.let { item ->
311-
if (item is ChatViewModel.ChatItem.MessageItem) {
312-
callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(item.uiMessage.id)
313-
}
308+
state.chatItems
309+
.firstNotNullOfOrNull { (it as? ChatViewModel.ChatItem.MessageItem)?.uiMessage?.id }
310+
?.let { newestId ->
311+
callbacks.advanceLocalLastReadMessageIfNeeded?.invoke(newestId)
314312
}
315313
}
316314

0 commit comments

Comments
 (0)