Multi accounts - handle click on push history for not current account.

bmarty · bmarty · commit 7d93c9bbd8cc · 2025-09-04T18:31:00.000+02:00
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -75,7 +75,6 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.MAIN_SPACE
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
@@ -412,11 +411,7 @@ class LoggedInFlowNode(
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.NotificationSettings))
                     }
 
-                    override fun navigateTo(sessionId: SessionId, roomId: RoomId, eventId: EventId) {
-                        // We do not check the sessionId, but it will have to be done at some point (multi account)
-                        if (sessionId != matrixClient.sessionId) {
-                            Timber.e("SessionId mismatch, expected ${matrixClient.sessionId} but got $sessionId")
-                        }
+                    override fun navigateTo(roomId: RoomId, eventId: EventId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Messages(eventId)))
                     }
                 }
diff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
@@ -15,7 +15,6 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.parcelize.Parcelize
 
 interface PreferencesEntryPoint : FeatureEntryPoint {
@@ -45,6 +44,6 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
         fun onOpenBugReport()
         fun onSecureBackupClick()
         fun onOpenRoomNotificationSettings(roomId: RoomId)
-        fun navigateTo(sessionId: SessionId, roomId: RoomId, eventId: EventId)
+        fun navigateTo(roomId: RoomId, eventId: EventId)
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -226,8 +226,8 @@ class PreferencesFlowNode(
                             }
                         }
 
-                        override fun onItemClick(sessionId: SessionId, roomId: RoomId, eventId: EventId) {
-                            plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(sessionId, roomId, eventId) }
+                        override fun navigateTo(roomId: RoomId, eventId: EventId) {
+                            plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(roomId, eventId) }
                         }
                     })
                     .build()
diff --git a/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt b/libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/PushHistoryEntryPoint.kt
@@ -13,7 +13,6 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SessionId
 
 interface PushHistoryEntryPoint : FeatureEntryPoint {
     fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
@@ -25,6 +24,6 @@ interface PushHistoryEntryPoint : FeatureEntryPoint {
 
     interface Callback : Plugin {
         fun onDone()
-        fun onItemClick(sessionId: SessionId, roomId: RoomId, eventId: EventId)
+        fun navigateTo(roomId: RoomId, eventId: EventId)
     }
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt
@@ -7,8 +7,13 @@
 
 package io.element.android.libraries.troubleshoot.impl.history
 
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+
 sealed interface PushHistoryEvents {
     data class SetShowOnlyErrors(val showOnlyErrors: Boolean) : PushHistoryEvents
     data class Reset(val requiresConfirmation: Boolean) : PushHistoryEvents
+    data class NavigateTo(val sessionId: SessionId, val roomId: RoomId, val eventId: EventId): PushHistoryEvents
     data object ClearDialog : PushHistoryEvents
 }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt
@@ -20,7 +20,6 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.troubleshoot.api.PushHistoryEntryPoint
 import io.element.android.services.analytics.api.ScreenTracker
 
@@ -29,29 +28,30 @@ import io.element.android.services.analytics.api.ScreenTracker
 class PushHistoryNode(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
-    private val presenter: PushHistoryPresenter,
+    presenterFactory: PushHistoryPresenter.Factory,
     private val screenTracker: ScreenTracker,
-) : Node(buildContext, plugins = plugins) {
+) : Node(buildContext, plugins = plugins), PushHistoryNavigator {
     private fun onDone() {
         plugins<PushHistoryEntryPoint.Callback>().forEach {
             it.onDone()
         }
     }
 
-    private fun onItemClick(sessionId: SessionId, roomId: RoomId, eventId: EventId) {
+    override fun navigateTo(roomId: RoomId, eventId: EventId) {
         plugins<PushHistoryEntryPoint.Callback>().forEach {
-            it.onItemClick(sessionId, roomId, eventId)
+            it.navigateTo(roomId, eventId)
         }
     }
 
+    private val presenter = presenterFactory.create(this)
+
     @Composable
     override fun View(modifier: Modifier) {
         screenTracker.TrackScreen(MobileScreen.ScreenName.NotificationTroubleshoot)
         val state = presenter.present()
         PushHistoryView(
             state = state,
             onBackClick = ::onDone,
-            onItemClick = ::onItemClick,
             modifier = modifier,
         )
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt
@@ -14,18 +14,36 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.push.api.PushService
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
+interface PushHistoryNavigator {
+    fun navigateTo(roomId: RoomId, eventId: EventId)
+}
+
 @Inject
 class PushHistoryPresenter(
+    @Assisted private val pushHistoryNavigator: PushHistoryNavigator,
     private val pushService: PushService,
+    matrixClient: MatrixClient,
 ) : Presenter<PushHistoryState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(pushHistoryNavigator: PushHistoryNavigator): PushHistoryPresenter
+    }
+
+    private val sessionId = matrixClient.sessionId
+
     @Composable
     override fun present(): PushHistoryState {
         val coroutineScope = rememberCoroutineScope()
@@ -41,6 +59,7 @@ class PushHistoryPresenter(
             }
         }.collectAsState(emptyList())
         var resetAction: AsyncAction<Unit> by remember { mutableStateOf(AsyncAction.Uninitialized) }
+        var showNotSameAccountError  by remember { mutableStateOf(false) }
 
         fun handleEvents(event: PushHistoryEvents) {
             when (event) {
@@ -60,6 +79,14 @@ class PushHistoryPresenter(
                 }
                 PushHistoryEvents.ClearDialog -> {
                     resetAction = AsyncAction.Uninitialized
+                    showNotSameAccountError = false
+                }
+                is PushHistoryEvents.NavigateTo -> {
+                    if (event.sessionId != sessionId) {
+                        showNotSameAccountError = true
+                    } else {
+                        pushHistoryNavigator.navigateTo(event.roomId, event.eventId)
+                    }
                 }
             }
         }
@@ -69,6 +96,7 @@ class PushHistoryPresenter(
             pushHistoryItems = pushHistory.toImmutableList(),
             showOnlyErrors = showOnlyErrors,
             resetAction = resetAction,
+            showNotSameAccountError = showNotSameAccountError,
             eventSink = ::handleEvents
         )
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt
@@ -16,5 +16,6 @@ data class PushHistoryState(
     val pushHistoryItems: ImmutableList<PushHistoryItem>,
     val showOnlyErrors: Boolean,
     val resetAction: AsyncAction<Unit>,
+    val showNotSameAccountError: Boolean,
     val eventSink: (PushHistoryEvents) -> Unit,
 )
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt
@@ -48,12 +48,14 @@ fun aPushHistoryState(
     pushHistoryItems: List<PushHistoryItem> = emptyList(),
     showOnlyErrors: Boolean = false,
     resetAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    showNotSameAccountError: Boolean = false,
     eventSink: (PushHistoryEvents) -> Unit = {},
 ) = PushHistoryState(
     pushCounter = pushCounter,
     pushHistoryItems = pushHistoryItems.toImmutableList(),
     showOnlyErrors = showOnlyErrors,
     resetAction = resetAction,
+    showNotSameAccountError = showNotSameAccountError,
     eventSink = eventSink,
 )
 
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt
@@ -37,6 +37,7 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -48,9 +49,6 @@ import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
-import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import io.element.android.libraries.troubleshoot.impl.R
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -60,7 +58,6 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun PushHistoryView(
     state: PushHistoryState,
     onBackClick: () -> Unit,
-    onItemClick: (SessionId, RoomId, EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     var showMenu by remember { mutableStateOf(false) }
@@ -123,7 +120,6 @@ fun PushHistoryView(
                 .padding(padding)
                 .consumeWindowInsets(padding),
             state = state,
-            onItemClick = onItemClick,
         )
     }
 
@@ -142,12 +138,18 @@ fun PushHistoryView(
         },
         onErrorDismiss = {},
     )
+
+    if (state.showNotSameAccountError) {
+        ErrorDialog(
+            content = "Please switch account first to navigate to the event.",
+            onSubmit = { state.eventSink(PushHistoryEvents.ClearDialog) }
+        )
+    }
 }
 
 @Composable
 private fun PushHistoryContent(
     state: PushHistoryState,
-    onItemClick: (SessionId, RoomId, EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -173,7 +175,7 @@ private fun PushHistoryContent(
                         val roomId = pushHistory.roomId
                         val eventId = pushHistory.eventId
                         if (sessionId != null && roomId != null && eventId != null) {
-                            onItemClick(sessionId, roomId, eventId)
+                            state.eventSink(PushHistoryEvents.NavigateTo(sessionId, roomId, eventId))
                         }
                     }
                 )
@@ -271,6 +273,5 @@ internal fun PushHistoryViewPreview(
     PushHistoryView(
         state = state,
         onBackClick = {},
-        onItemClick = { _, _, _ -> },
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ import io.element.android.libraries.matrix.api.core.EventId`
`75`	`75`	`import io.element.android.libraries.matrix.api.core.MAIN_SPACE`
`76`	`76`	`import io.element.android.libraries.matrix.api.core.RoomId`
`77`	`77`	`import io.element.android.libraries.matrix.api.core.RoomIdOrAlias`
`78`		`-import io.element.android.libraries.matrix.api.core.SessionId`
`79`	`78`	`import io.element.android.libraries.matrix.api.core.UserId`
`80`	`79`	`import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias`
`81`	`80`	`import io.element.android.libraries.matrix.api.permalink.PermalinkData`
`@@ -412,11 +411,7 @@ class LoggedInFlowNode(`
`412`	`411`	`backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.NotificationSettings))`
`413`	`412`	`}`
`414`	`413`
`415`		`- override fun navigateTo(sessionId: SessionId, roomId: RoomId, eventId: EventId) {`
`416`		`- // We do not check the sessionId, but it will have to be done at some point (multi account)`
`417`		`- if (sessionId != matrixClient.sessionId) {`
`418`		`- Timber.e("SessionId mismatch, expected ${matrixClient.sessionId} but got $sessionId")`
`419`		`- }`
	`414`	`+ override fun navigateTo(roomId: RoomId, eventId: EventId) {`
`420`	`415`	`backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Messages(eventId)))`
`421`	`416`	`}`
`422`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ import io.element.android.libraries.architecture.FeatureEntryPoint`
`15`	`15`	`import io.element.android.libraries.architecture.NodeInputs`
`16`	`16`	`import io.element.android.libraries.matrix.api.core.EventId`
`17`	`17`	`import io.element.android.libraries.matrix.api.core.RoomId`
`18`		`-import io.element.android.libraries.matrix.api.core.SessionId`
`19`	`18`	`import kotlinx.parcelize.Parcelize`
`20`	`19`
`21`	`20`	`interface PreferencesEntryPoint : FeatureEntryPoint {`
`@@ -45,6 +44,6 @@ interface PreferencesEntryPoint : FeatureEntryPoint {`
`45`	`44`	`fun onOpenBugReport()`
`46`	`45`	`fun onSecureBackupClick()`
`47`	`46`	`fun onOpenRoomNotificationSettings(roomId: RoomId)`
`48`		`- fun navigateTo(sessionId: SessionId, roomId: RoomId, eventId: EventId)`
	`47`	`+ fun navigateTo(roomId: RoomId, eventId: EventId)`
`49`	`48`	`}`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ class PreferencesFlowNode(`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`- override fun onItemClick(sessionId: SessionId, roomId: RoomId, eventId: EventId) {`
`230`		`- plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(sessionId, roomId, eventId) }`
	`229`	`+ override fun navigateTo(roomId: RoomId, eventId: EventId) {`
	`230`	`+ plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(roomId, eventId) }`
`231`	`231`	`}`
`232`	`232`	`})`
`233`	`233`	`.build()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import com.bumble.appyx.core.plugin.Plugin`
`13`	`13`	`import io.element.android.libraries.architecture.FeatureEntryPoint`
`14`	`14`	`import io.element.android.libraries.matrix.api.core.EventId`
`15`	`15`	`import io.element.android.libraries.matrix.api.core.RoomId`
`16`		`-import io.element.android.libraries.matrix.api.core.SessionId`
`17`	`16`
`18`	`17`	`interface PushHistoryEntryPoint : FeatureEntryPoint {`
`19`	`18`	`fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder`
`@@ -25,6 +24,6 @@ interface PushHistoryEntryPoint : FeatureEntryPoint {`
`25`	`24`
`26`	`25`	`interface Callback : Plugin {`
`27`	`26`	`fun onDone()`
`28`		`- fun onItemClick(sessionId: SessionId, roomId: RoomId, eventId: EventId)`
	`27`	`+ fun navigateTo(roomId: RoomId, eventId: EventId)`
`29`	`28`	`}`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@ data class PushHistoryState(`
`16`	`16`	`val pushHistoryItems: ImmutableList<PushHistoryItem>,`
`17`	`17`	`val showOnlyErrors: Boolean,`
`18`	`18`	`val resetAction: AsyncAction<Unit>,`
	`19`	`+ val showNotSameAccountError: Boolean,`
`19`	`20`	`val eventSink: (PushHistoryEvents) -> Unit,`
`20`	`21`	`)`