From 1bd59e3c1c5b6609fa0913229c6fff6f291f2212 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Mon, 15 Nov 2021 18:03:22 +0100
Subject: [PATCH] When scrolled to the bottom, stick there

Change-Id: I0c788368afef04d7541f633cd830f5bdbf665049
---
 .../vector/app/features/home/room/detail/RoomDetailFragment.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 438eccb1b4..c8a0090ec9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -2255,8 +2255,9 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun setInitialForceScrollEnabled(enabled: Boolean, stickToBottom: Boolean = false) {
+        val shouldStickToBottom = stickToBottom || (!enabled && !views.timelineRecyclerView.canScrollVertically(1))
         scrollOnNewMessageCallback.initialForceScroll = enabled
-        if (stickToBottom) {
+        if (shouldStickToBottom) {
             layoutManager.disablePreferredAnchorPlacement()
         } else {
             // (Re-) Enable preferred anchor placement