Fix issue after rebase on develop

Author: bmarty

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

@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -57,10 +57,12 @@ class HomePresenterTest {
             client = matrixClient,
             rageshakeFeatureAvailability = { flowOf(false) },
             sessionStore = InMemorySessionStore(
-                initialSessionData = aSessionData(
-                    sessionId = matrixClient.sessionId.value,
-                    userDisplayName = null,
-                    userAvatarUrl = null,
+                initialList = listOf(
+                    aSessionData(
+                        sessionId = matrixClient.sessionId.value,
+                        userDisplayName = null,
+                        userAvatarUrl = null,
+                    )
                 ),
                 updateUserProfileResult = updateUserProfileResult,
             ),

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

@@ -31,8 +31,7 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
 import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.sessionstorage.impl.memory.InMemoryMultiSessionsStore
-import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -195,16 +194,16 @@ class PreferencesRootPresenterTest {
             featureFlagService = FakeFeatureFlagService(
                 initialState = mapOf(FeatureFlags.MultiAccount.key to true)
             ),
-            sessionStore = InMemoryMultiSessionsStore().apply {
-                addSession(aSessionData(sessionId = A_SESSION_ID.value))
-                addSession(
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(
+                    aSessionData(sessionId = A_SESSION_ID.value),
                     aSessionData(
                         sessionId = A_SESSION_ID_2.value,
                         userDisplayName = "Bob",
                         userAvatarUrl = "avatarUrl",
-                    )
+                    ),
                 )
-            }
+            )
         ).test {
             val state = awaitFirstItem()
             assertThat(state.isMultiAccountEnabled).isTrue()

libraries/accountselect/impl/src/test/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenterTest.kt

@@ -12,8 +12,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.sessionstorage.impl.memory.InMemoryMultiSessionsStore
-import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
@@ -37,16 +36,16 @@ class AccountSelectPresenterTest {
     @Test
     fun `present - multiple accounts case`() = runTest {
         val presenter = createAccountSelectPresenter(
-            sessionStore = InMemoryMultiSessionsStore().apply {
-                addSession(aSessionData(sessionId = A_SESSION_ID.value))
-                addSession(
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(
+                    aSessionData(sessionId = A_SESSION_ID.value),
                     aSessionData(
                         sessionId = A_SESSION_ID_2.value,
                         userDisplayName = "Bob",
                         userAvatarUrl = "avatarUrl",
-                    )
+                    ),
                 )
-            }
+            )
         )
         presenter.test {
             skipItems(1)

libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt

@@ -12,67 +12,72 @@ import io.element.android.libraries.sessionstorage.api.SessionData
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 
 class InMemorySessionStore(
-    initialSessionData: SessionData? = null,
+    initialList: List<SessionData> = emptyList(),
     private val updateUserProfileResult: (String, String?, String?) -> Unit = { _, _, _ -> error("Not implemented") },
     private val setLatestSessionResult: (String) -> Unit = { error("Not implemented") },
 ) : SessionStore {
-    private var sessionDataFlow = MutableStateFlow(initialSessionData)
+    private val sessionDataListFlow = MutableStateFlow(initialList)
 
     override fun isLoggedIn(): Flow<LoggedInState> {
-        return sessionDataFlow.map {
-            if (it == null) {
+        return sessionDataListFlow.map {
+            if (it.isEmpty()) {
                 LoggedInState.NotLoggedIn
             } else {
-                LoggedInState.LoggedIn(
-                    sessionId = it.userId,
-                    isTokenValid = it.isTokenValid,
-                )
+                it.first().let { sessionData ->
+                    LoggedInState.LoggedIn(
+                        sessionId = sessionData.userId,
+                        isTokenValid = sessionData.isTokenValid,
+                    )
+                }
             }
         }
     }
 
-    override fun sessionsFlow(): Flow<List<SessionData>> {
-        return sessionDataFlow.map { listOfNotNull(it) }
-    }
+    override fun sessionsFlow(): Flow<List<SessionData>> = sessionDataListFlow.asStateFlow()
 
     override suspend fun addSession(sessionData: SessionData) {
-        sessionDataFlow.value = sessionData
+        val currentList = sessionDataListFlow.value.toMutableList()
+        currentList.removeAll { it.userId == sessionData.userId }
+        currentList.add(sessionData)
+        sessionDataListFlow.value = currentList
     }
 
     override suspend fun updateData(sessionData: SessionData) {
-        sessionDataFlow.value = sessionData
+        val currentList = sessionDataListFlow.value.toMutableList()
+        val index = currentList.indexOfFirst { it.userId == sessionData.userId }
+        if (index != -1) {
+            currentList[index] = sessionData
+            sessionDataListFlow.value = currentList
+        }
     }
 
     override suspend fun updateUserProfile(sessionId: String, displayName: String?, avatarUrl: String?) {
-        sessionDataFlow.value = sessionDataFlow.value?.copy(
-            userDisplayName = displayName,
-            userAvatarUrl = avatarUrl
-        )
         updateUserProfileResult(sessionId, displayName, avatarUrl)
     }
 
     override suspend fun getSession(sessionId: String): SessionData? {
-        return sessionDataFlow.value.takeIf { it?.userId == sessionId }
+        return sessionDataListFlow.value.firstOrNull { it.userId == sessionId }
     }
 
     override suspend fun getAllSessions(): List<SessionData> {
-        return listOfNotNull(sessionDataFlow.value)
+        return sessionDataListFlow.value
     }
 
     override suspend fun getLatestSession(): SessionData? {
-        return sessionDataFlow.value
+        return sessionDataListFlow.value.firstOrNull()
     }
 
     override suspend fun setLatestSession(sessionId: String) {
         setLatestSessionResult(sessionId)
     }
 
     override suspend fun removeSession(sessionId: String) {
-        if (sessionDataFlow.value?.userId == sessionId) {
-            sessionDataFlow.value = null
-        }
+        val currentList = sessionDataListFlow.value.toMutableList()
+        currentList.removeAll { it.userId == sessionId }
+        sessionDataListFlow.value = currentList
     }
 }