From e8e2e95e022c7ab995feb892f69f0f29734b6416 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 5 Dec 2023 17:40:47 +0100 Subject: [PATCH] Follow SDK method renaming: fix_recovery_issues() got renamed to recover() --- .../enter/SecureBackupEnterRecoveryKeyPresenter.kt | 2 +- .../enter/SecureBackupEnterRecoveryKeyPresenterTest.kt | 4 ++-- .../matrix/api/encryption/EncryptionService.kt | 4 ++-- .../matrix/impl/encryption/RustEncryptionService.kt | 2 +- .../matrix/test/encryption/FakeEncryptionService.kt | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt index bec4dd9217..9207dbef79 100644 --- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt +++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenter.kt @@ -89,7 +89,7 @@ class SecureBackupEnterRecoveryKeyPresenter @Inject constructor( action: MutableState> ) = launch { suspend { - encryptionService.fixRecoveryIssues(recoveryKey).getOrThrow() + encryptionService.recover(recoveryKey).getOrThrow() }.runCatchingUpdatingState(action) } } diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt index d34f869f6e..862cbbde72 100644 --- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt +++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyPresenterTest.kt @@ -73,7 +73,7 @@ class SecureBackupEnterRecoveryKeyPresenterTest { inProgress = false, ) ) - encryptionService.givenFixRecoveryIssuesFailure(AN_EXCEPTION) + encryptionService.givenRecoverFailure(AN_EXCEPTION) withRecoveryKeyState.eventSink(SecureBackupEnterRecoveryKeyEvents.Submit) val loadingState = awaitItem() assertThat(loadingState.submitAction).isEqualTo(Async.Loading()) @@ -85,7 +85,7 @@ class SecureBackupEnterRecoveryKeyPresenterTest { val clearedState = awaitItem() assertThat(clearedState.submitAction).isEqualTo(Async.Uninitialized) assertThat(clearedState.isSubmitEnabled).isTrue() - encryptionService.givenFixRecoveryIssuesFailure(null) + encryptionService.givenRecoverFailure(null) clearedState.eventSink(SecureBackupEnterRecoveryKeyEvents.Submit) val loadingState2 = awaitItem() assertThat(loadingState2.submitAction).isEqualTo(Async.Loading()) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt index 534f5b68e2..522445b6c2 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/EncryptionService.kt @@ -43,9 +43,9 @@ interface EncryptionService { suspend fun doesBackupExistOnServer(): Result /** - * Note: accept bot recoveryKey and passphrase. + * Note: accept both recoveryKey and passphrase. */ - suspend fun fixRecoveryIssues(recoveryKey: String): Result + suspend fun recover(recoveryKey: String): Result /** * Wait for backup upload steady state. diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt index 10929f0494..c3f1f8e52e 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt @@ -179,7 +179,7 @@ internal class RustEncryptionService( } } - override suspend fun fixRecoveryIssues(recoveryKey: String): Result = withContext(dispatchers.io) { + override suspend fun recover(recoveryKey: String): Result = withContext(dispatchers.io) { runCatching { service.recover(recoveryKey) } diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt index f8a2d411fe..44b9d734a5 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/encryption/FakeEncryptionService.kt @@ -33,7 +33,7 @@ class FakeEncryptionService : EncryptionService { override val enableRecoveryProgressStateFlow: MutableStateFlow = MutableStateFlow(EnableRecoveryProgress.Starting) private var waitForBackupUploadSteadyStateFlow: Flow = flowOf() - private var fixRecoveryIssuesFailure: Exception? = null + private var recoverFailure: Exception? = null private var doesBackupExistOnServerResult: Result = Result.success(true) override suspend fun enableBackups(): Result = simulateLongTask { @@ -44,8 +44,8 @@ class FakeEncryptionService : EncryptionService { disableRecoveryFailure = exception } - fun givenFixRecoveryIssuesFailure(exception: Exception?) { - fixRecoveryIssuesFailure = exception + fun givenRecoverFailure(exception: Exception?) { + recoverFailure = exception } override suspend fun disableRecovery(): Result = simulateLongTask { @@ -61,8 +61,8 @@ class FakeEncryptionService : EncryptionService { return doesBackupExistOnServerResult } - override suspend fun fixRecoveryIssues(recoveryKey: String): Result = simulateLongTask { - fixRecoveryIssuesFailure?.let { return Result.failure(it) } + override suspend fun recover(recoveryKey: String): Result = simulateLongTask { + recoverFailure?.let { return Result.failure(it) } return Result.success(Unit) }