Multi accounts - swipe on account icon

Author: bmarty

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

@@ -7,6 +7,9 @@
 
 package io.element.android.features.home.impl
 
+import io.element.android.libraries.matrix.api.core.SessionId
+
 sealed interface HomeEvents {
     data class SelectHomeNavigationBarItem(val item: HomeNavigationBarItem) : HomeEvents
+    data class SwitchToAccount(val sessionId: SessionId) : HomeEvents
 }

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

@@ -14,6 +14,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
@@ -27,8 +28,15 @@ import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.sync.SyncService
+import io.element.android.libraries.matrix.api.user.MatrixUser
+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.launch
 
 @Inject
 class HomePresenter(
@@ -44,7 +52,13 @@ class HomePresenter(
 ) : Presenter<HomeState> {
     @Composable
     override fun present(): HomeState {
+        val coroutineState = rememberCoroutineScope()
         val matrixUser by client.userProfile.collectAsState()
+        val matrixUserAndNeighbors by remember {
+            sessionStore.sessionsFlow().map { list ->
+                list.takeCurrentUserWithNeighbors(matrixUser).toPersistentList()
+            }
+        }.collectAsState(initial = persistentListOf(matrixUser))
         val isOnline by syncService.isOnline.collectAsState()
         val canReportBug by remember { rageshakeFeatureAvailability.isAvailable() }.collectAsState(false)
         val roomListState = roomListPresenter.present()
@@ -79,12 +93,15 @@ class HomePresenter(
                 is HomeEvents.SelectHomeNavigationBarItem -> {
                     currentHomeNavigationBarItemOrdinal = event.item.ordinal
                 }
+                is HomeEvents.SwitchToAccount -> coroutineState.launch {
+                    sessionStore.setLatestSession(event.sessionId.value)
+                }
             }
         }
 
         val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
         return HomeState(
-            matrixUser = matrixUser,
+            matrixUserAndNeighbors = matrixUserAndNeighbors,
             showAvatarIndicator = showAvatarIndicator,
             hasNetworkConnection = isOnline,
             currentHomeNavigationBarItem = currentHomeNavigationBarItem,
@@ -97,3 +114,45 @@ class HomePresenter(
         )
     }
 }
+
+private fun List<SessionData>.takeCurrentUserWithNeighbors(matrixUser: MatrixUser): List<MatrixUser> {
+    // Sort by userId to always have the same order (not depending on last account usage)
+    return sortedBy { it.userId }
+        .map {
+            if (it.userId == matrixUser.userId.value) {
+                // Always use the freshest profile for the current user
+                matrixUser
+            } else {
+                // Use the data from the DB
+                MatrixUser(
+                    userId = UserId(it.userId),
+                    displayName = it.userDisplayName,
+                    avatarUrl = it.userAvatarUrl,
+                )
+            }
+        }
+        .let { sessionList ->
+            // If the list has one item, there is no other session, return the list
+            when (sessionList.size) {
+                // Can happen when the user signs out (?)
+                0 -> listOf(matrixUser)
+                1 -> sessionList
+                else -> {
+                    // Create a list with extra item at the start and end if necessary to have the current user in the middle
+                    // If the list is [A, B, C, D] and the current user is A we want to return [D, A, B]
+                    // If the current user is B, we want to return [A, B, C]
+                    // If the current user is C, we want to return [B, C, D]
+                    // If the current user is D, we want to return [C, D, A]
+                    val currentUserIndex = sessionList.indexOfFirst { it.userId == matrixUser.userId }
+                    when (currentUserIndex) {
+                        // This can happen when the user signs out.
+                        // In this case, just return a singleton list with the current user.
+                        -1 -> listOf(matrixUser)
+                        0 -> listOf(sessionList.last()) + sessionList.take(2)
+                        sessionList.lastIndex -> sessionList.takeLast(2) + sessionList.first()
+                        else -> sessionList.slice(currentUserIndex - 1..currentUserIndex + 1)
+                    }
+                }
+            }
+        }
+}

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

@@ -12,10 +12,15 @@ import io.element.android.features.home.impl.roomlist.RoomListState
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
 data class HomeState(
-    val matrixUser: MatrixUser,
+    /**
+     * The current user of this session, in case of multiple accounts, will contains 3 items, with the
+     * current user in the middle.
+     */
+    val matrixUserAndNeighbors: ImmutableList<MatrixUser>,
     val showAvatarIndicator: Boolean,
     val hasNetworkConnection: Boolean,
     val currentHomeNavigationBarItem: HomeNavigationBarItem,

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

@@ -19,6 +19,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.toPersistentList
 
 open class HomeStateProvider : PreviewParameterProvider<HomeState> {
     override val values: Sequence<HomeState>
@@ -46,6 +47,7 @@ open class HomeStateProvider : PreviewParameterProvider<HomeState> {
 
 internal fun aHomeState(
     matrixUser: MatrixUser = MatrixUser(userId = UserId("@id:domain"), displayName = "User#1"),
+    matrixUserAndNeighbors: List<MatrixUser> = listOf(matrixUser),
     showAvatarIndicator: Boolean = false,
     hasNetworkConnection: Boolean = true,
     snackbarMessage: SnackbarMessage? = null,
@@ -56,7 +58,7 @@ internal fun aHomeState(
     directLogoutState: DirectLogoutState = aDirectLogoutState(),
     eventSink: (HomeEvents) -> Unit = {}
 ) = HomeState(
-    matrixUser = matrixUser,
+    matrixUserAndNeighbors = matrixUserAndNeighbors.toPersistentList(),
     showAvatarIndicator = showAvatarIndicator,
     hasNetworkConnection = hasNetworkConnection,
     snackbarMessage = snackbarMessage,

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

@@ -172,12 +172,15 @@ private fun HomeScaffold(
         topBar = {
             RoomListTopBar(
                 title = stringResource(state.currentHomeNavigationBarItem.labelRes),
-                matrixUser = state.matrixUser,
+                matrixUserAndNeighbors = state.matrixUserAndNeighbors,
                 showAvatarIndicator = state.showAvatarIndicator,
                 areSearchResultsDisplayed = roomListState.searchState.isSearchActive,
                 onToggleSearch = { roomListState.eventSink(RoomListEvents.ToggleSearchResults) },
                 onMenuActionClick = onMenuActionClick,
                 onOpenSettings = onOpenSettings,
+                onAccountSwitch = {
+                    state.eventSink(HomeEvents.SwitchToAccount(it))
+                },
                 scrollBehavior = scrollBehavior,
                 displayMenuItems = state.displayActions,
                 displayFilters = roomListState.displayFilters && state.currentHomeNavigationBarItem == HomeNavigationBarItem.Chats,