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

Add cancellable property to secureBackup/recovery view controllers

Browse Source
This commit is contained in:
Arnaud Ringenbach
2022-03-09 10:41:27 +01:00
parent 25660bdace
commit 6c5584acc0
6 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift
+12 -8
View File
@@ -47,6 +47,7 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
// MARK: Private
private var viewModel: KeyVerificationSelfVerifyWaitViewModelType!
private var cancellable: Bool!
private var theme: Theme!
private var errorPresenter: MXKErrorPresentation!
private var activityPresenter: ActivityIndicatorPresenter!
@@ -55,9 +56,10 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
// MARK: - Setup
class func instantiate(with viewModel: KeyVerificationSelfVerifyWaitViewModelType) -> KeyVerificationSelfVerifyWaitViewController {
class func instantiate(with viewModel: KeyVerificationSelfVerifyWaitViewModelType, cancellable: Bool = true) -> KeyVerificationSelfVerifyWaitViewController {
let viewController = StoryboardScene.KeyVerificationSelfVerifyWaitViewController.initialScene.instantiate()
viewController.viewModel = viewModel
viewController.cancellable = cancellable
viewController.theme = ThemeService.shared().theme
return viewController
}
@@ -112,15 +114,17 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController {
}
private func setupViews() {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.skip, style: .plain) { [weak self] in
self?.cancelButtonAction()
if self.cancellable {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.skip, style: .plain) { [weak self] in
self?.cancelButtonAction()
}
self.vc_removeBackTitle()
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
self.cancelBarButtonItem = cancelBarButtonItem
}
self.vc_removeBackTitle()
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
self.cancelBarButtonItem = cancelBarButtonItem
self.title = VectorL10n.deviceVerificationSelfVerifyWaitTitle
self.informationLabel.text = VectorL10n.deviceVerificationSelfVerifyWaitInformation(AppInfo.current.displayName)