From 6406eb9d7bffd881f48a2b9a7be674d7f657d98f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 1 Jul 2022 11:23:27 +0200
Subject: [PATCH] Improved chat room scroll

---
 .../main/chat/fragments/DetailChatRoomFragment.kt   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 4fc5fd9e5..117943efb 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -80,14 +80,11 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 // First time we fill the list with messages
                 Log.i("[Chat Room] History first $itemCount messages loaded")
             } else {
-                // Scroll to newly added messages automatically
-                if (positionStart == adapter.itemCount - itemCount) {
-                    // But only if user hasn't initiated a scroll up in the messages history
-                    if (viewModel.isUserScrollingUp.value == false) {
-                        scrollToFirstUnreadMessageOrBottom(false)
-                    } else {
-                        Log.d("[Chat Room] User has scrolled up manually in the messages history, don't scroll to the newly added message at the bottom & don't mark the chat room as read")
-                    }
+                // Scroll to newly added messages automatically only if user hasn't initiated a scroll up in the messages history
+                if (viewModel.isUserScrollingUp.value == false) {
+                    scrollToFirstUnreadMessageOrBottom(false)
+                } else {
+                    Log.d("[Chat Room] User has scrolled up manually in the messages history, don't scroll to the newly added message at the bottom & don't mark the chat room as read")
                 }
             }
         }