filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renaming success type to something more concrete

This commit is contained in:
Adam Brown 2022-06-08 10:29:56 +01:00
parent 88167a0287
commit befcfe8c5b
4 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,8 +273,7 @@ class OnboardingViewModel @AssistedInject constructor(
} }
private suspend fun internalRegisterAction(action: RegisterAction, overrideNextStage: (() -> Unit)? = null) { private suspend fun internalRegisterAction(action: RegisterAction, overrideNextStage: (() -> Unit)? = null) {
runCatching { registrationActionHandler.processAction(awaitState().selectedHomeserver, action) } runCatching { registrationActionHandler.processAction(awaitState().selectedHomeserver, action) }.fold(
.fold(
onSuccess = { onSuccess = {
when (it) { when (it) {
RegistrationActionHandler.Result.Ignored -> { RegistrationActionHandler.Result.Ignored -> {
@ -283,7 +282,7 @@ class OnboardingViewModel @AssistedInject constructor(
is RegistrationActionHandler.Result.NextStage -> { is RegistrationActionHandler.Result.NextStage -> {
overrideNextStage?.invoke() ?: _viewEvents.post(OnboardingViewEvents.DisplayRegistrationStage(it.stage)) overrideNextStage?.invoke() ?: _viewEvents.post(OnboardingViewEvents.DisplayRegistrationStage(it.stage))
} }
is RegistrationActionHandler.Result.Success -> onSessionCreated( is RegistrationActionHandler.Result.RegistrationComplete -> onSessionCreated(
it.session, it.session,
authenticationDescription = awaitState().selectedAuthenticationState.description authenticationDescription = awaitState().selectedAuthenticationState.description
?: AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Other) ?: AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Other)
@ -305,8 +304,6 @@ class OnboardingViewModel @AssistedInject constructor(
) )
} }
private fun OnboardingViewState.hasSelectedMatrixOrg() = selectedHomeserver.userFacingUrl == matrixOrgUrl
private fun handleRegisterWith(action: AuthenticateAction.Register) { private fun handleRegisterWith(action: AuthenticateAction.Register) {
setState { setState {
val authDescription = AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Password) val authDescription = AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.Password)

4
vector/src/main/java/im/vector/app/features/onboarding/RegistrationActionHandler.kt
View File

@ -45,7 +45,7 @@ class RegistrationActionHandler @Inject constructor(
return when { return when {
action.ignoresResult() -> Result.Ignored action.ignoresResult() -> Result.Ignored
else -> when (result) { else -> when (result) {
is RegistrationResult.Complete -> Result.Success(result.session) is RegistrationResult.Complete -> Result.RegistrationComplete(result.session)
is RegistrationResult.NextStep -> processFlowResult(result, state) is RegistrationResult.NextStep -> processFlowResult(result, state)
is RegistrationResult.SendEmailSuccess -> Result.SendEmailSuccess(result.email) is RegistrationResult.SendEmailSuccess -> Result.SendEmailSuccess(result.email)
is RegistrationResult.Error -> Result.Error(result.cause) is RegistrationResult.Error -> Result.Error(result.cause)
@ -91,7 +91,7 @@ class RegistrationActionHandler @Inject constructor(
private fun SelectedHomeserverState.hasSelectedMatrixOrg() = userFacingUrl == matrixOrgUrl private fun SelectedHomeserverState.hasSelectedMatrixOrg() = userFacingUrl == matrixOrgUrl
sealed interface Result { sealed interface Result {
data class Success(val session: Session) : Result data class RegistrationComplete(val session: Session) : Result
data class NextStage(val stage: Stage) : Result data class NextStage(val stage: Stage) : Result
data class Error(val cause: Throwable) : Result data class Error(val cause: Throwable) : Result
data class SendEmailSuccess(val email: String) : Result data class SendEmailSuccess(val email: String) : Result

4
vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
View File

@ -31,8 +31,8 @@ import im.vector.app.test.fakes.FakeContext
import im.vector.app.test.fakes.FakeDirectLoginUseCase import im.vector.app.test.fakes.FakeDirectLoginUseCase
import im.vector.app.test.fakes.FakeHomeServerConnectionConfigFactory import im.vector.app.test.fakes.FakeHomeServerConnectionConfigFactory
import im.vector.app.test.fakes.FakeHomeServerHistoryService import im.vector.app.test.fakes.FakeHomeServerHistoryService
import im.vector.app.test.fakes.FakeRegistrationActionHandler
import im.vector.app.test.fakes.FakeLoginWizard import im.vector.app.test.fakes.FakeLoginWizard
import im.vector.app.test.fakes.FakeRegistrationActionHandler
import im.vector.app.test.fakes.FakeSession import im.vector.app.test.fakes.FakeSession
import im.vector.app.test.fakes.FakeStartAuthenticationFlowUseCase import im.vector.app.test.fakes.FakeStartAuthenticationFlowUseCase
import im.vector.app.test.fakes.FakeStringProvider import im.vector.app.test.fakes.FakeStringProvider
@ -316,7 +316,7 @@ class OnboardingViewModelTest {
fun `given personalisation enabled, when registering account, then updates state and emits account created event`() = runTest { fun `given personalisation enabled, when registering account, then updates state and emits account created event`() = runTest {
fakeVectorFeatures.givenPersonalisationEnabled() fakeVectorFeatures.givenPersonalisationEnabled()
givenSuccessfullyCreatesAccount(A_HOMESERVER_CAPABILITIES) givenSuccessfullyCreatesAccount(A_HOMESERVER_CAPABILITIES)
givenRegistrationResultFor(RegisterAction.StartRegistration, RegistrationActionHandler.Result.Success(fakeSession)) givenRegistrationResultFor(RegisterAction.StartRegistration, RegistrationActionHandler.Result.RegistrationComplete(fakeSession))
val test = viewModel.test() val test = viewModel.test()
viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.StartRegistration)) viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.StartRegistration))

6
vector/src/test/java/im/vector/app/features/onboarding/RegistrationActionHandlerTest.kt
View File

@ -61,12 +61,12 @@ class RegistrationActionHandlerTest {
} }
@Test @Test
fun `given wizard delegate returns success, when handling action, then returns success`() = runTest { fun `given wizard delegate returns success, when handling action, then returns RegistrationComplete`() = runTest {
fakeWizardActionDelegate.givenResultsFor(listOf(RegisterAction.StartRegistration to RegistrationResult.Complete(A_SESSION))) fakeWizardActionDelegate.givenResultsFor(listOf(RegisterAction.StartRegistration to RegistrationResult.Complete(A_SESSION)))
val result = registrationActionHandler.processAction(RegisterAction.StartRegistration) val result = registrationActionHandler.processAction(RegisterAction.StartRegistration)
result shouldBeEqualTo RegistrationActionHandler.Result.Success(A_SESSION) result shouldBeEqualTo RegistrationActionHandler.Result.RegistrationComplete(A_SESSION)
} }
@Test @Test
@ -154,7 +154,7 @@ class RegistrationActionHandlerTest {
val result = registrationActionHandler.processAction(RegisterAction.StartRegistration) val result = registrationActionHandler.processAction(RegisterAction.StartRegistration)
result shouldBeEqualTo RegistrationActionHandler.Result.Success(A_SESSION) result shouldBeEqualTo RegistrationActionHandler.Result.RegistrationComplete(A_SESSION)
} }
private fun givenFlowResult(stages: List<Stage>) { private fun givenFlowResult(stages: List<Stage>) {