Merge pull request #7793 from element-hq/feature/bma/storeUserAvatar

Display the avatar of other accounts even if it cannot be loaded from the current account

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilder.kt

@@ -36,6 +36,7 @@ class CurrentUserWithNeighborsBuilder {
                         userId = UserId(it.userId),
                         displayName = it.userDisplayName,
                         avatarUrl = it.userAvatarUrl,
+                        avatarThumbnail = it.userAvatarData,
                     )
                 }
             }

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/CurrentUserWithNeighborsBuilderTest.kt

@@ -220,4 +220,30 @@ class CurrentUserWithNeighborsBuilderTest {
             )
         )
     }
+
+    @Test
+    fun `other accounts use the data from db, including the avatar thumbnail`() {
+        val sut = CurrentUserWithNeighborsBuilder()
+        val matrixUser = aMatrixUser(id = A_USER_ID.value)
+        val list = listOf(
+            aSessionData(
+                sessionId = A_USER_ID.value,
+            ),
+            aSessionData(
+                sessionId = A_USER_ID_2.value,
+                userDisplayName = "Carol",
+                userAvatarUrl = "avatarUrl",
+                userAvatarData = "avatarData",
+            ),
+        )
+        val result = sut.build(matrixUser, list)
+        assertThat(result[0]).isEqualTo(
+            MatrixUser(
+                userId = A_USER_ID_2,
+                displayName = "Carol",
+                avatarUrl = "avatarUrl",
+                avatarThumbnail = "avatarData",
+            )
+        )
+    }
 }

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/HomePresenterTest.kt

@@ -81,7 +81,7 @@ class HomePresenterTest {
         val presenter = createHomePresenter(
             rageshakeFeatureAvailability = { flowOf(true) },
             sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
+                updateUserProfileResult = { _, _, _, _ -> },
             ),
         )
         presenter.test {
@@ -98,7 +98,7 @@ class HomePresenterTest {
         val presenter = createHomePresenter(
             indicatorService = indicatorService,
             sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
+                updateUserProfileResult = { _, _, _, _ -> },
             ),
         )
         presenter.test {
@@ -120,7 +120,7 @@ class HomePresenterTest {
         val presenter = createHomePresenter(
             client = matrixClient,
             sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
+                updateUserProfileResult = { _, _, _, _ -> },
             ),
         )
         presenter.test {
@@ -134,7 +134,7 @@ class HomePresenterTest {
     fun `present - NavigationBar change`() = runTest {
         val presenter = createHomePresenter(
             sessionStore = InMemorySessionStore(
-                updateUserProfileResult = { _, _, _ -> },
+                updateUserProfileResult = { _, _, _, _ -> },
             ),
         )
         presenter.test {

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt

@@ -90,6 +90,7 @@ class PreferencesRootPresenter(
                             userId = UserId(it.userId),
                             displayName = it.userDisplayName,
                             avatarUrl = it.userAvatarUrl,
+                            avatarThumbnail = it.userAvatarData,
                         )
                     }
                     .toImmutableList()

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt

@@ -234,6 +234,7 @@ class PreferencesRootPresenterTest {
                         sessionId = A_SESSION_ID_2.value,
                         userDisplayName = "Bob",
                         userAvatarUrl = "avatarUrl",
+                        userAvatarData = "avatarData",
                     ),
                 )
             )
@@ -241,7 +242,14 @@ class PreferencesRootPresenterTest {
             val state = awaitFirstItem()
             assertThat(state.isMultiAccountEnabled).isTrue()
             assertThat(state.otherSessions).hasSize(1)
-            assertThat(state.otherSessions[0]).isEqualTo(MatrixUser(userId = A_SESSION_ID_2, displayName = "Bob", avatarUrl = "avatarUrl"))
+            assertThat(state.otherSessions[0]).isEqualTo(
+                MatrixUser(
+                    userId = A_SESSION_ID_2,
+                    displayName = "Bob",
+                    avatarUrl = "avatarUrl",
+                    avatarThumbnail = "avatarData",
+                )
+            )
         }
     }
 

features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutStatePreviewParam.kt

@@ -47,5 +47,6 @@ private fun aSessionData(
         lastUsageIndex = 0,
         userDisplayName = null,
         userAvatarUrl = null,
+        userAvatarData = null,
     )
 }