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

merged element 1.8.10

Browse Source
This commit is contained in:
Arnfried Griesert
2022-05-03 12:48:01 +02:00
parent f3c547da4b 38051ec88b
commit f1becdd999
1235 changed files with 50869 additions and 23132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
+6 -14
View File
@@ -25,6 +25,7 @@ final class SecretsRecoveryWithKeyCoordinator: SecretsRecoveryWithKeyCoordinator
private let secretsRecoveryWithKeyViewController: SecretsRecoveryWithKeyViewController
private let secretsRecoveryWithKeyViewModel: SecretsRecoveryWithKeyViewModel
private let cancellable: Bool
// MARK: Public
@@ -34,12 +35,13 @@ final class SecretsRecoveryWithKeyCoordinator: SecretsRecoveryWithKeyCoordinator
// MARK: - Setup
init(recoveryService: MXRecoveryService, recoveryGoal: SecretsRecoveryGoal) {
init(recoveryService: MXRecoveryService, recoveryGoal: SecretsRecoveryGoal, cancellable: Bool) {
let secretsRecoveryWithKeyViewModel = SecretsRecoveryWithKeyViewModel(recoveryService: recoveryService, recoveryGoal: recoveryGoal)
let secretsRecoveryWithKeyViewController = SecretsRecoveryWithKeyViewController.instantiate(with: secretsRecoveryWithKeyViewModel)
let secretsRecoveryWithKeyViewController = SecretsRecoveryWithKeyViewController.instantiate(with: secretsRecoveryWithKeyViewModel, cancellable: cancellable)
self.secretsRecoveryWithKeyViewController = secretsRecoveryWithKeyViewController
self.secretsRecoveryWithKeyViewModel = secretsRecoveryWithKeyViewModel
self.cancellable = cancellable
}
// MARK: - Public
@@ -49,18 +51,8 @@ final class SecretsRecoveryWithKeyCoordinator: SecretsRecoveryWithKeyCoordinator
}
func toPresentable() -> UIViewController {
let controller = self.secretsRecoveryWithKeyViewController
// 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
return self.secretsRecoveryWithKeyViewController
.vc_setModalFullScreen(!self.cancellable)
}
}
Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
+9 -10
View File
@@ -44,6 +44,7 @@ final class SecretsRecoveryWithKeyViewController: UIViewController {
private var viewModel: SecretsRecoveryWithKeyViewModelType!
private var keyboardAvoider: KeyboardAvoider?
private var cancellable: Bool!
private var theme: Theme!
private var errorPresenter: MXKErrorPresentation!
private var activityPresenter: ActivityIndicatorPresenter!
@@ -53,9 +54,10 @@ final class SecretsRecoveryWithKeyViewController: UIViewController {
// MARK: - Setup
class func instantiate(with viewModel: SecretsRecoveryWithKeyViewModelType) -> SecretsRecoveryWithKeyViewController {
class func instantiate(with viewModel: SecretsRecoveryWithKeyViewModelType, cancellable: Bool) -> SecretsRecoveryWithKeyViewController {
let viewController = StoryboardScene.SecretsRecoveryWithKeyViewController.initialScene.instantiate()
viewController.viewModel = viewModel
viewController.cancellable = cancellable
viewController.theme = ThemeService.shared().theme
return viewController
}
@@ -87,16 +89,13 @@ final class SecretsRecoveryWithKeyViewController: UIViewController {
// MARK: - Private
private func setupViews() {
if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
if !session.homeserverWellknown.backupRequired() {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
self?.cancelButtonAction()
}
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
if self.cancellable {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
self?.cancelButtonAction()
}
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
}
self.title = VectorL10n.secretsRecoveryWithKeyTitle
self.scrollView.keyboardDismissMode = .interactive
@@ -109,7 +108,7 @@ final class SecretsRecoveryWithKeyViewController: UIViewController {
switch self.viewModel.recoveryGoal {
case .default, .keyBackup, .restoreSecureBackup:
informationText = VectorL10n.secretsRecoveryWithKeyInformationDefault
case .unlockSecureBackup(_):
case .unlockSecureBackup:
informationText = VectorL10n.secretsRecoveryWithKeyInformationUnlockSecureBackupWithKey
case .verifyDevice:
informationText = VectorL10n.secretsRecoveryWithKeyInformationVerifyDevice