Merge pull request #1961 from vector-im/feature/bma/keyBackupIteration

Key backup iteration

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<Boolean>
 
     /**
-     * Note: accept bot recoveryKey and passphrase.
+     * Note: accept both recoveryKey and passphrase.
      */
-    suspend fun fixRecoveryIssues(recoveryKey: String): Result<Unit>
+    suspend fun recover(recoveryKey: String): Result<Unit>
 
     /**
      * Wait for backup upload steady state.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/RecoveryException.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.api.encryption
+
+import io.element.android.libraries.matrix.api.exception.ClientException
+
+sealed class RecoveryException(message: String) : Exception(message) {
+    class SecretStorage(message: String) : RecoveryException(message)
+    data object BackupExistsOnServer : RecoveryException("BackupExistsOnServer")
+    data class Client(val exception: ClientException) : RecoveryException(exception.message ?: "Unknown error")
+}