From a34b424b7b11dc4d78531f8f1b1ff0950e3f2daf Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 14 Apr 2022 11:46:34 +0100 Subject: [PATCH] updating the server selection on non Edit/Select events - such as deeplinks - extracts a common function --- .../onboarding/OnboardingViewModel.kt | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt index 00b36ba60e..8c71441d46 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt @@ -625,32 +625,20 @@ class OnboardingViewModel @AssistedInject constructor( _viewEvents.post(OnboardingViewEvents.OutdatedHomeserver) } - val state = awaitState() - when (trigger) { is OnboardingAction.HomeServerChange.EditHomeServer -> { - when (state.onboardingFlow) { + when (awaitState().onboardingFlow) { OnboardingFlow.SignUp -> internalRegisterAction(RegisterAction.StartRegistration) { _ -> - setState { - copy( - serverType = alignServerTypeAfterSubmission(config, serverTypeOverride), - selectedHomeserver = authResult.selectedHomeserver, - ) - } + updateServerSelection(config, serverTypeOverride, authResult) _viewEvents.post(OnboardingViewEvents.OnHomeserverEdited) } else -> throw IllegalArgumentException("developer error") } } is OnboardingAction.HomeServerChange.SelectHomeServer -> { - setState { - copy( - serverType = alignServerTypeAfterSubmission(config, serverTypeOverride), - selectedHomeserver = authResult.selectedHomeserver, - ) - } + updateServerSelection(config, serverTypeOverride, authResult) if (authResult.selectedHomeserver.preferredLoginMode.supportsSignModeScreen()) { - when (state.onboardingFlow) { + when (awaitState().onboardingFlow) { OnboardingFlow.SignIn -> internalRegisterAction(RegisterAction.StartRegistration, ::emitFlowResultViewEvent) OnboardingFlow.SignUp -> internalRegisterAction(RegisterAction.StartRegistration, ::emitFlowResultViewEvent) OnboardingFlow.SignInSignUp, @@ -662,7 +650,19 @@ class OnboardingViewModel @AssistedInject constructor( _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved) } } - else -> _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved) + else -> { + updateServerSelection(config, serverTypeOverride, authResult) + _viewEvents.post(OnboardingViewEvents.OnLoginFlowRetrieved) + } + } + } + + private fun updateServerSelection(config: HomeServerConnectionConfig, serverTypeOverride: ServerType?, authResult: StartAuthenticationFlowUseCase.StartAuthenticationResult) { + setState { + copy( + serverType = alignServerTypeAfterSubmission(config, serverTypeOverride), + selectedHomeserver = authResult.selectedHomeserver, + ) } }