Move onBack method below onNext (9d8e5468) · Commits · e / os / Mail

feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModel.kt

+29 −29

Original line number	Diff line number	Diff line
		@@ -62,35 +62,6 @@ class AccountSetupViewModel(
		onNext()
		}

		private fun onBack() {
		when (state.value.setupStep) {
		SetupStep.AUTO_CONFIG -> navigateBack()
		SetupStep.INCOMING_CONFIG -> changeToSetupStep(SetupStep.AUTO_CONFIG)
		SetupStep.INCOMING_VALIDATION -> {
		if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.INCOMING_CONFIG)
		}
		}

		SetupStep.OUTGOING_CONFIG -> changeToSetupStep(SetupStep.INCOMING_CONFIG)
		SetupStep.OUTGOING_VALIDATION -> {
		if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.OUTGOING_CONFIG)
		}
		}

		SetupStep.OPTIONS -> if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.OUTGOING_CONFIG)
		}
		}
		}

		private fun onNext() {
		when (state.value.setupStep) {
		SetupStep.AUTO_CONFIG -> {
		@@ -129,6 +100,35 @@ class AccountSetupViewModel(
		}
		}

		private fun onBack() {
		when (state.value.setupStep) {
		SetupStep.AUTO_CONFIG -> navigateBack()
		SetupStep.INCOMING_CONFIG -> changeToSetupStep(SetupStep.AUTO_CONFIG)
		SetupStep.INCOMING_VALIDATION -> {
		if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.INCOMING_CONFIG)
		}
		}

		SetupStep.OUTGOING_CONFIG -> changeToSetupStep(SetupStep.INCOMING_CONFIG)
		SetupStep.OUTGOING_VALIDATION -> {
		if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.OUTGOING_CONFIG)
		}
		}

		SetupStep.OPTIONS -> if (state.value.isAutomaticConfig) {
		changeToSetupStep(SetupStep.AUTO_CONFIG)
		} else {
		changeToSetupStep(SetupStep.OUTGOING_CONFIG)
		}
		}
		}

		private fun changeToSetupStep(setupStep: SetupStep) {
		if (setupStep == SetupStep.AUTO_CONFIG) {
		authStateStorage.updateAuthorizationState(authorizationState = null)

feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/AccountSetupViewModelTest.kt

+1 −2

Original line number	Diff line number	Diff line
		package app.k9mail.feature.account.setup.ui

		import app.cash.turbine.testIn
		import app.k9mail.autodiscovery.api.AutoDiscoveryResult
		import app.k9mail.autodiscovery.api.ImapServerSettings
		import app.k9mail.autodiscovery.api.SmtpServerSettings
		@@ -218,7 +217,7 @@ class AccountSetupViewModelTest {
		authStateStorage = authStateStorage,
		initialState = initialState,
		)
		val turbines = turbinesWithInitialStateCheck(viewModel, initialState,)
		val turbines = turbinesWithInitialStateCheck(viewModel, initialState)

		viewModel.event(AccountSetupContract.Event.OnBack)