mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-22 01:22:46 +02:00
b298dedc22
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
197 lines
7.8 KiB
Swift
197 lines
7.8 KiB
Swift
/*
|
|
Copyright 2020-2024 New Vector Ltd.
|
|
Copyright (c) 2021 BWI GmbH
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import Foundation
|
|
|
|
final class SecretsRecoveryCoordinator: SecretsRecoveryCoordinatorType {
|
|
|
|
// MARK: - Properties
|
|
|
|
// MARK: Private
|
|
|
|
private let session: MXSession
|
|
private let navigationRouter: NavigationRouterType
|
|
private let recoveryMode: SecretsRecoveryMode
|
|
private let recoveryGoal: SecretsRecoveryGoal
|
|
private let cancellable: Bool
|
|
|
|
// MARK: Public
|
|
|
|
var childCoordinators: [Coordinator] = []
|
|
|
|
weak var delegate: SecretsRecoveryCoordinatorDelegate?
|
|
|
|
// MARK: - Setup
|
|
|
|
init(session: MXSession, recoveryMode: SecretsRecoveryMode, recoveryGoal: SecretsRecoveryGoal, navigationRouter: NavigationRouterType? = nil, cancellable: Bool) {
|
|
self.session = session
|
|
self.recoveryMode = recoveryMode
|
|
self.recoveryGoal = recoveryGoal
|
|
self.cancellable = cancellable
|
|
|
|
if let navigationRouter = navigationRouter {
|
|
self.navigationRouter = navigationRouter
|
|
} else {
|
|
self.navigationRouter = NavigationRouter(navigationController: RiotNavigationController())
|
|
}
|
|
}
|
|
|
|
// MARK: - Public
|
|
|
|
func start() {
|
|
|
|
let rootCoordinator: Coordinator & Presentable
|
|
|
|
switch self.recoveryMode {
|
|
case .onlyKey:
|
|
rootCoordinator = self.createRecoverFromKeyCoordinator()
|
|
case .passphraseOrKey:
|
|
rootCoordinator = self.createRecoverFromPassphraseCoordinator()
|
|
}
|
|
|
|
rootCoordinator.start()
|
|
|
|
self.add(childCoordinator: rootCoordinator)
|
|
|
|
if self.navigationRouter.modules.isEmpty == false {
|
|
self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
|
|
self?.remove(childCoordinator: rootCoordinator)
|
|
})
|
|
} else {
|
|
self.navigationRouter.setRootModule(rootCoordinator) { [weak self] in
|
|
self?.remove(childCoordinator: rootCoordinator)
|
|
}
|
|
}
|
|
}
|
|
|
|
func toPresentable() -> UIViewController {
|
|
return self.navigationRouter
|
|
.toPresentable()
|
|
.vc_setModalFullScreen(!self.cancellable)
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private var dehydrationService: DehydrationService? {
|
|
if self.session.vc_homeserverConfiguration().encryption.deviceDehydrationEnabled {
|
|
return self.session.crypto.dehydrationService
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
private func createRecoverFromKeyCoordinator() -> SecretsRecoveryWithKeyCoordinator {
|
|
let coordinator = SecretsRecoveryWithKeyCoordinator(recoveryService: self.session.crypto.recoveryService,
|
|
recoveryGoal: self.recoveryGoal,
|
|
cancellable: self.cancellable,
|
|
dehydrationService: dehydrationService)
|
|
coordinator.delegate = self
|
|
return coordinator
|
|
}
|
|
|
|
private func createRecoverFromPassphraseCoordinator() -> SecretsRecoveryWithPassphraseCoordinator {
|
|
let coordinator = SecretsRecoveryWithPassphraseCoordinator(recoveryService: self.session.crypto.recoveryService,
|
|
recoveryGoal: self.recoveryGoal,
|
|
cancellable: self.cancellable,
|
|
dehydrationService: dehydrationService)
|
|
coordinator.delegate = self
|
|
return coordinator
|
|
}
|
|
|
|
private func showRecoverFromKeyCoordinator() {
|
|
let coordinator = self.createRecoverFromKeyCoordinator()
|
|
coordinator.start()
|
|
|
|
self.navigationRouter.push(coordinator.toPresentable(), animated: true, popCompletion: { [weak self] in
|
|
self?.remove(childCoordinator: coordinator)
|
|
})
|
|
self.add(childCoordinator: coordinator)
|
|
}
|
|
|
|
private func showResetSecrets() {
|
|
let coordinator = SecretsResetCoordinator(session: self.session)
|
|
coordinator.delegate = self
|
|
coordinator.start()
|
|
|
|
self.navigationRouter.push(coordinator.toPresentable(), animated: true, popCompletion: { [weak self] in
|
|
self?.remove(childCoordinator: coordinator)
|
|
})
|
|
self.add(childCoordinator: coordinator)
|
|
}
|
|
|
|
private func showSecureBackupSetup(checkKeyBackup: Bool) {
|
|
let coordinator = SecureBackupSetupCoordinator(session: self.session, checkKeyBackup: checkKeyBackup, navigationRouter: self.navigationRouter, cancellable: self.cancellable)
|
|
coordinator.delegate = self
|
|
// Fix: calling coordinator.start() will update the navigationRouter without a popCompletion
|
|
coordinator.start(popCompletion: { [weak self] in
|
|
self?.remove(childCoordinator: coordinator)
|
|
})
|
|
// Fix: do not push the presentable from the coordinator to the navigation router as this has already been done by coordinator.start().
|
|
// Also, coordinator.toPresentable() returns a navigation controller, which cannot be pushed into a navigation router.
|
|
self.add(childCoordinator: coordinator)
|
|
}
|
|
}
|
|
|
|
// MARK: - SecretsRecoveryWithKeyCoordinatorDelegate
|
|
extension SecretsRecoveryCoordinator: SecretsRecoveryWithKeyCoordinatorDelegate {
|
|
|
|
func secretsRecoveryWithKeyCoordinatorDidRecover(_ coordinator: SecretsRecoveryWithKeyCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidRecover(self)
|
|
}
|
|
|
|
func secretsRecoveryWithKeyCoordinatorDidCancel(_ coordinator: SecretsRecoveryWithKeyCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidCancel(self)
|
|
}
|
|
|
|
func secretsRecoveryWithKeyCoordinatorWantsToResetSecrets(_ viewModel: SecretsRecoveryWithKeyCoordinatorType) {
|
|
self.showResetSecrets()
|
|
}
|
|
}
|
|
|
|
// MARK: - SecretsRecoveryWithPassphraseCoordinatorDelegate
|
|
extension SecretsRecoveryCoordinator: SecretsRecoveryWithPassphraseCoordinatorDelegate {
|
|
|
|
func secretsRecoveryWithPassphraseCoordinatorDidRecover(_ coordinator: SecretsRecoveryWithPassphraseCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidRecover(self)
|
|
}
|
|
|
|
func secretsRecoveryWithPassphraseCoordinatorDoNotKnowPassphrase(_ coordinator: SecretsRecoveryWithPassphraseCoordinatorType) {
|
|
self.showRecoverFromKeyCoordinator()
|
|
}
|
|
|
|
func secretsRecoveryWithPassphraseCoordinatorDidCancel(_ coordinator: SecretsRecoveryWithPassphraseCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidCancel(self)
|
|
}
|
|
|
|
func secretsRecoveryWithPassphraseCoordinatorWantsToResetSecrets(_ coordinator: SecretsRecoveryWithPassphraseCoordinatorType) {
|
|
self.showResetSecrets()
|
|
}
|
|
}
|
|
|
|
// MARK: - SecretsResetCoordinatorDelegate
|
|
extension SecretsRecoveryCoordinator: SecretsResetCoordinatorDelegate {
|
|
func secretsResetCoordinatorDidResetSecrets(_ coordinator: SecretsResetCoordinatorType) {
|
|
self.showSecureBackupSetup(checkKeyBackup: false)
|
|
}
|
|
|
|
func secretsResetCoordinatorDidCancel(_ coordinator: SecretsResetCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidCancel(self)
|
|
}
|
|
}
|
|
|
|
// MARK: - SecureBackupSetupCoordinatorDelegate
|
|
extension SecretsRecoveryCoordinator: SecureBackupSetupCoordinatorDelegate {
|
|
func secureBackupSetupCoordinatorDidComplete(_ coordinator: SecureBackupSetupCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidRecover(self)
|
|
}
|
|
|
|
func secureBackupSetupCoordinatorDidCancel(_ coordinator: SecureBackupSetupCoordinatorType) {
|
|
self.delegate?.secretsRecoveryCoordinatorDidCancel(self)
|
|
}
|
|
}
|