diff --git a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt index 3a998abd59..d48875983d 100644 --- a/vector/src/main/java/im/vector/app/core/extensions/Collections.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt @@ -19,4 +19,4 @@ package im.vector.app.core.extensions inline fun List.nextOrNull(index: Int) = getOrNull(index + 1) inline fun List.prevOrNull(index: Int) = getOrNull(index - 1) -fun List.containsAll(vararg items: T) = this.containsAll(items.toList()) +fun List.containsAllItems(vararg items: T) = this.containsAll(items.toList()) diff --git a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt index b09be227bb..53e1c47fa1 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/StartAuthenticationFlowUseCase.kt @@ -17,7 +17,7 @@ package im.vector.app.features.onboarding import im.vector.app.R -import im.vector.app.core.extensions.containsAll +import im.vector.app.core.extensions.containsAllItems import im.vector.app.core.resources.StringProvider import im.vector.app.core.utils.ensureTrailingSlash import im.vector.app.features.login.LoginMode @@ -59,10 +59,10 @@ class StartAuthenticationFlowUseCase @Inject constructor( private fun matrixOrgUrl() = stringProvider.getString(R.string.matrix_org_server_url).ensureTrailingSlash() private fun LoginFlowResult.findPreferredLoginMode() = when { - supportedLoginTypes.containsAll(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders) - supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(ssoIdentityProviders) - supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password - else -> LoginMode.Unsupported + supportedLoginTypes.containsAllItems(LoginFlowTypes.SSO, LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(ssoIdentityProviders) + supportedLoginTypes.contains(LoginFlowTypes.SSO) -> LoginMode.Sso(ssoIdentityProviders) + supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.Password + else -> LoginMode.Unsupported } data class StartAuthenticationResult(