MESSENGER-2762 Initial Merge

2026-04-28 04:06:57 +02:00 · 2022-03-17 15:51:23 +01:00
parent ecae8d618f
commit c2108a2178
384 changed files with 17708 additions and 1928 deletions
@@ -1,5 +1,6 @@
 /*
 Copyright 2020 New Vector Ltd
+ Copyright (c) 2021 BWI GmbH
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -86,18 +87,21 @@ final class SecureBackupSetupIntroViewController: UIViewController {
    // MARK: - Private
    
    private func setupViews() {
-        let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
-            guard let self = self else {
-                return
-            }
-            self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: true)
-        }
-        self.navigationItem.rightBarButtonItem = cancelBarButtonItem
-        
        self.title = VectorL10n.secureKeyBackupSetupIntroTitle
-                
        self.informationLabel.text = VectorL10n.secureKeyBackupSetupIntroInfo
        
+        if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
+            if !session.homeserverWellknown.backupRequired() {
+                let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
+                    self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: true)
+                }
+                self.navigationItem.rightBarButtonItem = cancelBarButtonItem
+            }
+        }
+        
        self.secureKeyCell.fill(title: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyTitle,
                                information: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyInfo,
                                image: Asset.Images.secretsSetupKey.image)
@@ -119,6 +123,19 @@ final class SecureBackupSetupIntroViewController: UIViewController {
            }
            self.delegate?.secureBackupSetupIntroViewControllerDidTapUsePassphrase(self)
        }
+        
+        setupBackupMethods()
+    }
+    
+    private func setupBackupMethods() {
+        // Hide setup methods that are not listed
+        if !self.viewModel.wellKnown.isBackupMethodKeySupported() {
+            self.secureKeyCell.isHidden = true
+        }
+        
+        if !self.viewModel.wellKnown.isBackupMethodPassphraseSupported() {
+            self.securePassphraseCell.isHidden = true
+        }
    }
    
    private func renderLoading() {
@@ -172,27 +189,44 @@ final class SecureBackupSetupIntroViewController: UIViewController {
        // we need to get this private key first. Ask the user to make a key backup restore to catch it
        if keyBackup.keyBackupVersion != nil && keyBackup.hasPrivateKeyInCryptoStore == false {
            
-            let alertController = UIAlertController(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorTitle,
-                                                   message: VectorL10n.secureKeyBackupSetupExistingBackupErrorInfo,
-                                                   preferredStyle: .alert)
+            // don't show dialog if forced, already asked before in mandatory verification recover
+            if BuildSettings.forceResetBackupIfLost {
+                let alertController = UIAlertController(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorTitle,
+                                                       message: VectorL10n.secureKeyBackupSetupExistingBackupErrorInfo,
+                                                       preferredStyle: .alert)

-            let connectAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorUnlockIt, style: .default) { (_) in
-                self.delegate?.secureBackupSetupIntroViewControllerDidTapConnectToKeyBackup(self)
+                let connectAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorUnlockIt, style: .default) { (_) in
+                    self.delegate?.secureBackupSetupIntroViewControllerDidTapConnectToKeyBackup(self)
+                }
+                
+                let resetAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorDeleteIt, style: .destructive) { (_) in
+                        self.deleteKeybackup()
+                    }
+            } else {
+            
+                let alertContoller = UIAlertController(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorTitle,
+                                                       message: VectorL10n.secureKeyBackupSetupExistingBackupErrorInfo,
+                                                       preferredStyle: .alert)
+
+                let connectAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorUnlockIt, style: .default) { (_) in
+                    self.delegate?.secureBackupSetupIntroViewControllerDidTapConnectToKeyBackup(self)
+                }
+                
+                let resetAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorDeleteIt, style: .destructive) { (_) in
+                    self.deleteKeybackup()
+                }
+                
+                let cancelAction = UIAlertAction(title: VectorL10n.cancel, style: .cancel) { (_) in
+                    self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: false)
+                }
+                
+                alertContoller.addAction(connectAction)
+                alertContoller.addAction(resetAction)
+                alertContoller.addAction(cancelAction)
+                
+                self.present(alertContoller, animated: true)
+                
            }
-            
-            let resetAction = UIAlertAction(title: VectorL10n.secureKeyBackupSetupExistingBackupErrorDeleteIt, style: .destructive) { (_) in
-                self.deleteKeybackup()
-            }
-            
-            let cancelAction = UIAlertAction(title: VectorL10n.cancel, style: .cancel) { (_) in
-                self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: false)
-            }
-            
-            alertController.addAction(connectAction)
-            alertController.addAction(resetAction)
-            alertController.addAction(cancelAction)
-            
-            self.present(alertController, animated: true)
        }
    }
    
@@ -1,5 +1,6 @@
 // 
 // Copyright 2020 New Vector Ltd
+// Copyright (c) 2021 BWI GmbH
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -23,11 +24,13 @@ final class SecureBackupSetupIntroViewModel: SecureBackupSetupIntroViewModelType
    // TODO: Make these properties private
    let keyBackup: MXKeyBackup?
    let checkKeyBackup: Bool
+    let wellKnown: MXWellKnown
    
    // MARK: - Setup
    
-    init(keyBackup: MXKeyBackup?, checkKeyBackup: Bool) {
+    init(keyBackup: MXKeyBackup?, checkKeyBackup: Bool, wellKnown: MXWellKnown) {
        self.keyBackup = keyBackup
        self.checkKeyBackup = checkKeyBackup
+        self.wellKnown = wellKnown
    }    
 }
@@ -1,5 +1,6 @@
 // 
 // Copyright 2020 New Vector Ltd
+// Copyright (c) 2021 BWI GmbH
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,4 +23,5 @@ protocol SecureBackupSetupIntroViewModelType {
    // TODO: Hide these properties from interface and use same behavior as other view models
    var keyBackup: MXKeyBackup? { get }
    var checkKeyBackup: Bool { get }
+    var wellKnown: MXWellKnown { get }
 }
@@ -2,6 +2,7 @@
 // $ createRootCoordinator.sh KeyBackupSetup/SecureSetup SecureKeyBackupSetup
 /*
 Copyright 2020 New Vector Ltd
+ Copyright (c) 2021 BWI GmbH
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,27 +21,34 @@ import UIKit

@objcMembers
 final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType {
-    
+
    // MARK: - Properties
-    
+
    // MARK: Private
-    
+
    private let navigationRouter: NavigationRouterType
    private let session: MXSession
    private let recoveryService: MXRecoveryService
    private let keyBackup: MXKeyBackup?
    private let checkKeyBackup: Bool
+
+    private var isBackupSetupMethodKeySupported: Bool {
+        guard let homeserverWellknown = self.session.homeserverWellknown else {
+            return false
+        }
+        return homeserverWellknown.isBackupMethodKeySupported()
+    }
    private let allowOverwrite: Bool

    // MARK: Public

    // Must be used only internally
    var childCoordinators: [Coordinator] = []
-    
+
    weak var delegate: SecureBackupSetupCoordinatorDelegate?
-    
+
    // MARK: - Setup
-    
+
    /// Initializer
    /// - Parameters:
    ///   - session: The MXSession.
@@ -51,52 +59,65 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType {
        self.recoveryService = session.crypto.recoveryService
        self.keyBackup = session.crypto.backup
        self.checkKeyBackup = checkKeyBackup
+
        self.allowOverwrite = allowOverwrite
-        
+
        if let navigationRouter = navigationRouter {
            self.navigationRouter = navigationRouter
        } else {
            self.navigationRouter = NavigationRouter(navigationController: RiotNavigationController())
        }
    }
-    
+
    // MARK: - Public methods
-    
+
    func start() {
        let rootViewController = self.createIntro()
-        
+
        if self.navigationRouter.modules.isEmpty == false {
            self.navigationRouter.push(rootViewController, animated: true, popCompletion: nil)
        } else {
            self.navigationRouter.setRootModule(rootViewController)
        }
    }
-    
+
    func toPresentable() -> UIViewController {
-        return self.navigationRouter.toPresentable()
+        let controller = self.navigationRouter.toPresentable()
+
+        // If the flow is not cancellable, run it fullscreen
+        if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
+            if session.homeserverWellknown.backupRequired() {
+                if #available(iOS 13.0, *) {
+                    controller.modalPresentationStyle = .fullScreen
+                }
+            }
+        }
+
+        return controller
    }
-    
+
    // MARK: - Private methods

    private func createIntro() -> SecureBackupSetupIntroViewController {
        // TODO: Use a coordinator
-        let viewModel = SecureBackupSetupIntroViewModel(keyBackup: self.keyBackup, checkKeyBackup: self.checkKeyBackup)
+        let viewModel = SecureBackupSetupIntroViewModel(keyBackup: self.keyBackup, checkKeyBackup: self.checkKeyBackup, wellKnown: self.session.homeserverWellknown)
        let introViewController = SecureBackupSetupIntroViewController.instantiate(with: viewModel)
        introViewController.delegate = self
        return introViewController
    }
-    
+
    private func showSetupKey(passphraseOnly: Bool, passphrase: String? = nil) {
+
        let coordinator = SecretsSetupRecoveryKeyCoordinator(recoveryService: self.recoveryService, passphrase: passphrase, passphraseOnly: passphraseOnly, allowOverwrite: allowOverwrite)
        coordinator.delegate = self
        coordinator.start()
-        
+
        self.add(childCoordinator: coordinator)
        self.navigationRouter.push(coordinator, animated: true) { [weak self] in
            self?.remove(childCoordinator: coordinator)
        }
    }
-    
+
    private func showSetupPassphrase() {
        let coordinator = SecretsSetupRecoveryPassphraseCoordinator(passphraseInput: .new)
        coordinator.delegate = self
@@ -197,15 +218,17 @@ extension SecureBackupSetupCoordinator: SecretsSetupRecoveryKeyCoordinatorDelega

 // MARK: - SecretsSetupRecoveryPassphraseCoordinatorDelegate
 extension SecureBackupSetupCoordinator: SecretsSetupRecoveryPassphraseCoordinatorDelegate {
-    
+
    func secretsSetupRecoveryPassphraseCoordinator(_ coordinator: SecretsSetupRecoveryPassphraseCoordinatorType, didEnterNewPassphrase passphrase: String) {
        self.showSetupPassphraseConfirmation(with: passphrase)
    }
-    
+
    func secretsSetupRecoveryPassphraseCoordinator(_ coordinator: SecretsSetupRecoveryPassphraseCoordinatorType, didConfirmPassphrase passphrase: String) {
-        self.showSetupKey(passphraseOnly: false, passphrase: passphrase)        
+
+        // Do not present recovery key export screen if secure backup setup key method is not supported
+        self.showSetupKey(passphraseOnly: !self.isBackupSetupMethodKeySupported, passphrase: passphrase)
    }
-    
+
    func secretsSetupRecoveryPassphraseCoordinatorDidCancel(_ coordinator: SecretsSetupRecoveryPassphraseCoordinatorType) {
        self.didCancel()
    }