felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 01:22:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Security settings: Add an option to reset the secure backup

Browse Source 
It will overwrite the existing one if any
This commit is contained in:
manuroe
2021-06-16 09:53:31 +02:00
parent e61d258b74
commit 3dcb250200
13 changed files with 77 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift
+4 -2
View File
@@ -30,6 +30,7 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType {
private let recoveryService: MXRecoveryService
private let keyBackup: MXKeyBackup?
private let checkKeyBackup: Bool
private let allowOverwrite: Bool
// MARK: Public
@@ -45,11 +46,12 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType {
/// - session: The MXSession.
/// - checkKeyBackup: Indicate false to ignore existing key backup.
/// - navigationRouter: Use existing navigation router to plug this flow or let nil to use new one.
init(session: MXSession, checkKeyBackup: Bool = true, navigationRouter: NavigationRouterType? = nil) {
init(session: MXSession, checkKeyBackup: Bool = true, allowOverwrite: Bool = false, navigationRouter: NavigationRouterType? = nil) {
self.session = session
self.recoveryService = session.crypto.recoveryService
self.keyBackup = session.crypto.backup
self.checkKeyBackup = checkKeyBackup
self.allowOverwrite = allowOverwrite
if let navigationRouter = navigationRouter {
self.navigationRouter = navigationRouter
@@ -85,7 +87,7 @@ final class SecureBackupSetupCoordinator: SecureBackupSetupCoordinatorType {
}
private func showSetupKey(passphraseOnly: Bool, passphrase: String? = nil) {
let coordinator = SecretsSetupRecoveryKeyCoordinator(recoveryService: self.recoveryService, passphrase: passphrase, passphraseOnly: passphraseOnly)
let coordinator = SecretsSetupRecoveryKeyCoordinator(recoveryService: self.recoveryService, passphrase: passphrase, passphraseOnly: passphraseOnly, allowOverwrite: allowOverwrite)
coordinator.delegate = self
coordinator.start()
Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinatorBridgePresenter.swift
+5 -3
View File
@@ -33,6 +33,7 @@ final class SecureBackupSetupCoordinatorBridgePresenter: NSObject {
// MARK: Private
private let session: MXSession
private let allowOverwrite: Bool
private var coordinator: SecureBackupSetupCoordinator?
// MARK: Public
@@ -40,9 +41,10 @@ final class SecureBackupSetupCoordinatorBridgePresenter: NSObject {
weak var delegate: SecureBackupSetupCoordinatorBridgePresenterDelegate?
// MARK: - Setup
init(session: MXSession) {
init(session: MXSession, allowOverwrite: Bool) {
self.session = session
self.allowOverwrite = allowOverwrite
super.init()
}
@@ -54,7 +56,7 @@ final class SecureBackupSetupCoordinatorBridgePresenter: NSObject {
// }
func present(from viewController: UIViewController, animated: Bool) {
let secureBackupSetupCoordinator = SecureBackupSetupCoordinator(session: self.session)
let secureBackupSetupCoordinator = SecureBackupSetupCoordinator(session: self.session, allowOverwrite: self.allowOverwrite)
secureBackupSetupCoordinator.delegate = self
viewController.present(secureBackupSetupCoordinator.toPresentable(), animated: animated, completion: nil)
secureBackupSetupCoordinator.start()