From afc324dc4f4433fd36920aceb049758e501b07b7 Mon Sep 17 00:00:00 2001
From: Stanislav Dmitrenko <7953703+avently@users.noreply.github.com>
Date: Wed, 24 Jan 2024 23:24:49 +0700
Subject: [PATCH] android, desktop: marking chat as read if it was set unread
 (#3746)

---
 .../chat/simplex/common/views/chat/ChatView.kt       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index c01344164f..6c516009fd 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -68,12 +68,14 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
       snapshotFlow { chatModel.chatId.value }
         .distinctUntilChanged()
         .onEach { Log.d(TAG, "TODOCHAT: chatId: activeChatId ${activeChat.value?.id} == new chatId $it ${activeChat.value?.id == it} ") }
-        .filter { it != null && activeChat.value?.id != it }
+        .filterNotNull()
         .collect { chatId ->
-          // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
-          // Also for situation when chatId changes after clicking in notification, etc
-          activeChat.value = chatModel.getChat(chatId!!)
-          Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
+          if (activeChat.value?.id != chatId) {
+            // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
+            // Also for situation when chatId changes after clicking in notification, etc
+            activeChat.value = chatModel.getChat(chatId)
+            Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
+          }
           markUnreadChatAsRead(activeChat, chatModel)
         }
     }