From 0ee7ed3a788f1196aa7d6153eb0568917547dd0b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 10:00:15 +0200 Subject: [PATCH] `ChangeServerEvents` -> `ChangeServerEvent` --- ...geServerEvents.kt => ChangeServerEvent.kt} | 10 +++++----- .../changeserver/ChangeServerPresenter.kt | 10 +++++----- .../impl/changeserver/ChangeServerState.kt | 2 +- .../impl/changeserver/ChangeServerView.kt | 20 +++++++++---------- .../ConfirmAccountProviderPresenter.kt | 6 +++--- .../changeserver/ChangeServerPresenterTest.kt | 20 +++++++++---------- 6 files changed, 34 insertions(+), 34 deletions(-) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/{ChangeServerEvents.kt => ChangeServerEvent.kt} (83%) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvent.kt similarity index 83% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvent.kt index 4f0d228dd2..f3fd02713f 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvents.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerEvent.kt @@ -10,9 +10,9 @@ package io.element.android.features.login.impl.changeserver import io.element.android.features.login.impl.accountprovider.AccountProvider -sealed interface ChangeServerEvents { - data class ChangeServer(val accountProvider: AccountProvider) : ChangeServerEvents - data object ClearError : ChangeServerEvents - data object RequestLocalNetworkPermission : ChangeServerEvents - data object DismissLocalNetworkPermission : ChangeServerEvents +sealed interface ChangeServerEvent { + data class ChangeServer(val accountProvider: AccountProvider) : ChangeServerEvent + data object ClearError : ChangeServerEvent + data object RequestLocalNetworkPermission : ChangeServerEvent + data object DismissLocalNetworkPermission : ChangeServerEvent } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt index b7b04beeb2..9106d6e1c4 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenter.kt @@ -42,12 +42,12 @@ class ChangeServerPresenter( onProceed = { provider -> changeServer(provider, changeServerAction) }, ) - fun handleEvent(event: ChangeServerEvents) { + fun handleEvent(event: ChangeServerEvent) { when (event) { - ChangeServerEvents.ClearError -> changeServerAction.value = AsyncData.Uninitialized - is ChangeServerEvents.ChangeServer -> gateState.submit(event.accountProvider) - ChangeServerEvents.DismissLocalNetworkPermission -> gateState.abort() - ChangeServerEvents.RequestLocalNetworkPermission -> gateState.requestPermission() + ChangeServerEvent.ClearError -> changeServerAction.value = AsyncData.Uninitialized + is ChangeServerEvent.ChangeServer -> gateState.submit(event.accountProvider) + ChangeServerEvent.DismissLocalNetworkPermission -> gateState.abort() + ChangeServerEvent.RequestLocalNetworkPermission -> gateState.requestPermission() } } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt index 3b4f4d9dad..1b69551e94 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerState.kt @@ -17,5 +17,5 @@ data class ChangeServerState( // configuring (and re-networking) the homeserver a second time. val changeServerAction: AsyncData, val localNetworkPermissionDialog: LocalNetworkPermissionDialog, - val eventSink: (ChangeServerEvents) -> Unit + val eventSink: (ChangeServerEvent) -> Unit ) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt index 8e726c7fe1..e629c6bce3 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt @@ -47,7 +47,7 @@ fun ChangeServerView( modifier = modifier, content = stringResource(R.string.screen_change_server_error_invalid_homeserver), onSubmit = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) } ) ChangeServerError.UnsupportedServer -> @@ -55,7 +55,7 @@ fun ChangeServerView( modifier = modifier, content = stringResource(R.string.screen_login_error_unsupported_authentication), onSubmit = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) } ) is ChangeServerError.Error -> { @@ -63,7 +63,7 @@ fun ChangeServerView( modifier = modifier, content = error.messageStr ?: stringResource(CommonStrings.error_unknown), onSubmit = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) } ) } @@ -72,10 +72,10 @@ fun ChangeServerView( modifier = modifier, onLearnMoreClick = { onLearnMoreClick() - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) }, onDismiss = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) } ) } @@ -90,10 +90,10 @@ fun ChangeServerView( submitText = stringResource(R.string.screen_change_server_error_element_pro_required_action_android), onSubmitClick = { context.openGooglePlay(error.applicationId) - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) }, onDismiss = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) }, ) } @@ -106,7 +106,7 @@ fun ChangeServerView( error.unauthorisedAccountProviderTitle, ), onSubmit = { - eventSink.invoke(ChangeServerEvents.ClearError) + eventSink.invoke(ChangeServerEvent.ClearError) } ) } @@ -125,10 +125,10 @@ fun ChangeServerView( LocalNetworkPermissionDialogView( dialog = state.localNetworkPermissionDialog, onSubmit = { - eventSink.invoke(ChangeServerEvents.RequestLocalNetworkPermission) + eventSink.invoke(ChangeServerEvent.RequestLocalNetworkPermission) }, onDismiss = { - eventSink.invoke(ChangeServerEvents.DismissLocalNetworkPermission) + eventSink.invoke(ChangeServerEvent.DismissLocalNetworkPermission) } ) } diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt index 5c66f8f446..9fae52ab0b 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenter.kt @@ -24,7 +24,7 @@ import io.element.android.appconfig.AuthenticationConfig import io.element.android.features.enterprise.api.EnterpriseService import io.element.android.features.login.impl.accountprovider.AccountProvider import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource -import io.element.android.features.login.impl.changeserver.ChangeServerEvents +import io.element.android.features.login.impl.changeserver.ChangeServerEvent import io.element.android.features.login.impl.changeserver.ChangeServerState import io.element.android.features.login.impl.login.LoginModeEvent import io.element.android.features.login.impl.login.LoginModeState @@ -134,12 +134,12 @@ class ConfirmAccountProviderPresenter( val accountProviderUrl = host.ensureProtocol() submittedAccountProvider = accountProviderUrl changeServerState.eventSink( - ChangeServerEvents.ChangeServer(AccountProvider(url = accountProviderUrl)) + ChangeServerEvent.ChangeServer(AccountProvider(url = accountProviderUrl)) ) } ConfirmAccountProviderEvents.ClearError -> { loginModeState.eventSink(LoginModeEvent.ClearError) - changeServerState.eventSink(ChangeServerEvents.ClearError) + changeServerState.eventSink(ChangeServerEvent.ClearError) } } } diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt index ad997111e2..44a3bbd5cb 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt @@ -63,7 +63,7 @@ class ChangeServerPresenterTest { ).test { val initialState = awaitItem() assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val loadingState = awaitItem() assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java) val successState = awaitItem() @@ -87,13 +87,13 @@ class ChangeServerPresenterTest { ).test { val initialState = awaitItem() assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val loadingState = awaitItem() assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java) val failureState = awaitItem() assertThat(failureState.changeServerAction).isInstanceOf(AsyncData.Failure::class.java) // Clear error - failureState.eventSink.invoke(ChangeServerEvents.ClearError) + failureState.eventSink.invoke(ChangeServerEvent.ClearError) val finalState = awaitItem() assertThat(finalState.changeServerAction).isEqualTo(AsyncData.Uninitialized) } @@ -115,7 +115,7 @@ class ChangeServerPresenterTest { ).test { val initialState = awaitItem() assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val loadingState = awaitItem() assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java) val failureState = awaitItem() @@ -139,7 +139,7 @@ class ChangeServerPresenterTest { val initialState = awaitItem() assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized) val anAccountProvider = AccountProvider(url = A_HOMESERVER_URL) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(anAccountProvider)) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(anAccountProvider)) val loadingState = awaitItem() assertThat(loadingState.changeServerAction).isInstanceOf(AsyncData.Loading::class.java) val failureState = awaitItem() @@ -167,7 +167,7 @@ class ChangeServerPresenterTest { val initialState = awaitItem() assertThat(initialState.changeServerAction).isEqualTo(AsyncData.Uninitialized) val anAccountProvider = AccountProvider(url = A_HOMESERVER_URL) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(anAccountProvider)) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(anAccountProvider)) // Skip loading state skipItems(1) val failureState = awaitItem() @@ -194,7 +194,7 @@ class ChangeServerPresenterTest { ).test { val initialState = awaitItem() assertThat(initialState.localNetworkPermissionDialog).isEqualTo(LocalNetworkPermissionDialog.None) - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val promptState = expectMostRecentItem() // Dialog is shown, permission has not been requested yet, setHomeserver has not been called. assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None) @@ -213,10 +213,10 @@ class ChangeServerPresenterTest { permissionsPresenter = FakePermissionsPresenter(), ).test { val initialState = awaitItem() - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val promptState = expectMostRecentItem() assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None) - promptState.eventSink.invoke(ChangeServerEvents.DismissLocalNetworkPermission) + promptState.eventSink.invoke(ChangeServerEvent.DismissLocalNetworkPermission) val dismissedState = expectMostRecentItem() assertThat(dismissedState.localNetworkPermissionDialog).isEqualTo(LocalNetworkPermissionDialog.None) assertThat(dismissedState.changeServerAction).isEqualTo(AsyncData.Uninitialized) @@ -236,7 +236,7 @@ class ChangeServerPresenterTest { permissionsPresenter = permissionsPresenter, ).test { val initialState = awaitItem() - initialState.eventSink.invoke(ChangeServerEvents.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) + initialState.eventSink.invoke(ChangeServerEvent.ChangeServer(AccountProvider(url = A_HOMESERVER_URL))) val promptState = expectMostRecentItem() assertThat(promptState.localNetworkPermissionDialog).isNotEqualTo(LocalNetworkPermissionDialog.None) permissionsPresenter.setPermissionGranted()