From 246e8bf2a2b25efaedba488e3da35e3935f979ec Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Fri, 2 Feb 2024 22:32:36 +1030
Subject: [PATCH] Fix messages not marked as read onScroll when message count
 is unchanged

---
 .../securesms/conversation/v2/ConversationActivityV2.kt   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 5690ccc2c3..dd488ba03e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -526,12 +526,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
             if (author != null && messageTimestamp >= 0) {
                 jumpToMessage(author, messageTimestamp, firstLoad.get(), null)
-            }
-            else if (firstLoad.getAndSet(false)) {
-                scrollToFirstUnreadMessageIfNeeded(true)
-                handleRecyclerViewScrolled()
-            }
-            else if (oldCount != newCount) {
+            } else {
+                if (firstLoad.getAndSet(false)) scrollToFirstUnreadMessageIfNeeded(true)
                 handleRecyclerViewScrolled()
             }
         }