letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

First try to resolve the room before checking for the alias validity. Fixes #5611

Browse Source
This commit is contained in:
Benoit Marty
2026-01-22 17:09:54 +01:00
parent 2938d4db59
commit c59878988b
2 changed files with 115 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
features/startchat/impl/src/main/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinRoomByAddressPresenter.kt
View File

@@ -113,7 +113,7 @@ class JoinRoomByAddressPresenter(
// debounce the room address resolution
delay(300)
val roomAlias = tryOrNull { RoomAlias(fullAddress) }
if (roomAlias != null && roomAliasHelper.isRoomAliasValid(roomAlias)) {
if (roomAlias != null) {
onChange(RoomAddressState.Resolving)
onChange(client.resolveRoomAddress(roomAlias))
} else {
@@ -130,11 +130,21 @@ class JoinRoomByAddressPresenter(
if (resolved.isPresent) {
RoomAddressState.RoomFound(resolved.get())
} else {
RoomAddressState.RoomNotFound
roomAlias.toInvalidOrNotFound()
}
},
onFailure = { _ -> RoomAddressState.RoomNotFound }
onFailure = { _ ->
roomAlias.toInvalidOrNotFound()
}
)
} ?: RoomAddressState.RoomNotFound
}
private fun RoomAlias.toInvalidOrNotFound(): RoomAddressState {
return if (roomAliasHelper.isRoomAliasValid(this)) {
RoomAddressState.RoomNotFound
} else {
RoomAddressState.Invalid
}
}
}

102
features/startchat/impl/src/test/kotlin/io/element/android/features/startchat/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
View File

@@ -21,6 +21,7 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
import io.element.android.tests.testutils.test
import kotlinx.coroutines.test.runTest
import org.junit.Test
import java.util.Optional
class JoinBaseRoomByAddressPresenterTest {
@Test
@@ -58,6 +59,107 @@ class JoinBaseRoomByAddressPresenterTest {
}
}
@Test
fun `present - invalid address - but room exists`() = runTest {
val presenter = createJoinRoomByAddressPresenter(
roomAliasHelper = FakeRoomAliasHelper(
isRoomAliasValidLambda = {
// The SDK still return false, but we have a room for this alias
false
}
)
)
presenter.test {
with(awaitItem()) {
eventSink(JoinRoomByAddressEvents.UpdateAddress("#ö:invalid.org"))
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Unknown)
eventSink(JoinRoomByAddressEvents.Continue)
}
// The address should not be marked as valid
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Resolving)
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isInstanceOf(RoomAddressState.RoomFound::class.java)
}
}
}
@Test
fun `present - invalid address - room does not exist`() = runTest {
val presenter = createJoinRoomByAddressPresenter(
roomAliasHelper = FakeRoomAliasHelper(
isRoomAliasValidLambda = {
// The SDK return false
false
}
),
matrixClient = FakeMatrixClient(
resolveRoomAliasResult = {
Result.success(Optional.empty())
}
)
)
presenter.test {
with(awaitItem()) {
eventSink(JoinRoomByAddressEvents.UpdateAddress("#ö:invalid.org"))
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Unknown)
eventSink(JoinRoomByAddressEvents.Continue)
}
// The address should not be marked as valid
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Resolving)
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Invalid)
}
}
}
@Test
fun `present - invalid address - failure to resolve the room`() = runTest {
val presenter = createJoinRoomByAddressPresenter(
roomAliasHelper = FakeRoomAliasHelper(
isRoomAliasValidLambda = {
// The SDK still return false, but we have a room for this alias
false
}
),
matrixClient = FakeMatrixClient(
resolveRoomAliasResult = { Result.failure(RuntimeException()) }
)
)
presenter.test {
with(awaitItem()) {
eventSink(JoinRoomByAddressEvents.UpdateAddress("#ö:invalid.org"))
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Unknown)
eventSink(JoinRoomByAddressEvents.Continue)
}
// The address should not be marked as valid
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Resolving)
}
with(awaitItem()) {
assertThat(address).isEqualTo("#ö:invalid.org")
assertThat(addressState).isEqualTo(RoomAddressState.Invalid)
}
}
}
@Test
fun `present - room found`() = runTest {
val openRoomLambda = lambdaRecorder<RoomIdOrAlias, List<String>, Unit> { _, _ -> }