From 7f09e64d63d28411465d47ab7c33d91dba5a2a70 Mon Sep 17 00:00:00 2001
From: ganfra <francois.ganard@gmail.com>
Date: Wed, 7 Aug 2019 09:59:37 +0200
Subject: [PATCH] Fix timeline forward loader showing when sending events

---
 .../session/room/timeline/DefaultTimeline.kt  | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
index 4259505131..b2a5847205 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/timeline/DefaultTimeline.kt
@@ -278,30 +278,32 @@ internal class DefaultTimeline(
 // Private methods *****************************************************************************
 
     private fun hasMoreInCache(direction: Timeline.Direction): Boolean {
-        val localRealm = Realm.getInstance(realmConfiguration)
-        val timelineEventEntity = buildEventQuery(localRealm).findFirst(direction) ?: return false
-        val hasMoreInCache = if (direction == Timeline.Direction.FORWARDS) {
-            val firstEvent = builtEvents.firstOrNull() ?: return true
-            firstEvent.displayIndex < timelineEventEntity.root!!.displayIndex
-        } else {
-            val lastEvent = builtEvents.lastOrNull() ?: return true
-            lastEvent.displayIndex > timelineEventEntity.root!!.displayIndex
+        return Realm.getInstance(realmConfiguration).use { localRealm ->
+            val timelineEventEntity = buildEventQuery(localRealm).findFirst(direction)
+                    ?: return false
+            if (direction == Timeline.Direction.FORWARDS) {
+                if (findCurrentChunk(localRealm)?.isLastForward == true) {
+                    return false
+                }
+                val firstEvent = builtEvents.firstOrNull() ?: return true
+                firstEvent.displayIndex < timelineEventEntity.root!!.displayIndex
+            } else {
+                val lastEvent = builtEvents.lastOrNull() ?: return true
+                lastEvent.displayIndex > timelineEventEntity.root!!.displayIndex
+            }
         }
-        localRealm.close()
-        return hasMoreInCache
     }
 
     private fun hasReachedEnd(direction: Timeline.Direction): Boolean {
-        val localRealm = Realm.getInstance(realmConfiguration)
-        val currentChunk = findCurrentChunk(localRealm) ?: return false
-        val hasReachedEnd = if (direction == Timeline.Direction.FORWARDS) {
-            currentChunk.isLastForward
-        } else {
-            val eventEntity = buildEventQuery(localRealm).findFirst(direction)
-            currentChunk.isLastBackward || eventEntity?.root?.type == EventType.STATE_ROOM_CREATE
+        return Realm.getInstance(realmConfiguration).use { localRealm ->
+            val currentChunk = findCurrentChunk(localRealm) ?: return false
+            if (direction == Timeline.Direction.FORWARDS) {
+                currentChunk.isLastForward
+            } else {
+                val eventEntity = buildEventQuery(localRealm).findFirst(direction)
+                currentChunk.isLastBackward || eventEntity?.root?.type == EventType.STATE_ROOM_CREATE
+            }
         }
-        localRealm.close()
-        return hasReachedEnd
     }