mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-18 07:28:28 +02:00
merged element 1.8.10
This commit is contained in:
@@ -54,6 +54,7 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController, UITe
|
||||
// MARK: Private
|
||||
|
||||
private var viewModel: SecretsSetupRecoveryPassphraseViewModelType!
|
||||
private var cancellable: Bool!
|
||||
private var theme: Theme!
|
||||
private var keyboardAvoider: KeyboardAvoider?
|
||||
private var errorPresenter: MXKErrorPresentation!
|
||||
@@ -65,9 +66,10 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController, UITe
|
||||
|
||||
// MARK: - Setup
|
||||
|
||||
class func instantiate(with viewModel: SecretsSetupRecoveryPassphraseViewModelType) -> SecretsSetupRecoveryPassphraseViewController {
|
||||
class func instantiate(with viewModel: SecretsSetupRecoveryPassphraseViewModelType, cancellable: Bool) -> SecretsSetupRecoveryPassphraseViewController {
|
||||
let viewController = StoryboardScene.SecretsSetupRecoveryPassphraseViewController.initialScene.instantiate()
|
||||
viewController.viewModel = viewModel
|
||||
viewController.cancellable = cancellable
|
||||
viewController.theme = ThemeService.shared().theme
|
||||
return viewController
|
||||
}
|
||||
@@ -121,16 +123,14 @@ final class SecretsSetupRecoveryPassphraseViewController: UIViewController, UITe
|
||||
// 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.vc_removeBackTitle()
|
||||
|
||||
self.title = VectorL10n.secretsSetupRecoveryPassphraseTitle
|
||||
|
||||
Reference in New Issue
Block a user