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

Key Backup setup: Create the key backup using 4S if it exists

Browse Source
This commit is contained in:
manuroe
2021-06-16 08:18:23 +02:00
parent df628da793
commit 5e2d75a2fb
11 changed files with 362 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupTableViewSection.swift
View File

@@ -23,7 +23,7 @@ import UIKit
func settingsSecureBackupTableViewSection(_ settingsSecureBackupTableViewSection: SettingsSecureBackupTableViewSection, buttonCellForRow: Int) -> MXKTableViewCellWithButton
func settingsSecureBackupTableViewSectionShowKeyBackupSetup(_ settingsSecureBackupTableViewSection: SettingsSecureBackupTableViewSection)
func settingsSecureBackupTableViewSectionShowKeyBackupCreate(_ settingsSecureBackupTableViewSection: SettingsSecureBackupTableViewSection)
func settingsSecureBackupTableViewSection(_ settingsSecureBackupTableViewSection: SettingsSecureBackupTableViewSection, showKeyBackupRecover keyBackupVersion: MXKeyBackupVersion)
func settingsSecureBackupTableViewSection(_ settingsSecureBackupTableViewSection: SettingsSecureBackupTableViewSection, showKeyBackupDeleteConfirm keyBackupVersion: MXKeyBackupVersion)
@@ -33,7 +33,7 @@ import UIKit
private enum BackupRows {
case info(text: String)
case setupAction
case createKeyBackupAction
case restoreFromKeyBackupAction(keyBackupVersion: MXKeyBackupVersion, title: String)
case deleteKeyBackupAction(keyBackupVersion: MXKeyBackupVersion)
}
@@ -89,8 +89,8 @@ private enum BackupRows {
let infoCell: MXKTableViewCellWithTextView = delegate.settingsSecureBackupTableViewSection(self, textCellForRow: row)
infoCell.mxkTextView.text = infoText
cell = infoCell
case .setupAction:
cell = self.buttonCellForSetup(atRow: row)
case .createKeyBackupAction:
cell = self.buttonCellForCreateKeyBackup(atRow: row)
case .restoreFromKeyBackupAction(keyBackupVersion: let keyBackupVersion, let title):
cell = self.buttonCellForRestoreFromKeyBackup(keyBackupVersion: keyBackupVersion, title: title, atRow: row)
case .deleteKeyBackupAction(keyBackupVersion: let keyBackupVersion):
@@ -128,16 +128,15 @@ private enum BackupRows {
case .noBackup:
// let noBackup = VectorL10n.settingsSecureBackupInfoNone
// let info = VectorL10n.settingsSecureBackupInfo
// let signoutWarning = VectorL10n.settingsSecureBackupInfoSignoutWarning
// let strings = [noBackup, "", info, "", signoutWarning]
// let backupInfoText = strings.joined(separator: "\n")
let backupInfoText = "TODO"
let noBackup = VectorL10n.settingsKeyBackupInfoNone
let signoutWarning = VectorL10n.settingsKeyBackupInfoSignoutWarning
let strings = [noBackup, "", signoutWarning]
let backupInfoText = strings.joined(separator: "\n")
backupRows = [
.info(text: VectorL10n.securitySettingsSecureBackupDescription),
.info(text: backupInfoText),
.setupAction
.createKeyBackupAction
]
case .backup(let keyBackupVersion, let keyBackupVersionTrust),
@@ -247,7 +246,7 @@ private enum BackupRows {
// MARK: - Button cells
private func buttonCellForSetup(atRow row: Int) -> UITableViewCell {
private func buttonCellForCreateKeyBackup(atRow row: Int) -> UITableViewCell {
guard let delegate = self.delegate else {
return UITableViewCell()
@@ -260,7 +259,7 @@ private enum BackupRows {
cell.mxkButton.setTitle(btnTitle, for: .highlighted)
cell.mxkButton.vc_addAction {
self.viewModel.process(viewAction: .setup)
self.viewModel.process(viewAction: .createKeyBackup)
}
return cell
@@ -319,8 +318,8 @@ extension SettingsSecureBackupTableViewSection: SettingsSecureBackupViewModelVie
}
}
func settingsSecureBackupViewModelShowKeyBackupSetup(_ viewModel: SettingsSecureBackupViewModelType) {
self.delegate?.settingsSecureBackupTableViewSectionShowKeyBackupSetup(self)
func settingsSecureBackupViewModelShowKeyBackupCreate(_ viewModel: SettingsSecureBackupViewModelType) {
self.delegate?.settingsSecureBackupTableViewSectionShowKeyBackupCreate(self)
}
func settingsSecureBackupViewModel(_ viewModel: SettingsSecureBackupViewModelType, showKeyBackupRecover keyBackupVersion: MXKeyBackupVersion) {

2
Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupViewAction.swift
View File

@@ -18,7 +18,7 @@ import UIKit
enum SettingsSecureBackupViewAction {
case load
case setup
case createKeyBackup
case restoreFromKeyBackup(MXKeyBackupVersion)
case confirmDeleteKeyBackup(MXKeyBackupVersion)
case deleteKeyBackup(MXKeyBackupVersion)

4
Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupViewModel.swift
View File

@@ -46,8 +46,8 @@ final class SettingsSecureBackupViewModel: SettingsSecureBackupViewModelType {
case .load:
viewDelegate.settingsSecureBackupViewModel(self, didUpdateViewState: .checkingBackup)
self.checkKeyBackupState()
case .setup:
viewDelegate.settingsSecureBackupViewModelShowKeyBackupSetup(self)
case .createKeyBackup:
viewDelegate.settingsSecureBackupViewModelShowKeyBackupCreate(self)
case .restoreFromKeyBackup(let keyBackupVersion):
viewDelegate.settingsSecureBackupViewModel(self, showKeyBackupRecover: keyBackupVersion)
case .confirmDeleteKeyBackup(let keyBackupVersion):

2
Riot/Modules/Settings/Security/SecureBackup/SettingsSecureBackupViewModelType.swift
View File

@@ -20,7 +20,7 @@ protocol SettingsSecureBackupViewModelViewDelegate: class {
func settingsSecureBackupViewModel(_ viewModel: SettingsSecureBackupViewModelType, didUpdateViewState viewState: SettingsSecureBackupViewState)
func settingsSecureBackupViewModel(_ viewModel: SettingsSecureBackupViewModelType, didUpdateNetworkRequestViewState networkRequestViewSate: SettingsSecureBackupNetworkRequestViewState)
func settingsSecureBackupViewModelShowKeyBackupSetup(_ viewModel: SettingsSecureBackupViewModelType)
func settingsSecureBackupViewModelShowKeyBackupCreate(_ viewModel: SettingsSecureBackupViewModelType)
func settingsSecureBackupViewModel(_ viewModel: SettingsSecureBackupViewModelType, showKeyBackupRecover keyBackupVersion: MXKeyBackupVersion)
func settingsSecureBackupViewModel(_ viewModel: SettingsSecureBackupViewModelType, showKeyBackupDeleteConfirm keyBackupVersion: MXKeyBackupVersion)
}