Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Improve code on ShareNode

Browse source
This commit is contained in:
Benoit Marty 2025-10-29 09:00:07 +01:00
parent 6ae0d67e69
commit 93b1c9e597
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -469,9 +469,8 @@ class LoggedInFlowNode(
.callback(object : ShareEntryPoint.Callback { .callback(object : ShareEntryPoint.Callback {
override fun onDone(roomIds: List<RoomId>) { override fun onDone(roomIds: List<RoomId>) {
navigateUp() navigateUp()
if (roomIds.size == 1) { roomIds.singleOrNull()?.let { roomId ->
val targetRoomId = roomIds.first() backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
backstack.push(NavTarget.Room(targetRoomId.toRoomIdOrAlias()))
} }
} }
}) })

6
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
View file

@ -61,7 +61,7 @@ class ShareNode(
} }
override fun onCancel() { override fun onCancel() {
navigateUp() onShareDone(emptyList())
} }
} }
@ -82,12 +82,12 @@ class ShareNode(
val state = presenter.present() val state = presenter.present()
ShareView( ShareView(
state = state, state = state,
onShareSuccess = ::onShareSuccess, onShareSuccess = ::onShareDone,
) )
} }
} }
private fun onShareSuccess(roomIds: List<RoomId>) { private fun onShareDone(roomIds: List<RoomId>) {
callbacks.forEach { it.onDone(roomIds) } callbacks.forEach { it.onDone(roomIds) }
} }
} }