Skip to content

Commit c220fb0

Browse files
committed
feat(join by alias) : makes sure to pass server names
1 parent 818af20 commit c220fb0

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@ class LoggedInFlowNode @AssistedInject constructor(
357357
}
358358
NavTarget.CreateRoom -> {
359359
val callback = object : CreateRoomEntryPoint.Callback {
360-
override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias) {
361-
backstack.replace(NavTarget.Room(roomIdOrAlias))
360+
override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
361+
backstack.replace(NavTarget.Room(roomIdOrAlias = roomIdOrAlias, serverNames = serverNames))
362362
}
363363
}
364364

features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ interface CreateRoomEntryPoint : FeatureEntryPoint {
2121
}
2222

2323
interface Callback : Plugin {
24-
fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias)
24+
fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
2525
}
2626
}

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/CreateRoomNavigator.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import io.element.android.libraries.architecture.overlay.operation.show
1717
import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
1818

1919
interface CreateRoomNavigator : Plugin {
20-
fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias)
20+
fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
2121
fun onCreateNewRoom()
2222
fun onShowJoinRoomByAddress()
2323
fun onDismissJoinRoomByAddress()
@@ -26,10 +26,10 @@ interface CreateRoomNavigator : Plugin {
2626
class DefaultCreateRoomNavigator(
2727
private val backstack: BackStack<NavTarget>,
2828
private val overlay: Overlay<NavTarget>,
29-
private val openRoom: (RoomIdOrAlias) -> Unit,
29+
private val openRoom: (RoomIdOrAlias, List<String>) -> Unit,
3030
) : CreateRoomNavigator {
3131

32-
override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias) = openRoom(roomIdOrAlias)
32+
override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) = openRoom(roomIdOrAlias, serverNames)
3333

3434
override fun onCreateNewRoom() {
3535
backstack.push(NavTarget.NewRoom)

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class CreateRoomFlowNode @AssistedInject constructor(
6060
private val navigator = DefaultCreateRoomNavigator(
6161
backstack = backstack,
6262
overlay = overlay,
63-
openRoom = { roomIdOrAlias ->
64-
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomIdOrAlias) }
63+
openRoom = { roomIdOrAlias, viaServers ->
64+
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomIdOrAlias, viaServers) }
6565
}
6666
)
6767

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ConfigureRoomNode @AssistedInject constructor(
4949
modifier = modifier,
5050
onBackClick = this::navigateUp,
5151
onCreateRoomSuccess = {
52-
navigator.onOpenRoom(it.toRoomIdOrAlias())
52+
navigator.onOpenRoom(roomIdOrAlias = it.toRoomIdOrAlias(), serverNames = emptyList())
5353
},
5454
)
5555
}

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressPresenter.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ class JoinRoomByAddressPresenter @AssistedInject constructor(
9494

9595
private fun onRoomFound(state: RoomAddressState.RoomFound) {
9696
navigator.onDismissJoinRoomByAddress()
97-
navigator.onOpenRoom(state.resolved.roomId.toRoomIdOrAlias())
97+
navigator.onOpenRoom(
98+
roomIdOrAlias = state.resolved.roomId.toRoomIdOrAlias(),
99+
serverNames = state.resolved.servers
100+
)
98101
}
99102

100103
@Composable

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class CreateRoomRootNode @AssistedInject constructor(
5353
onCloseClick = this::navigateUp,
5454
onNewRoomClick = navigator::onCreateNewRoom,
5555
onOpenDM = {
56-
navigator.onOpenRoom(it.toRoomIdOrAlias())
56+
navigator.onOpenRoom(roomIdOrAlias = it.toRoomIdOrAlias(), serverNames = emptyList())
5757
},
5858
onJoinByAddressClick = navigator::onShowJoinRoomByAddress,
5959
onInviteFriendsClick = { invitePeople(activity) }

0 commit comments

Comments
 (0)