Simplify AvatarData and avoid carrying ByteArray

features/messages/src/main/kotlin/io/element/android/features/messages/MessagesPresenter.kt

@@ -24,9 +24,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.features.messages.actionlist.ActionListPresenter
 import io.element.android.features.messages.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.textcomposer.MessageComposerEvents
@@ -36,9 +33,10 @@ import io.element.android.features.messages.timeline.TimelineEvents
 import io.element.android.features.messages.timeline.TimelinePresenter
 import io.element.android.features.messages.timeline.model.TimelineItem
 import io.element.android.features.messages.timeline.model.content.TimelineItemTextBasedContent
-import io.element.android.libraries.matrix.MatrixClient
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.room.MatrixRoom
-import io.element.android.libraries.matrix.ui.MatrixItemHelper
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -46,15 +44,12 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class MessagesPresenter @Inject constructor(
-    private val matrixClient: MatrixClient,
     private val room: MatrixRoom,
     private val composerPresenter: MessageComposerPresenter,
     private val timelinePresenter: TimelinePresenter,
     private val actionListPresenter: ActionListPresenter,
 ) : Presenter<MessagesState> {
 
-    private val matrixItemHelper = MatrixItemHelper(matrixClient)
-
     @Composable
     override fun present(): MessagesState {
         val localCoroutineScope = rememberCoroutineScope()
@@ -71,8 +66,9 @@ class MessagesPresenter @Inject constructor(
         }
         LaunchedEffect(syncUpdateFlow) {
             roomAvatar.value =
-                matrixItemHelper.loadAvatarData(
-                    room = room,
+                AvatarData(
+                    name = room.bestName,
+                    url = room.avatarUrl,
                     size = AvatarSize.SMALL
                 )
             roomName.value = room.name

features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineItemsFactory.kt

@@ -17,7 +17,6 @@
 package io.element.android.features.messages.timeline
 
 import androidx.recyclerview.widget.DiffUtil
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.features.messages.timeline.diff.CacheInvalidator
 import io.element.android.features.messages.timeline.diff.MatrixTimelineItemsDiffCallback
 import io.element.android.features.messages.timeline.model.AggregatedReaction
@@ -33,6 +32,8 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemR
 import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent
 import io.element.android.features.messages.timeline.model.content.TimelineItemUnknownContent
 import io.element.android.features.messages.timeline.util.invalidateLast
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.media.MediaResolver
 import io.element.android.libraries.matrix.room.MatrixRoom
@@ -154,12 +155,11 @@ class TimelineItemsFactory @Inject constructor(
             computeGroupPosition(currentTimelineItem, timelineItems, index)
         val senderDisplayName = room.userDisplayName(currentSender).getOrNull()
         val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull()
-        val senderAvatarData =
-            matrixItemHelper.loadAvatarData(
-                name = senderDisplayName ?: currentSender,
-                url = senderAvatarUrl,
-                size = AvatarSize.SMALL
-            )
+        val senderAvatarData = AvatarData(
+            name = senderDisplayName ?: currentSender,
+            url = senderAvatarUrl,
+            size = AvatarSize.SMALL
+        )
         return TimelineItem.MessageEvent(
             id = EventId(currentTimelineItem.uniqueId),
             senderId = currentSender,

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListPresenter.kt

@@ -25,16 +25,15 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.coroutine.parallelMap
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.features.roomlist.model.RoomListEvents
 import io.element.android.features.roomlist.model.RoomListRoomSummary
 import io.element.android.features.roomlist.model.RoomListRoomSummaryPlaceholders
 import io.element.android.features.roomlist.model.RoomListState
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.core.coroutine.parallelMap
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.media.MediaResolver
 import io.element.android.libraries.matrix.room.RoomSummary
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
@@ -42,6 +41,7 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 private const val extendedRangeSize = 40
@@ -61,7 +61,9 @@ class RoomListPresenter @Inject constructor(
         val roomSummaries by client
             .roomSummaryDataSource()
             .roomSummaries()
-            .collectAsState(initial = null)
+            .collectAsState()
+
+        Timber.v("RoomSummaries size = ${roomSummaries.size}")
 
         val filteredRoomSummaries: MutableState<ImmutableList<RoomListRoomSummary>> = remember {
             mutableStateOf(persistentListOf())
@@ -105,15 +107,14 @@ class RoomListPresenter @Inject constructor(
         val userAvatarUrl = client.loadUserAvatarURLString().getOrNull()
         val userDisplayName = client.loadUserDisplayName().getOrNull()
         val avatarData =
-            loadAvatarData(
-                userDisplayName ?: client.userId().value,
-                userAvatarUrl,
-                AvatarSize.SMALL
+            AvatarData(
+                name = userDisplayName ?: client.userId().value,
+                url = userAvatarUrl,
+                size = AvatarSize.SMALL
             )
         matrixUser.value = MatrixUser(
             id = client.userId(),
             username = userDisplayName ?: client.userId().value,
-            avatarUrl = userAvatarUrl,
             avatarData = avatarData,
         )
     }
@@ -135,9 +136,9 @@ class RoomListPresenter @Inject constructor(
             when (roomSummary) {
                 is RoomSummary.Empty -> RoomListRoomSummaryPlaceholders.create(roomSummary.identifier)
                 is RoomSummary.Filled -> {
-                    val avatarData = loadAvatarData(
-                        roomSummary.details.name,
-                        roomSummary.details.avatarURLString
+                    val avatarData = AvatarData(
+                        name = roomSummary.details.name,
+                        url = roomSummary.details.avatarURLString
                     )
                     RoomListRoomSummary(
                         id = roomSummary.identifier(),
@@ -151,14 +152,4 @@ class RoomListPresenter @Inject constructor(
             }
         }
     }
-
-    private suspend fun loadAvatarData(
-        name: String,
-        url: String?,
-        size: AvatarSize = AvatarSize.MEDIUM
-    ): AvatarData {
-        val model = client.mediaResolver()
-            .resolve(url, kind = MediaResolver.Kind.Thumbnail(size.value))
-        return AvatarData(name, model, size)
-    }
 }