From 55a105572a8cdaf1d56f6c0acdf36f1fb7728e83 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 19 Feb 2024 17:23:35 +0100 Subject: [PATCH] Rename `isLastSession` to `isLastDevice`, to match SDK naming. --- .../features/logout/impl/LogoutPresenter.kt | 6 +++--- .../android/features/logout/impl/LogoutState.kt | 2 +- .../features/logout/impl/LogoutStateProvider.kt | 14 +++++++------- .../android/features/logout/impl/LogoutView.kt | 6 +++--- .../impl/direct/DefaultDirectLogoutPresenter.kt | 6 +++--- .../features/logout/impl/LogoutPresenterTest.kt | 6 +++--- .../android/features/logout/impl/LogoutViewTest.kt | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt index ed735f6afe..f56a24cef5 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt @@ -66,9 +66,9 @@ class LogoutPresenter @Inject constructor( } .collectAsState(initial = BackupUploadState.Unknown) - var isLastSession by remember { mutableStateOf(false) } + var isLastDevice by remember { mutableStateOf(false) } LaunchedEffect(Unit) { - isLastSession = encryptionService.isLastDevice().getOrNull() ?: false + isLastDevice = encryptionService.isLastDevice().getOrNull() ?: false } val backupState by encryptionService.backupStateStateFlow.collectAsState() @@ -100,7 +100,7 @@ class LogoutPresenter @Inject constructor( } return LogoutState( - isLastSession = isLastSession, + isLastDevice = isLastDevice, backupState = backupState, doesBackupExistOnServer = doesBackupExistOnServerAction.value.dataOrNull().orTrue(), recoveryState = recoveryState, diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt index 6da9df8e72..4b0121d052 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutState.kt @@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.encryption.BackupUploadState import io.element.android.libraries.matrix.api.encryption.RecoveryState data class LogoutState( - val isLastSession: Boolean, + val isLastDevice: Boolean, val backupState: BackupState, val doesBackupExistOnServer: Boolean, val recoveryState: RecoveryState, diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt index f1b11f61e9..dc563daa33 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt @@ -27,22 +27,22 @@ open class LogoutStateProvider : PreviewParameterProvider { override val values: Sequence get() = sequenceOf( aLogoutState(), - aLogoutState(isLastSession = true), - aLogoutState(isLastSession = false, backupUploadState = BackupUploadState.Uploading(66, 200)), - aLogoutState(isLastSession = true, backupUploadState = BackupUploadState.Done), + aLogoutState(isLastDevice = true), + aLogoutState(isLastDevice = false, backupUploadState = BackupUploadState.Uploading(66, 200)), + aLogoutState(isLastDevice = true, backupUploadState = BackupUploadState.Done), aLogoutState(logoutAction = AsyncAction.Confirming), aLogoutState(logoutAction = AsyncAction.Loading), aLogoutState(logoutAction = AsyncAction.Failure(Exception("Failed to logout"))), aLogoutState(backupUploadState = BackupUploadState.SteadyException(SteadyStateException.Connection("No network"))), // Last session no recovery - aLogoutState(isLastSession = true, recoveryState = RecoveryState.DISABLED), + aLogoutState(isLastDevice = true, recoveryState = RecoveryState.DISABLED), // Last session no backup - aLogoutState(isLastSession = true, backupState = BackupState.UNKNOWN, doesBackupExistOnServer = false), + aLogoutState(isLastDevice = true, backupState = BackupState.UNKNOWN, doesBackupExistOnServer = false), ) } fun aLogoutState( - isLastSession: Boolean = false, + isLastDevice: Boolean = false, backupState: BackupState = BackupState.ENABLED, doesBackupExistOnServer: Boolean = true, recoveryState: RecoveryState = RecoveryState.ENABLED, @@ -50,7 +50,7 @@ fun aLogoutState( logoutAction: AsyncAction = AsyncAction.Uninitialized, eventSink: (LogoutEvents) -> Unit = {}, ) = LogoutState( - isLastSession = isLastSession, + isLastDevice = isLastDevice, backupState = backupState, doesBackupExistOnServer = doesBackupExistOnServer, recoveryState = recoveryState, diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt index 90168c09dd..19160236ac 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt @@ -97,7 +97,7 @@ fun LogoutView( private fun title(state: LogoutState): String { return when { state.backupUploadState.isBackingUp() -> stringResource(id = R.string.screen_signout_key_backup_ongoing_title) - state.isLastSession -> { + state.isLastDevice -> { if (state.recoveryState != RecoveryState.ENABLED) { stringResource(id = R.string.screen_signout_recovery_disabled_title) } else if (state.backupState == BackupState.UNKNOWN && state.doesBackupExistOnServer.not()) { @@ -116,7 +116,7 @@ private fun subtitle(state: LogoutState): String? { (state.backupUploadState as? BackupUploadState.SteadyException)?.exception is SteadyStateException.Connection -> stringResource(id = R.string.screen_signout_key_backup_offline_subtitle) state.backupUploadState.isBackingUp() -> stringResource(id = R.string.screen_signout_key_backup_ongoing_subtitle) - state.isLastSession -> stringResource(id = R.string.screen_signout_key_backup_disabled_subtitle) + state.isLastDevice -> stringResource(id = R.string.screen_signout_key_backup_disabled_subtitle) else -> null } } @@ -128,7 +128,7 @@ private fun ColumnScope.Buttons( onChangeRecoveryKeyClicked: () -> Unit, ) { val logoutAction = state.logoutAction - if (state.isLastSession) { + if (state.isLastDevice) { OutlinedButton( text = stringResource(id = CommonStrings.common_settings), modifier = Modifier.fillMaxWidth(), diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutPresenter.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutPresenter.kt index 8ee46b63ac..d9a6e7e94c 100644 --- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutPresenter.kt +++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutPresenter.kt @@ -70,9 +70,9 @@ class DefaultDirectLogoutPresenter @Inject constructor( } .collectAsState(initial = BackupUploadState.Unknown) - var isLastSession by remember { mutableStateOf(false) } + var isLastDevice by remember { mutableStateOf(false) } LaunchedEffect(Unit) { - isLastSession = encryptionService.isLastDevice().getOrNull() ?: false + isLastDevice = encryptionService.isLastDevice().getOrNull() ?: false } fun handleEvents(event: DirectLogoutEvents) { @@ -91,7 +91,7 @@ class DefaultDirectLogoutPresenter @Inject constructor( } return DirectLogoutState( - canDoDirectSignOut = !isLastSession && + canDoDirectSignOut = !isLastDevice && !backupUploadState.isBackingUp(), logoutAction = logoutAction.value, eventSink = ::handleEvents diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt index 83b7799c3a..8fab9f3e01 100644 --- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt +++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt @@ -50,7 +50,7 @@ class LogoutPresenterTest { presenter.present() }.test { val initialState = awaitFirstItem() - assertThat(initialState.isLastSession).isFalse() + assertThat(initialState.isLastDevice).isFalse() assertThat(initialState.backupState).isEqualTo(BackupState.UNKNOWN) assertThat(initialState.doesBackupExistOnServer).isTrue() assertThat(initialState.recoveryState).isEqualTo(RecoveryState.UNKNOWN) @@ -71,7 +71,7 @@ class LogoutPresenterTest { }.test { skipItems(3) val initialState = awaitItem() - assertThat(initialState.isLastSession).isTrue() + assertThat(initialState.isLastDevice).isTrue() assertThat(initialState.backupUploadState).isEqualTo(BackupUploadState.Unknown) assertThat(initialState.logoutAction).isEqualTo(AsyncAction.Uninitialized) } @@ -96,7 +96,7 @@ class LogoutPresenterTest { presenter.present() }.test { val initialState = awaitItem() - assertThat(initialState.isLastSession).isFalse() + assertThat(initialState.isLastDevice).isFalse() assertThat(initialState.backupUploadState).isEqualTo(BackupUploadState.Unknown) assertThat(initialState.logoutAction).isEqualTo(AsyncAction.Uninitialized) skipItems(1) diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt index 697da3cad5..78cc65b117 100644 --- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt +++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt @@ -153,7 +153,7 @@ class LogoutViewTest { rule.setContent { LogoutView( aLogoutState( - isLastSession = true, + isLastDevice = true, eventSink = eventsRecorder ), onChangeRecoveryKeyClicked = callback,