Fix false positive empty roomlist

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt

@@ -90,9 +90,10 @@ interface CryptoService {
     fun isKeyGossipingEnabled(): Boolean
 
     /*
-    * Tells if the current crypto implementation supports MSC3061
+     * Tells if the current crypto implementation supports MSC3061
      */
     fun supportsShareKeysOnInvite(): Boolean
+
     /**
      * As per MSC3061.
      * If true will make it possible to share part of e2ee room history

vector/src/main/java/im/vector/app/features/home/room/list/home/HomeFilteredRoomsController.kt

@@ -26,6 +26,7 @@ import im.vector.app.features.home.room.list.RoomListListener
 import im.vector.app.features.home.room.list.RoomSummaryItemFactory
 import im.vector.app.features.home.room.list.RoomSummaryPlaceHolderItem_
 import im.vector.app.features.settings.FontScalePreferences
+import org.matrix.android.sdk.api.session.room.ResultBoundaries
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
@@ -53,6 +54,8 @@ class HomeFilteredRoomsController @Inject constructor(
 
     private val shouldUseSingleLine: Boolean
 
+    var initialLoadOccurred = false
+
     init {
         val fontScale = fontScalePreferences.getResolvedFontScaleValue()
         shouldUseSingleLine = fontScale.scale > FontScalePreferences.SCALE_LARGE
@@ -78,6 +81,15 @@ class HomeFilteredRoomsController @Inject constructor(
         }
     }
 
+    fun boundaryChange(boundary: ResultBoundaries) {
+        // Sometimes the room stays on empty state, need
+        val boundaryHasLoadedSomething = boundary.frontLoaded || boundary.zeroItemLoaded
+        if (initialLoadOccurred != boundaryHasLoadedSomething) {
+            initialLoadOccurred = boundaryHasLoadedSomething
+            requestForcedModelBuild()
+        }
+    }
+
     fun submitEmptyStateData(state: StateView.State.Empty?) {
         this.emptyStateData = state
     }

vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt

@@ -160,6 +160,11 @@ class HomeRoomListFragment :
         roomListViewModel.filteredPagedRoomSummariesLive.livePagedList.observe(viewLifecycleOwner) { roomsList ->
             roomsController.submitRoomsList(roomsList)
         }
+
+        roomListViewModel.filteredPagedRoomSummariesLive.liveBoundaries.observe(viewLifecycleOwner) {
+            roomsController.boundaryChange(it)
+        }
+
         roomListViewModel.onEach(HomeRoomListViewState::emptyState) { emptyState ->
             roomsController.submitEmptyStateData(emptyState)
         }