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

Always let the user try what they have entered, to get an explicit error if they continue

Browse source
This commit is contained in:
Benoit Marty 2025-11-06 15:21:50 +01:00 • committed by Benoit Marty
parent c397c8e2c3
commit bb93d6ff06
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt
View file

@ -52,9 +52,10 @@ class HomeserverResolver(
} }
} }
} }
// If list is empty, and the user has entered an URL, do not block the user. // If list is empty, and candidateBase is a valid an URL, do not block the user.
if (currentList.isEmpty() && trimmedUserInput.isValidUrl()) { // A unsupported homeserver / homeserver not found error will be displayed if the user continues
emit(listOf(HomeserverData(homeserverUrl = trimmedUserInput))) if (currentList.isEmpty() && candidateBase.isValidUrl()) {
emit(listOf(HomeserverData(homeserverUrl = candidateBase)))
} }
} }

8
features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
View file

@ -85,7 +85,13 @@ class SearchAccountProviderPresenterTest {
assertThat(withInputState.userInput).isEqualTo("test") assertThat(withInputState.userInput).isEqualTo("test")
assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized) assertThat(initialState.userInputResult).isEqualTo(AsyncData.Uninitialized)
assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java) assertThat(awaitItem().userInputResult).isInstanceOf(AsyncData.Loading::class.java)
assertThat(awaitItem().userInputResult).isEqualTo(AsyncData.Uninitialized) assertThat(awaitItem().userInputResult).isEqualTo(
AsyncData.Success(
listOf(
aHomeserverData(homeserverUrl = "https://test"),
)
)
)
} }
} }