Use roomInfo instead of individually access roomListItem properties

changelog.d/1251.misc

@@ -0,0 +1 @@
+Improve RoomSummary mapping by using RoomInfo.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryDetailsFactory.kt

@@ -20,25 +20,26 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.impl.room.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
-import org.matrix.rustcomponents.sdk.Room
-import org.matrix.rustcomponents.sdk.RoomListItem
+import org.matrix.rustcomponents.sdk.RoomInfo
+import org.matrix.rustcomponents.sdk.use
 
 class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory()) {
 
-    suspend fun create(roomListItem: RoomListItem, room: Room?): RoomSummaryDetails {
-        val latestRoomMessage = roomListItem.latestEvent()?.use {
+    fun create(roomInfo: RoomInfo): RoomSummaryDetails {
+        val latestRoomMessage = roomInfo.latestEvent?.use {
             roomMessageFactory.create(it)
         }
         return RoomSummaryDetails(
-            roomId = RoomId(roomListItem.id()),
-            name = roomListItem.name() ?: roomListItem.id(),
-            canonicalAlias = roomListItem.canonicalAlias(),
-            isDirect = roomListItem.isDirect(),
-            avatarURLString = roomListItem.avatarUrl(),
-            unreadNotificationCount = roomListItem.unreadNotifications().use { it.notificationCount().toInt() },
+            roomId = RoomId(roomInfo.id),
+            name = roomInfo.name ?: roomInfo.id,
+            canonicalAlias = roomInfo.canonicalAlias,
+            isDirect = roomInfo.isDirect,
+            avatarURLString = roomInfo.avatarUrl,
+            unreadNotificationCount = roomInfo.notificationCount.toInt(),
             lastMessage = latestRoomMessage,
             lastMessageTimestamp = latestRoomMessage?.originServerTs,
-            inviter = room?.inviter()?.let(RoomMemberMapper::map),
+            inviter = roomInfo.inviter?.let(RoomMemberMapper::map),
         )
     }
 }
+

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessor.kt

@@ -22,11 +22,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 org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import java.util.UUID
 
@@ -34,7 +33,6 @@ 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>()
@@ -120,9 +118,9 @@ class RoomSummaryListProcessor(
 
     private suspend fun buildAndCacheRoomSummaryForIdentifier(identifier: String): RoomSummary {
         val builtRoomSummary = roomListService.roomOrNull(identifier)?.use { roomListItem ->
-            roomListItem.fullRoomOrNull().use { fullRoom ->
+            roomListItem.roomInfo().use { roomInfo ->
                 RoomSummary.Filled(
-                    details = roomSummaryDetailsFactory.create(roomListItem, fullRoom)
+                    details = roomSummaryDetailsFactory.create(roomInfo)
                 )
             }
         } ?: buildEmptyRoomSummary()
@@ -130,14 +128,6 @@ class RoomSummaryListProcessor(
         return builtRoomSummary
     }
 
-    private fun RoomListItem.fullRoomOrNull(): Room? {
-        return if (shouldFetchFullRoom) {
-            fullRoom()
-        } else {
-            null
-        }
-    }
-
     private suspend fun updateRoomSummaries(block: suspend MutableList<RoomSummary>.() -> Unit) =
         mutex.withLock {
             val mutableRoomSummaries = roomSummaries.value.toMutableList()

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListService.kt

@@ -52,9 +52,9 @@ class RustRoomListService(
     private val inviteRooms = MutableStateFlow<List<RoomSummary>>(emptyList())
 
     private val allRoomsLoadingState: MutableStateFlow<RoomList.LoadingState> = MutableStateFlow(RoomList.LoadingState.NotLoaded)
-    private val allRoomsListProcessor = RoomSummaryListProcessor(allRooms, innerRoomListService, roomSummaryDetailsFactory, shouldFetchFullRoom = false)
+    private val allRoomsListProcessor = RoomSummaryListProcessor(allRooms, innerRoomListService, roomSummaryDetailsFactory)
     private val invitesLoadingState: MutableStateFlow<RoomList.LoadingState> = MutableStateFlow(RoomList.LoadingState.NotLoaded)
-    private val inviteRoomsListProcessor = RoomSummaryListProcessor(inviteRooms, innerRoomListService, roomSummaryDetailsFactory, shouldFetchFullRoom = true)
+    private val inviteRoomsListProcessor = RoomSummaryListProcessor(inviteRooms, innerRoomListService, roomSummaryDetailsFactory)
 
     init {
         sessionCoroutineScope.launch(dispatcher) {