Fix test and improve code.

Author: bmarty

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

@@ -36,7 +36,8 @@ import io.element.android.libraries.sessionstorage.api.SessionData
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toPersistentList
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
 @Inject
@@ -56,8 +57,19 @@ class HomePresenter(
         val coroutineState = rememberCoroutineScope()
         val matrixUser by client.userProfile.collectAsState()
         val matrixUserAndNeighbors by remember {
-            sessionStore.sessionsFlow().map { list ->
-                list.takeCurrentUserWithNeighbors(matrixUser).toPersistentList()
+            combine(
+                client.userProfile.onEach { user ->
+                    // Ensure that the profile is always up to date in our
+                    // session storage when it changes
+                    sessionStore.updateUserProfile(
+                        sessionId = user.userId.value,
+                        displayName = user.displayName,
+                        avatarUrl = user.avatarUrl,
+                    )
+                },
+                sessionStore.sessionsFlow()
+            ) { user, sessions ->
+                sessions.takeCurrentUserWithNeighbors(user).toPersistentList()
             }
         }.collectAsState(initial = persistentListOf(matrixUser))
         val isOnline by syncService.isOnline.collectAsState()
@@ -76,15 +88,6 @@ class HomePresenter(
             // Force a refresh of the profile
             client.getUserProfile()
         }
-        LaunchedEffect(matrixUser) {
-            // Ensure that the profile is always up to date in our
-            // session storage when it changes
-            sessionStore.updateUserProfile(
-                sessionId = matrixUser.userId.value,
-                displayName = matrixUser.displayName,
-                avatarUrl = matrixUser.avatarUrl,
-            )
-        }
         // Avatar indicator
         val showAvatarIndicator by indicatorService.showRoomListTopBarIndicator()
         val directLogoutState = logoutPresenter.present()

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

@@ -59,6 +59,8 @@ class HomePresenterTest {
             sessionStore = InMemorySessionStore(
                 initialSessionData = aSessionData(
                     sessionId = matrixClient.sessionId.value,
+                    userDisplayName = null,
+                    userAvatarUrl = null,
                 ),
                 updateUserProfileResult = updateUserProfileResult,
             ),
@@ -71,17 +73,26 @@ class HomePresenterTest {
                 MatrixUser(A_USER_ID, null, null)
             )
             assertThat(initialState.canReportBug).isFalse()
+            skipItems(1)
             val withUserState = awaitItem()
             assertThat(withUserState.matrixUserAndNeighbors.first()).isEqualTo(
                 MatrixUser(A_USER_ID, A_USER_NAME, AN_AVATAR_URL)
             )
             assertThat(withUserState.showAvatarIndicator).isFalse()
             assertThat(withUserState.isSpaceFeatureEnabled).isFalse()
-            updateUserProfileResult.assertions().isCalledOnce().with(
-                value(matrixClient.sessionId),
-                value(A_USER_NAME),
-                value(AN_AVATAR_URL),
-            )
+            updateUserProfileResult.assertions().isCalledExactly(2)
+                .withSequence(
+                    listOf(
+                        value(matrixClient.sessionId.value),
+                        value(null),
+                        value(null),
+                    ),
+                    listOf(
+                        value(matrixClient.sessionId.value),
+                        value(A_USER_NAME),
+                        value(AN_AVATAR_URL),
+                    ),
+                )
         }
     }