Provide calculated server names when opening a room from another (#5155)

jmartinesp · web-flow · commit 516c3cfda36d · 2025-08-12T15:17:46.000Z
* Provide calculated server names when opening a room from another, based on the most frequently used domain names in the user ids for the users in the room.

This helps when following permalinks or navigating to the successor room of a tombstoned one. Previously, the `/summary` endpoint was failing because no server names were used in the `via` parameters.
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -335,8 +335,8 @@ class LoggedInFlowNode @AssistedInject constructor(
             }
             is NavTarget.Room -> {
                 val callback = object : JoinedRoomLoadedFlowNode.Callback {
-                    override fun onOpenRoom(roomId: RoomId) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
+                    override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
+                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))
                     }
 
                     override fun onForwardedToSingleRoom(roomId: RoomId) {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -69,7 +69,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
     plugins = plugins,
 ), DaggerComponentOwner {
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId)
+        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
         fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun onForwardedToSingleRoom(roomId: RoomId)
         fun onOpenGlobalNotificationSettings()
@@ -121,8 +121,8 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
                 callbacks.forEach { it.onOpenGlobalNotificationSettings() }
             }
 
-            override fun onOpenRoom(roomId: RoomId) {
-                callbacks.forEach { it.onOpenRoom(roomId) }
+            override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
+                callbacks.forEach { it.onOpenRoom(roomId, serverNames) }
             }
 
             override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
@@ -20,5 +20,5 @@ interface MessagesNavigator {
     fun onReportContentClick(eventId: EventId, senderId: UserId)
     fun onEditPollClick(eventId: EventId)
     fun onPreviewAttachment(attachments: ImmutableList<Attachment>)
-    fun onNavigateToRoom(roomId: RoomId)
+    fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>)
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -66,6 +66,7 @@ import io.element.android.libraries.mediaplayer.api.MediaPlayer
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -213,11 +214,11 @@ class MessagesNode @AssistedInject constructor(
         callbacks.forEach { it.onPreviewAttachments(attachments) }
     }
 
-    override fun onNavigateToRoom(roomId: RoomId) {
+    override fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>) {
         if (roomId == room.roomId) {
             displaySameRoomToast()
         } else {
-            val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias())
+            val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias(), viaParameters = serverNames.toImmutableList())
             callbacks.forEach { it.onPermalinkClick(permalinkData) }
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -278,7 +278,7 @@ fun MessagesView(
                 state = state,
                 onLinkClick = { url, customTab -> onLinkClick(url, customTab) },
                 onRoomSuccessorClick = { roomId ->
-                    state.timelineState.eventSink(TimelineEvents.NavigateToRoom(roomId = roomId))
+                    state.timelineState.eventSink(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(roomId = roomId))
                 },
             )
         },
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt
@@ -31,7 +31,11 @@ sealed interface TimelineEvents {
     data class ComputeVerifiedUserSendFailure(val event: TimelineItem.Event) : EventFromTimelineItem
     data class ShowShieldDialog(val messageShield: MessageShield) : EventFromTimelineItem
     data class LoadMore(val direction: Timeline.PaginationDirection) : EventFromTimelineItem
-    data class NavigateToRoom(val roomId: RoomId) : EventFromTimelineItem
+
+    /**
+     * Navigate to the predecessor or successor room of the current room.
+     */
+    data class NavigateToPredecessorOrSuccessorRoom(val roomId: RoomId) : EventFromTimelineItem
 
     /**
      * Events coming from a poll item.
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -178,8 +178,10 @@ class TimelinePresenter @AssistedInject constructor(
                 is TimelineEvents.ComputeVerifiedUserSendFailure -> {
                     resolveVerifiedUserSendFailureState.eventSink(ResolveVerifiedUserSendFailureEvents.ComputeForMessage(event.event))
                 }
-                is TimelineEvents.NavigateToRoom -> {
-                    navigator.onNavigateToRoom(event.roomId)
+                is TimelineEvents.NavigateToPredecessorOrSuccessorRoom -> {
+                    // Navigate to the predecessor or successor room
+                    val serverNames = calculateServerNamesForRoom(room)
+                    navigator.onNavigateToRoom(event.roomId, serverNames)
                 }
             }
         }
@@ -353,3 +355,19 @@ private fun FocusRequestState.onFocusEventRender(): FocusRequestState {
         else -> this
     }
 }
+
+// Workaround for not having the server names available, get possible server names from the user ids of the room members
+private fun calculateServerNamesForRoom(room: JoinedRoom): List<String> {
+    // If we have no room members, return right ahead
+    val serverNames = room.membersStateFlow.value.roomMembers() ?: return emptyList()
+
+    // Otherwise get the three most common server names from the user ids of the room members
+    return serverNames
+        .mapNotNull { it.userId.domainName }
+        .groupingBy { it }
+        .eachCount()
+        .let { map ->
+            map.keys.sortedByDescending { map[it] }
+        }
+        .take(3)
+}
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
@@ -47,7 +47,7 @@ fun TimelineItemVirtualRow(
                     roomName = timelineRoomInfo.name,
                     isDm = timelineRoomInfo.isDm,
                     onPredecessorRoomClick = { roomId ->
-                        eventSink(TimelineEvents.NavigateToRoom(roomId))
+                        eventSink(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(roomId))
                     },
                 )
             }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
@@ -21,7 +21,7 @@ class FakeMessagesNavigator(
     private val onReportContentClickLambda: (eventId: EventId, senderId: UserId) -> Unit = { _, _ -> lambdaError() },
     private val onEditPollClickLambda: (eventId: EventId) -> Unit = { _ -> lambdaError() },
     private val onPreviewAttachmentLambda: (attachments: ImmutableList<Attachment>) -> Unit = { _ -> lambdaError() },
-    private val onNavigateToRoomLambda: (roomId: RoomId) -> Unit = { _ -> lambdaError() }
+    private val onNavigateToRoomLambda: (roomId: RoomId, serverNames: List<String>) -> Unit = { _, _ -> lambdaError() }
 ) : MessagesNavigator {
     override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
         onShowEventDebugInfoClickLambda(eventId, debugInfo)
@@ -43,7 +43,7 @@ class FakeMessagesNavigator(
         onPreviewAttachmentLambda(attachments)
     }
 
-    override fun onNavigateToRoom(roomId: RoomId) {
-        onNavigateToRoomLambda(roomId)
+    override fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>) {
+        onNavigateToRoomLambda(roomId, serverNames)
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
@@ -579,7 +579,7 @@ class MessagesViewTest {
         val text = rule.activity.getString(R.string.screen_room_timeline_tombstoned_room_action)
         // The bottomsheet subcompose seems to make the node to appear twice
         rule.onAllNodesWithText(text).onFirst().performClick()
-        eventsRecorder.assertSingle(TimelineEvents.NavigateToRoom(successorRoomId))
+        eventsRecorder.assertSingle(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(successorRoomId))
     }
 
     @Test
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
@@ -753,18 +753,19 @@ class TimelinePresenterTest {
                 canUserSendMessageResult = { _, _ -> Result.success(true) },
             ),
         )
-        val onNavigateToRoomLambda = lambdaRecorder<RoomId, Unit> {}
+        val onNavigateToRoomLambda = lambdaRecorder<RoomId, List<String>, Unit> { _, _ -> }
         val navigator = FakeMessagesNavigator(
             onNavigateToRoomLambda = onNavigateToRoomLambda
         )
         val presenter = createTimelinePresenter(room = room, messagesNavigator = navigator)
         presenter.test {
             val initialState = awaitFirstItem()
-            initialState.eventSink(TimelineEvents.NavigateToRoom(A_ROOM_ID))
+            initialState.eventSink(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(A_ROOM_ID))
             assert(onNavigateToRoomLambda)
                 .isCalledOnce()
                 .with(
-                    value(A_ROOM_ID)
+                    value(A_ROOM_ID),
+                    value(emptyList<String>())
                 )
         }
     }
diff --git a/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt b/features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt
@@ -34,7 +34,7 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
 
     interface Callback : Plugin {
         fun onOpenGlobalNotificationSettings()
-        fun onOpenRoom(roomId: RoomId)
+        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
         fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun onForwardedToSingleRoom(roomId: RoomId)
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
@@ -270,7 +270,7 @@ class RoomDetailsFlowNode @AssistedInject constructor(
                     }
 
                     override fun onStartDM(roomId: RoomId) {
-                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onOpenRoom(roomId) }
+                        plugins<RoomDetailsEntryPoint.Callback>().forEach { it.onOpenRoom(roomId, emptyList()) }
                     }
 
                     override fun onStartCall(dmRoomId: RoomId) {
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/UserId.kt
@@ -29,4 +29,7 @@ value class UserId(val value: String) : Serializable {
         get() = value
             .removePrefix("@")
             .substringBefore(":")
+
+    val domainName: String?
+        get() = value.substringAfter(":").takeIf { it.isNotEmpty() }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -283,7 +283,7 @@ class RustMatrixClient(
     }
 
     override suspend fun getJoinedRoom(roomId: RoomId): JoinedRoom? = withContext(sessionDispatcher) {
-        (roomFactory.getJoinedRoomOrPreview(roomId) as? GetRoomResult.Joined)?.joinedRoom
+        (roomFactory.getJoinedRoomOrPreview(roomId, emptyList()) as? GetRoomResult.Joined)?.joinedRoom
     }
 
     /**
@@ -481,15 +481,15 @@ class RustMatrixClient(
                 is RoomIdOrAlias.Alias -> {
                     val roomId = innerClient.resolveRoomAlias(roomIdOrAlias.roomAlias.value)?.roomId?.let { RoomId(it) }
 
-                    var room = (roomId?.let { roomFactory.getJoinedRoomOrPreview(it) } as? GetRoomResult.NotJoined)?.notJoinedRoom
+                    var room = (roomId?.let { roomFactory.getJoinedRoomOrPreview(it, serverNames) } as? GetRoomResult.NotJoined)?.notJoinedRoom
                     if (room == null) {
                         val preview = innerClient.getRoomPreviewFromRoomAlias(roomIdOrAlias.roomAlias.value)
                         room = NotJoinedRustRoom(sessionId, null, RoomPreviewInfoMapper.map(preview.info()))
                     }
                     room
                 }
                 is RoomIdOrAlias.Id -> {
-                    var room = (roomFactory.getJoinedRoomOrPreview(roomIdOrAlias.roomId) as? GetRoomResult.NotJoined)?.notJoinedRoom
+                    var room = (roomFactory.getJoinedRoomOrPreview(roomIdOrAlias.roomId, serverNames) as? GetRoomResult.NotJoined)?.notJoinedRoom
 
                     if (room == null) {
                         val preview = innerClient.getRoomPreviewFromRoomId(roomIdOrAlias.roomId.value, serverNames)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -98,7 +98,7 @@ class RustRoomFactory(
         )
     }
 
-    suspend fun getJoinedRoomOrPreview(roomId: RoomId): GetRoomResult? = withContext(dispatcher) {
+    suspend fun getJoinedRoomOrPreview(roomId: RoomId, serverNames: List<String>): GetRoomResult? = withContext(dispatcher) {
         mutex.withLock {
             if (isDestroyed.get()) {
                 Timber.d("Room factory is destroyed, returning null for $roomId")
@@ -132,7 +132,7 @@ class RustRoomFactory(
                 )
             } else {
                 val preview = try {
-                    sdkRoom.previewRoom(via = emptyList())
+                    sdkRoom.previewRoom(via = serverNames)
                 } catch (e: Exception) {
                     Timber.e(e, "Failed to get room preview for $roomId")
                     return@withContext null

Original file line number	Diff line number	Diff line change
`@@ -335,8 +335,8 @@ class LoggedInFlowNode @AssistedInject constructor(`
`335`	`335`	`}`
`336`	`336`	`is NavTarget.Room -> {`
`337`	`337`	`val callback = object : JoinedRoomLoadedFlowNode.Callback {`
`338`		`- override fun onOpenRoom(roomId: RoomId) {`
`339`		`- backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))`
	`338`	`+ override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {`
	`339`	`+ backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`override fun onForwardedToSingleRoom(roomId: RoomId) {`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ interface MessagesNavigator {`
`20`	`20`	`fun onReportContentClick(eventId: EventId, senderId: UserId)`
`21`	`21`	`fun onEditPollClick(eventId: EventId)`
`22`	`22`	`fun onPreviewAttachment(attachments: ImmutableList<Attachment>)`
`23`		`- fun onNavigateToRoom(roomId: RoomId)`
	`23`	`+ fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>)`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ import io.element.android.libraries.mediaplayer.api.MediaPlayer`
`66`	`66`	`import io.element.android.libraries.ui.strings.CommonStrings`
`67`	`67`	`import io.element.android.services.analytics.api.AnalyticsService`
`68`	`68`	`import kotlinx.collections.immutable.ImmutableList`
	`69`	`+import kotlinx.collections.immutable.toImmutableList`
`69`	`70`	`import kotlinx.coroutines.CoroutineScope`
`70`	`71`	`import kotlinx.coroutines.launch`
`71`	`72`
`@@ -213,11 +214,11 @@ class MessagesNode @AssistedInject constructor(`
`213`	`214`	`callbacks.forEach { it.onPreviewAttachments(attachments) }`
`214`	`215`	`}`
`215`	`216`
`216`		`- override fun onNavigateToRoom(roomId: RoomId) {`
	`217`	`+ override fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>) {`
`217`	`218`	`if (roomId == room.roomId) {`
`218`	`219`	`displaySameRoomToast()`
`219`	`220`	`} else {`
`220`		`- val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias())`
	`221`	`+ val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias(), viaParameters = serverNames.toImmutableList())`
`221`	`222`	`callbacks.forEach { it.onPermalinkClick(permalinkData) }`
`222`	`223`	`}`
`223`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ fun MessagesView(`
`278`	`278`	`state = state,`
`279`	`279`	`onLinkClick = { url, customTab -> onLinkClick(url, customTab) },`
`280`	`280`	`onRoomSuccessorClick = { roomId ->`
`281`		`- state.timelineState.eventSink(TimelineEvents.NavigateToRoom(roomId = roomId))`
	`281`	`+ state.timelineState.eventSink(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(roomId = roomId))`
`282`	`282`	`},`
`283`	`283`	`)`
`284`	`284`	`},`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,10 @@ class TimelinePresenter @AssistedInject constructor(`
`178`	`178`	`is TimelineEvents.ComputeVerifiedUserSendFailure -> {`
`179`	`179`	`resolveVerifiedUserSendFailureState.eventSink(ResolveVerifiedUserSendFailureEvents.ComputeForMessage(event.event))`
`180`	`180`	`}`
`181`		`- is TimelineEvents.NavigateToRoom -> {`
`182`		`- navigator.onNavigateToRoom(event.roomId)`
	`181`	`+ is TimelineEvents.NavigateToPredecessorOrSuccessorRoom -> {`
	`182`	`+ // Navigate to the predecessor or successor room`
	`183`	`+ val serverNames = calculateServerNamesForRoom(room)`
	`184`	`+ navigator.onNavigateToRoom(event.roomId, serverNames)`
`183`	`185`	`}`
`184`	`186`	`}`
`185`	`187`	`}`
`@@ -353,3 +355,19 @@ private fun FocusRequestState.onFocusEventRender(): FocusRequestState {`
`353`	`355`	`else -> this`
`354`	`356`	`}`
`355`	`357`	`}`
	`358`	`+`
	`359`	`+// Workaround for not having the server names available, get possible server names from the user ids of the room members`
	`360`	`+private fun calculateServerNamesForRoom(room: JoinedRoom): List<String> {`
	`361`	`+ // If we have no room members, return right ahead`
	`362`	`+ val serverNames = room.membersStateFlow.value.roomMembers() ?: return emptyList()`
	`363`	`+`
	`364`	`+ // Otherwise get the three most common server names from the user ids of the room members`
	`365`	`+ return serverNames`
	`366`	`+ .mapNotNull { it.userId.domainName }`
	`367`	`+ .groupingBy { it }`
	`368`	`+ .eachCount()`
	`369`	`+ .let { map ->`
	`370`	`+ map.keys.sortedByDescending { map[it] }`
	`371`	`+ }`
	`372`	`+ .take(3)`
	`373`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ fun TimelineItemVirtualRow(`
`47`	`47`	`roomName = timelineRoomInfo.name,`
`48`	`48`	`isDm = timelineRoomInfo.isDm,`
`49`	`49`	`onPredecessorRoomClick = { roomId ->`
`50`		`- eventSink(TimelineEvents.NavigateToRoom(roomId))`
	`50`	`+ eventSink(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(roomId))`
`51`	`51`	`},`
`52`	`52`	`)`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class FakeMessagesNavigator(`
`21`	`21`	`private val onReportContentClickLambda: (eventId: EventId, senderId: UserId) -> Unit = { _, _ -> lambdaError() },`
`22`	`22`	`private val onEditPollClickLambda: (eventId: EventId) -> Unit = { _ -> lambdaError() },`
`23`	`23`	`private val onPreviewAttachmentLambda: (attachments: ImmutableList<Attachment>) -> Unit = { _ -> lambdaError() },`
`24`		`- private val onNavigateToRoomLambda: (roomId: RoomId) -> Unit = { _ -> lambdaError() }`
	`24`	`+ private val onNavigateToRoomLambda: (roomId: RoomId, serverNames: List<String>) -> Unit = { _, _ -> lambdaError() }`
`25`	`25`	`) : MessagesNavigator {`
`26`	`26`	`override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {`
`27`	`27`	`onShowEventDebugInfoClickLambda(eventId, debugInfo)`
`@@ -43,7 +43,7 @@ class FakeMessagesNavigator(`
`43`	`43`	`onPreviewAttachmentLambda(attachments)`
`44`	`44`	`}`
`45`	`45`
`46`		`- override fun onNavigateToRoom(roomId: RoomId) {`
`47`		`- onNavigateToRoomLambda(roomId)`
	`46`	`+ override fun onNavigateToRoom(roomId: RoomId, serverNames: List<String>) {`
	`47`	`+ onNavigateToRoomLambda(roomId, serverNames)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ class MessagesViewTest {`
`579`	`579`	`val text = rule.activity.getString(R.string.screen_room_timeline_tombstoned_room_action)`
`580`	`580`	`// The bottomsheet subcompose seems to make the node to appear twice`
`581`	`581`	`rule.onAllNodesWithText(text).onFirst().performClick()`
`582`		`- eventsRecorder.assertSingle(TimelineEvents.NavigateToRoom(successorRoomId))`
	`582`	`+ eventsRecorder.assertSingle(TimelineEvents.NavigateToPredecessorOrSuccessorRoom(successorRoomId))`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`@Test`