From afa1a42d92bcb951cc2eca2db2a2f9f81b3d0627 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 16 Mar 2026 17:21:19 +0100 Subject: [PATCH] canEnterRecoveryKey -> canUseRecoveryKey --- .../ChooseSelfVerificationModePresenter.kt | 8 ++++---- .../choosemode/ChooseSelfVerificationModeState.kt | 2 +- .../ChooseSelfVerificationModeStateProvider.kt | 12 ++++++------ .../choosemode/ChooseSelfVerificationModeView.kt | 2 +- .../ChooseSessionVerificationModePresenterTest.kt | 8 ++++---- .../ChooseSessionVerificationModeViewTest.kt | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt index ace890be9c..06d3dbf392 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt @@ -30,7 +30,7 @@ class ChooseSelfVerificationModePresenter( @Composable override fun present(): ChooseSelfVerificationModeState { val hasDevicesToVerifyAgainst by encryptionService.hasDevicesToVerifyAgainst.collectAsState() - val canEnterRecoveryKey by encryptionService.recoveryStateStateFlow + val canUseRecoveryKey by encryptionService.recoveryStateStateFlow .mapState { recoveryState -> when (recoveryState) { RecoveryState.WAITING_FOR_SYNC, @@ -44,14 +44,14 @@ class ChooseSelfVerificationModePresenter( val buttonsState by remember { derivedStateOf { val canUseAnotherDevice = hasDevicesToVerifyAgainst.dataOrNull() - val canEnterRecoveryKey = canEnterRecoveryKey.dataOrNull() - if (canUseAnotherDevice == null || canEnterRecoveryKey == null) { + val canUseRecoveryKey = canUseRecoveryKey.dataOrNull() + if (canUseAnotherDevice == null || canUseRecoveryKey == null) { AsyncData.Loading() } else { AsyncData.Success( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = canUseAnotherDevice, - canEnterRecoveryKey = canEnterRecoveryKey, + canUseRecoveryKey = canUseRecoveryKey, ) ) } diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt index 4e27043f40..0512636fca 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeState.kt @@ -18,6 +18,6 @@ data class ChooseSelfVerificationModeState( ) { data class ButtonsState( val canUseAnotherDevice: Boolean, - val canEnterRecoveryKey: Boolean, + val canUseRecoveryKey: Boolean, ) } diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt index 676c77211f..b35a9624b9 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeStateProvider.kt @@ -17,22 +17,22 @@ class ChooseSelfVerificationModeStateProvider : override val values = sequenceOf( aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = true), + aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = true), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = false, canEnterRecoveryKey = false), + aButtonsState(canUseAnotherDevice = false, canUseRecoveryKey = false), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = true), + aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = true), ), ), aChooseSelfVerificationModeState( buttonsState = AsyncData.Success( - aButtonsState(canUseAnotherDevice = true, canEnterRecoveryKey = false), + aButtonsState(canUseAnotherDevice = true, canUseRecoveryKey = false), ), ), aChooseSelfVerificationModeState( @@ -51,8 +51,8 @@ fun aChooseSelfVerificationModeState( fun aButtonsState( canUseAnotherDevice: Boolean = true, - canEnterRecoveryKey: Boolean = true, + canUseRecoveryKey: Boolean = true, ) = ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = canUseAnotherDevice, - canEnterRecoveryKey = canEnterRecoveryKey, + canUseRecoveryKey = canUseRecoveryKey, ) diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt index fda693ca93..0ca25c9455 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeView.kt @@ -122,7 +122,7 @@ private fun ChooseSelfVerificationModeButtons( onClick = onUseAnotherDevice, ) } - if (state.buttonsState.data.canEnterRecoveryKey) { + if (state.buttonsState.data.canUseRecoveryKey) { Button( modifier = Modifier.fillMaxWidth(), text = stringResource(R.string.screen_identity_confirmation_use_recovery_key), diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt index c95c455bfd..697c51f776 100644 --- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt +++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModePresenterTest.kt @@ -47,7 +47,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -66,7 +66,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -85,7 +85,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = true, - canEnterRecoveryKey = false, + canUseRecoveryKey = false, ) ) } @@ -104,7 +104,7 @@ class ChooseSessionVerificationModePresenterTest { assertThat(awaitItem().buttonsState.dataOrNull()).isEqualTo( ChooseSelfVerificationModeState.ButtonsState( canUseAnotherDevice = false, - canEnterRecoveryKey = true, + canUseRecoveryKey = true, ) ) } diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt index 5d45950594..521bf91b37 100644 --- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt +++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSessionVerificationModeViewTest.kt @@ -57,7 +57,7 @@ class ChooseSessionVerificationModeViewTest { fun `clicking on enter recovery key calls the callback`() { ensureCalledOnce { callback -> rule.setChooseSelfVerificationModeView( - aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canEnterRecoveryKey = true))), + aChooseSelfVerificationModeState(AsyncData.Success(aButtonsState(canUseRecoveryKey = true))), onEnterRecoveryKey = callback, ) rule.clickOn(R.string.screen_identity_confirmation_use_recovery_key)