Merge pull request #761 from vector-im/feature/fga/room_detail_factor…

…y_improvement Feature/fga/room detail factory improvement
element-hq · Jul 4, 2023 · 5ae8b6c · 5ae8b6c
2 parents 714108e + 670280b
commit 5ae8b6c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/...rc/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSummaryDetailsFactory.kt b/...rc/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSummaryDetailsFactory.kt
@@ -31,9 +31,9 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
         return RoomSummaryDetails(
             roomId = RoomId(roomListItem.id()),
             name = roomListItem.name() ?: roomListItem.id(),
-            canonicalAlias = room?.canonicalAlias(),
-            isDirect = room?.isDirect() ?: false,
-            avatarURLString = room?.avatarUrl(),
+            canonicalAlias = roomListItem.canonicalAlias(),
+            isDirect = roomListItem.isDirect(),
+            avatarURLString = roomListItem.avatarUrl(),
             unreadNotificationCount = roomListItem.unreadNotifications().use { it.notificationCount().toInt() },
             lastMessage = latestRoomMessage,
             lastMessageTimestamp = latestRoomMessage?.originServerTs,

diff --git a/...src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSummaryListProcessor.kt b/...src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomSummaryListProcessor.kt
@@ -21,8 +21,10 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.RoomListEntriesUpdate
 import org.matrix.rustcomponents.sdk.RoomListEntry
+import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.RoomListService
 import timber.log.Timber
 import java.util.UUID
@@ -31,6 +33,7 @@ class RoomSummaryListProcessor(
     private val roomSummaries: MutableStateFlow<List<RoomSummary>>,
     private val roomListService: RoomListService,
     private val roomSummaryDetailsFactory: RoomSummaryDetailsFactory = RoomSummaryDetailsFactory(),
+    private val shouldFetchFullRoom: Boolean = false,
 ) {
 
     private val roomSummariesByIdentifier = HashMap<String, RoomSummary>()
@@ -113,7 +116,7 @@ class RoomSummaryListProcessor(
 
     private fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
         val builtRoomSummary = roomListService.roomOrNull(identifier)?.use { roomListItem ->
-            roomListItem.fullRoom().use { fullRoom ->
+            roomListItem.fullRoomOrNull().use { fullRoom ->
                 RoomSummary.Filled(
                     details = roomSummaryDetailsFactory.create(roomListItem, fullRoom)
                 )
@@ -123,6 +126,14 @@ class RoomSummaryListProcessor(
         return builtRoomSummary
     }
 
+    private fun RoomListItem.fullRoomOrNull(): Room? {
+        return if (shouldFetchFullRoom) {
+            fullRoom()
+        } else {
+            null
+        }
+    }
+
     private suspend fun updateRoomSummaries(block: MutableList<RoomSummary>.() -> Unit) =
         mutex.withLock {
             val mutableRoomSummaries = roomSummaries.value.toMutableList()

diff --git a/...rc/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt b/...rc/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomSummaryDataSource.kt
@@ -49,8 +49,8 @@ internal class RustRoomSummaryDataSource(
     private val inviteRooms = MutableStateFlow<List<RoomSummary>>(emptyList())
 
     private val allRoomsLoadingState: MutableStateFlow<RoomSummaryDataSource.LoadingState> = MutableStateFlow(RoomSummaryDataSource.LoadingState.NotLoaded)
-    private val allRoomsListProcessor = RoomSummaryListProcessor(allRooms, roomListService, roomSummaryDetailsFactory)
-    private val inviteRoomsListProcessor = RoomSummaryListProcessor(inviteRooms, roomListService, roomSummaryDetailsFactory)
+    private val allRoomsListProcessor = RoomSummaryListProcessor(allRooms, roomListService, roomSummaryDetailsFactory, shouldFetchFullRoom = false)
+    private val inviteRoomsListProcessor = RoomSummaryListProcessor(inviteRooms, roomListService, roomSummaryDetailsFactory, shouldFetchFullRoom = true)
 
     init {
         sessionCoroutineScope.launch(coroutineDispatchers.computation) {