From 28c19e38ce9aa6997c107c5dbbd5673b3ac9ddde Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 10:21:36 +0200 Subject: [PATCH] `SecureBackupRootEvents` -> `SecureBackupRootEvent` --- ...ackupRootEvents.kt => SecureBackupRootEvent.kt} | 10 +++++----- .../impl/root/SecureBackupRootPresenter.kt | 10 +++++----- .../impl/root/SecureBackupRootState.kt | 2 +- .../securebackup/impl/root/SecureBackupRootView.kt | 14 +++++++------- .../impl/root/SecureBackupRootPresenterTest.kt | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) rename features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/{SecureBackupRootEvents.kt => SecureBackupRootEvent.kt} (62%) diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvent.kt similarity index 62% rename from features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt rename to features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvent.kt index 9d371e3c30..91bcf67575 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvents.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootEvent.kt @@ -8,9 +8,9 @@ package io.element.android.features.securebackup.impl.root -sealed interface SecureBackupRootEvents { - data object RetryKeyBackupState : SecureBackupRootEvents - data object EnableKeyStorage : SecureBackupRootEvents - data object DisplayKeyStorageDisabledError : SecureBackupRootEvents - data object DismissDialog : SecureBackupRootEvents +sealed interface SecureBackupRootEvent { + data object RetryKeyBackupState : SecureBackupRootEvent + data object EnableKeyStorage : SecureBackupRootEvent + data object DisplayKeyStorageDisabledError : SecureBackupRootEvent + data object DismissDialog : SecureBackupRootEvent } diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt index 9a97bfac25..602fd773da 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenter.kt @@ -59,15 +59,15 @@ class SecureBackupRootPresenter( } } - fun handleEvent(event: SecureBackupRootEvents) { + fun handleEvent(event: SecureBackupRootEvent) { when (event) { - SecureBackupRootEvents.RetryKeyBackupState -> localCoroutineScope.getKeyBackupStatus(doesBackupExistOnServerAction) - SecureBackupRootEvents.EnableKeyStorage -> localCoroutineScope.enableBackup(enableAction) - SecureBackupRootEvents.DismissDialog -> { + SecureBackupRootEvent.RetryKeyBackupState -> localCoroutineScope.getKeyBackupStatus(doesBackupExistOnServerAction) + SecureBackupRootEvent.EnableKeyStorage -> localCoroutineScope.enableBackup(enableAction) + SecureBackupRootEvent.DismissDialog -> { enableAction.value = AsyncAction.Uninitialized displayKeyStorageDisabledError = false } - SecureBackupRootEvents.DisplayKeyStorageDisabledError -> displayKeyStorageDisabledError = true + SecureBackupRootEvent.DisplayKeyStorageDisabledError -> displayKeyStorageDisabledError = true } } diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt index 1cbf917ca5..f528910fe2 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootState.kt @@ -22,7 +22,7 @@ data class SecureBackupRootState( val appName: String, val displayKeyStorageDisabledError: Boolean, val snackbarMessage: SnackbarMessage?, - val eventSink: (SecureBackupRootEvents) -> Unit, + val eventSink: (SecureBackupRootEvent) -> Unit, ) { val isKeyStorageEnabled: Boolean get() = when (backupState) { diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt index 8059329cd0..fb45228ce4 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt @@ -114,12 +114,12 @@ fun SecureBackupRootView( if (state.doesBackupExistOnServer.data) { onDisableClick() } else { - state.eventSink.invoke(SecureBackupRootEvents.EnableKeyStorage) + state.eventSink.invoke(SecureBackupRootEvent.EnableKeyStorage) } } is AsyncData.Loading, AsyncData.Uninitialized -> Unit - is AsyncData.Failure -> state.eventSink.invoke(SecureBackupRootEvents.RetryKeyBackupState) + is AsyncData.Failure -> state.eventSink.invoke(SecureBackupRootEvent.RetryKeyBackupState) } } BackupState.CREATING, @@ -154,7 +154,7 @@ fun SecureBackupRootView( if (state.isKeyStorageEnabled) { onSetupClick() } else { - state.eventSink.invoke(SecureBackupRootEvents.DisplayKeyStorageDisabledError) + state.eventSink.invoke(SecureBackupRootEvent.DisplayKeyStorageDisabledError) } }, ) @@ -177,7 +177,7 @@ fun SecureBackupRootView( if (state.isKeyStorageEnabled) { onChangeClick() } else { - state.eventSink.invoke(SecureBackupRootEvents.DisplayKeyStorageDisabledError) + state.eventSink.invoke(SecureBackupRootEvent.DisplayKeyStorageDisabledError) } }, ) @@ -201,7 +201,7 @@ fun SecureBackupRootView( if (state.isKeyStorageEnabled) { onConfirmRecoveryKeyClick() } else { - state.eventSink.invoke(SecureBackupRootEvents.DisplayKeyStorageDisabledError) + state.eventSink.invoke(SecureBackupRootEvent.DisplayKeyStorageDisabledError) } }, ) @@ -212,13 +212,13 @@ fun SecureBackupRootView( async = state.enableAction, progressDialog = { }, onSuccess = { }, - onErrorDismiss = { state.eventSink.invoke(SecureBackupRootEvents.DismissDialog) } + onErrorDismiss = { state.eventSink.invoke(SecureBackupRootEvent.DismissDialog) } ) if (state.displayKeyStorageDisabledError) { ErrorDialog( title = null, content = stringResource(id = R.string.screen_chat_backup_key_storage_disabled_error), - onSubmit = { state.eventSink.invoke(SecureBackupRootEvents.DismissDialog) }, + onSubmit = { state.eventSink.invoke(SecureBackupRootEvent.DismissDialog) }, ) } } diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt index 63adfc789e..bbee28803e 100644 --- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt +++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootPresenterTest.kt @@ -66,7 +66,7 @@ class SecureBackupRootPresenterTest { val errorState = awaitItem() assertThat(errorState.doesBackupExistOnServer).isEqualTo(AsyncData.Failure(AN_EXCEPTION)) encryptionService.givenDoesBackupExistOnServerResult(Result.success(false)) - errorState.eventSink.invoke(SecureBackupRootEvents.RetryKeyBackupState) + errorState.eventSink.invoke(SecureBackupRootEvent.RetryKeyBackupState) val loadingState2 = awaitItem() assertThat(loadingState2.doesBackupExistOnServer).isInstanceOf(AsyncData.Loading::class.java) val finalState = awaitItem() @@ -82,9 +82,9 @@ class SecureBackupRootPresenterTest { }.test { skipItems(2) val initialState = awaitItem() - initialState.eventSink(SecureBackupRootEvents.DisplayKeyStorageDisabledError) + initialState.eventSink(SecureBackupRootEvent.DisplayKeyStorageDisabledError) assertThat(awaitItem().displayKeyStorageDisabledError).isTrue() - initialState.eventSink(SecureBackupRootEvents.DismissDialog) + initialState.eventSink(SecureBackupRootEvent.DismissDialog) assertThat(awaitItem().displayKeyStorageDisabledError).isFalse() } } @@ -97,7 +97,7 @@ class SecureBackupRootPresenterTest { }.test { skipItems(2) val initialState = awaitItem() - initialState.eventSink(SecureBackupRootEvents.EnableKeyStorage) + initialState.eventSink(SecureBackupRootEvent.EnableKeyStorage) assertThat(awaitItem().enableAction.isLoading()).isTrue() assertThat(awaitItem().enableAction.isSuccess()).isTrue() }