ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 16:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge the 2 map.

Browse Source
This commit is contained in:
Benoit Marty
2023-06-09 17:55:09 +02:00
parent ee38aee147
commit f311641ab3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt
+3 -4
View File
@@ -85,12 +85,11 @@ class ConfirmAccountProviderPresenter @AssistedInject constructor(
suspend { suspend {
val domain = tryOrNull { URL(homeserverUrl) }?.host ?: homeserverUrl val domain = tryOrNull { URL(homeserverUrl) }?.host ?: homeserverUrl
authenticationService.setHomeserver(domain).map { authenticationService.setHomeserver(domain).map {
authenticationService.getHomeserverDetails().value!! val matrixHomeServerDetails = authenticationService.getHomeserverDetails().value!!
}.map { if (matrixHomeServerDetails.supportsOidcLogin) {
if (it.supportsOidcLogin) {
// Retrieve the details right now // Retrieve the details right now
LoginFlow.OidcFlow(authenticationService.getOidcUrl().getOrThrow()) LoginFlow.OidcFlow(authenticationService.getOidcUrl().getOrThrow())
} else if (it.supportsPasswordLogin) { } else if (matrixHomeServerDetails.supportsPasswordLogin) {
LoginFlow.PasswordLogin LoginFlow.PasswordLogin
} else { } else {
throw IllegalStateException("Unsupported login flow") throw IllegalStateException("Unsupported login flow")