rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4973 from vector-im/feature/adm/ftue-other-sso-crash

Browse Source 
Fixing onboarding crash when signing in/up on non `matrix.org` server with SSO
This commit is contained in:
Benoit Marty 2022-01-18 12:09:14 +01:00 committed by GitHub
commit e8d71feef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4969.bugfix Normal file
View File

@ -0,0 +1 @@
Fixes sign in/up crash when selecting ems and other server types which use SSO

16
vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
View File

@ -826,13 +826,17 @@ class OnboardingViewModel @AssistedInject constructor(
}
withState {
when (it.onboardingFlow) {
OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
OnboardingFlow.SignInSignUp,
null -> {
_viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
if (it.serverType == ServerType.MatrixOrg) {
when (it.onboardingFlow) {
OnboardingFlow.SignIn -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignIn))
OnboardingFlow.SignUp -> handleUpdateSignMode(OnboardingAction.UpdateSignMode(SignMode.SignUp))
OnboardingFlow.SignInSignUp,
null -> {
_viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
}
}
} else {
_viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved)
}
}
}