MESSENGER-4535 fix invitation into DMs and personal notes and cancelable passphrase flow cherry pick from release

This commit is contained in:
Frank Rotermund
2023-04-12 15:32:51 +02:00
parent 59c5739ba4
commit aeba8c917a
2 changed files with 9 additions and 19 deletions
@@ -102,18 +102,6 @@ final class SecureBackupSetupIntroViewController: UIViewController {
self.title = BWIL10n.secureKeyBackupSetupIntroTitle
self.informationLabel.text = BWIL10n.secureKeyBackupSetupIntroInfo
if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession, let wellknown = session.homeserverWellknown {
if wellknown.backupRequired() {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
guard let self = self else {
return
}
self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: true)
}
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
}
}
self.secureKeyCell.fill(title: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyTitle,
information: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyInfo,
image: Asset.Images.secretsSetupKey.image)