Security settings: Improve the SECURE BACKUP section

CHANGES.rst

@@ -10,6 +10,9 @@ Changes to be released in next version
  * Integrated FLEX for debug builds.
  * VoIP: Add dial pad for PSTN capable servers to menu on homescreen.
  * VoIP: Replace call bar with PiP tiles for every type of calls.
+ * Security settings: Display the cross-signing section (#4430).
+ * Security settings: The Secure backup section has been updated to match element-web UX (#4430).
+ * Wording: Replace Recovery Passphrase and Recovery Key by Security Phrase and Security Key (#4268).
 
 🐛 Bugfix
  * StartChatViewController: Add more helpful message when trying to start DM with a user that does not exist (#224).

Riot/Generated/Storyboards.swift

@@ -97,6 +97,11 @@ internal enum StoryboardScene {
 
     internal static let initialScene = InitialSceneType<Riot.KeyBackupSetupSuccessFromRecoveryKeyViewController>(storyboard: KeyBackupSetupSuccessFromRecoveryKeyViewController.self)
   }
+  internal enum KeyBackupSetupSuccessFromSecureBackupViewController: StoryboardType {
+    internal static let storyboardName = "KeyBackupSetupSuccessFromSecureBackupViewController"
+
+    internal static let initialScene = InitialSceneType<Riot.KeyBackupSetupSuccessFromSecureBackupViewController>(storyboard: KeyBackupSetupSuccessFromSecureBackupViewController.self)
+  }
   internal enum KeyVerificationDataLoadingViewController: StoryboardType {
     internal static let storyboardName = "KeyVerificationDataLoadingViewController"
 

Riot/Modules/Home/HomeViewController.m

@@ -167,7 +167,7 @@ - (CrossSigningSetupBannerCell *)keyVerificationSetupBannerPrototypeCell
 
 - (void)presentSecureBackupSetup
 {
-    SecureBackupSetupCoordinatorBridgePresenter *keyBackupSetupCoordinatorBridgePresenter = [[SecureBackupSetupCoordinatorBridgePresenter alloc] initWithSession:self.mainSession];
+    SecureBackupSetupCoordinatorBridgePresenter *keyBackupSetupCoordinatorBridgePresenter = [[SecureBackupSetupCoordinatorBridgePresenter alloc] initWithSession:self.mainSession allowOverwrite:NO];
     keyBackupSetupCoordinatorBridgePresenter.delegate = self;
 
     [keyBackupSetupCoordinatorBridgePresenter presentFrom:self animated:YES];

Riot/Modules/KeyBackup/Setup/KeyBackupSetupCoordinator.swift

@@ -44,11 +44,11 @@ final class KeyBackupSetupCoordinator: KeyBackupSetupCoordinatorType {
     // MARK: - Public methods
 
     func start() {
-
-        // Set key backup setup intro as root controller
-        let keyBackupSetupIntroViewController = self.createSetupIntroViewController()
-        keyBackupSetupIntroViewController.delegate = self
-        self.navigationRouter.setRootModule(keyBackupSetupIntroViewController)
+        if self.session.crypto.recoveryService.hasRecovery() {
+            showUnlockSecureBackup()
+        } else {
+            showSetupIntro()
+        }
     }
 
     func toPresentable() -> UIViewController {
@@ -57,6 +57,13 @@ final class KeyBackupSetupCoordinator: KeyBackupSetupCoordinatorType {
 
     // MARK: - Private methods
 
+    private func showSetupIntro() {
+        // Set key backup setup intro as root controller
+        let keyBackupSetupIntroViewController = self.createSetupIntroViewController()
+        keyBackupSetupIntroViewController.delegate = self
+        self.navigationRouter.setRootModule(keyBackupSetupIntroViewController)
+    }
+
     private func createSetupIntroViewController() -> KeyBackupSetupIntroViewController {
 
         let backupState = self.session.crypto.backup?.state ?? MXKeyBackupStateUnknown
@@ -80,6 +87,17 @@ final class KeyBackupSetupCoordinator: KeyBackupSetupCoordinatorType {
         return KeyBackupSetupIntroViewController.instantiate(isABackupAlreadyExists: isABackupAlreadyExists, encryptionKeysExportPresenter: encryptionKeysExportPresenter)
     }
 
+    private func showUnlockSecureBackup() {
+        let recoveryGoal: SecretsRecoveryGoal = .unlockSecureBackup { (privateKey, completion) in
+            self.createKeyBackupUsingSecureBackup(privateKey: privateKey, completion: completion)
+        }
+
+        let coordinator = SecretsRecoveryCoordinator(session: self.session, recoveryMode: .passphraseOrKey, recoveryGoal: recoveryGoal, navigationRouter: self.navigationRouter)
+        coordinator.delegate = self
+        coordinator.start()
+        self.add(childCoordinator: coordinator)
+    }
+
     private func showSetupPassphrase(animated: Bool) {
         let keyBackupSetupPassphraseCoordinator = KeyBackupSetupPassphraseCoordinator(session: self.session)
         keyBackupSetupPassphraseCoordinator.delegate = self
@@ -104,6 +122,33 @@ final class KeyBackupSetupCoordinator: KeyBackupSetupCoordinatorType {
         viewController.delegate = self
         self.navigationRouter.push(viewController, animated: animated, popCompletion: nil)
     }
+
+    private func showSetupWithSecureBackupSuccess(animated: Bool) {
+        let viewController = KeyBackupSetupSuccessFromSecureBackupViewController.instantiate()
+        viewController.delegate = self
+        self.navigationRouter.push(viewController, animated: animated, popCompletion: nil)
+    }
+
+    private func createKeyBackupUsingSecureBackup(privateKey: Data, completion: @escaping (Result<Void, Error>) -> Void) {
+        guard let keyBackup = session.crypto.backup, let recoveryService = session.crypto.recoveryService else {
+            return
+        }
+
+        keyBackup.prepareKeyBackupVersion(withPassword: nil, success: { megolmBackupCreationInfo in
+            keyBackup.createKeyBackupVersion(megolmBackupCreationInfo, success: { _ in
+                recoveryService.updateRecovery(forSecrets: [MXSecretId.keyBackup.takeUnretainedValue() as String], withPrivateKey: privateKey) {
+                    completion(.success(Void()))
+                } failure: { error in
+                    completion(.failure(error))
+                }
+
+            }, failure: { error in
+                completion(.failure(error))
+            })
+        }, failure: { error in
+            completion(.failure(error))
+        })
+    }
 }
 
 // MARK: - KeyBackupSetupIntroViewControllerDelegate
@@ -133,6 +178,17 @@ extension KeyBackupSetupCoordinator: KeyBackupSetupPassphraseCoordinatorDelegate
     }
 }
 
+// MARK: - SecretsRecoveryCoordinatorDelegate
+extension KeyBackupSetupCoordinator: SecretsRecoveryCoordinatorDelegate {
+    func secretsRecoveryCoordinatorDidRecover(_ coordinator: SecretsRecoveryCoordinatorType) {
+        self.showSetupWithSecureBackupSuccess(animated: true)
+    }
+
+    func secretsRecoveryCoordinatorDidCancel(_ coordinator: SecretsRecoveryCoordinatorType) {
+        self.delegate?.keyBackupSetupCoordinatorDidCancel(self)
+    }
+}
+
 // MARK: - KeyBackupSetupSuccessFromPassphraseViewControllerDelegate
 extension KeyBackupSetupCoordinator: KeyBackupSetupSuccessFromPassphraseViewControllerDelegate {
     func keyBackupSetupSuccessFromPassphraseViewControllerDidTapDoneAction(_ viewController: KeyBackupSetupSuccessFromPassphraseViewController) {
@@ -146,3 +202,10 @@ extension KeyBackupSetupCoordinator: KeyBackupSetupSuccessFromRecoveryKeyViewCon
         self.delegate?.keyBackupSetupCoordinatorDidSetupRecoveryKey(self)
     }
 }
+
+// MARK: - KeyBackupSetupSuccessFromSecureBackupViewControllerDelegate
+extension KeyBackupSetupCoordinator: KeyBackupSetupSuccessFromSecureBackupViewControllerDelegate {
+    func keyBackupSetupSuccessFromSecureBackupViewControllerDidTapDoneAction(_ viewController: KeyBackupSetupSuccessFromSecureBackupViewController) {
+        self.delegate?.keyBackupSetupCoordinatorDidSetupRecoveryKey(self)
+    }
+}