felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

MESSENGER-2762 Initial Merge

Browse Source
This commit is contained in:
Frank Rotermund
2022-03-17 15:51:23 +01:00
parent ecae8d618f
commit c2108a2178
384 changed files with 17708 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Riot/Modules/Secrets/Setup/RecoveryKey/SecretsSetupRecoveryKeyViewController.swift
View File

@@ -2,6 +2,7 @@
// $ createScreen.sh SecretsSetupRecoveryKey SecretsSetupRecoveryKey
/*
Copyright 2020 New Vector Ltd
Copyright (c) 2021 BWI GmbH
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -108,12 +109,16 @@ final class SecretsSetupRecoveryKeyViewController: UIViewController {
}
private func setupViews() {
let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
self?.cancelButtonAction()
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
}
}
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
self.vc_removeBackTitle()
self.title = VectorL10n.secretsSetupRecoveryKeyTitle
@@ -137,19 +142,21 @@ final class SecretsSetupRecoveryKeyViewController: UIViewController {
self.renderLoaded(passphraseOnly: passphraseOnly)
case .recoveryCreated(let recoveryKey):
self.renderRecoveryCreated(recoveryKey: recoveryKey)
if BuildSettings.skipKeyBackupStep {
self.viewModel.process(viewAction: .done)
}
case .error(let error):
self.render(error: error)
}
}
private func renderLoaded(passphraseOnly: Bool) {
private func renderLoaded(passphraseOnly: Bool) {
self.isPassphraseOnly = passphraseOnly
let title: String
let secretsLogoImage: UIImage
let informationText: String
let recoveryKeyText: String?
if passphraseOnly {
title = VectorL10n.secretsSetupRecoveryPassphraseSummaryTitle
secretsLogoImage = Asset.Images.secretsSetupPassphrase.image