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

Key verification: Update key verification screens title. Update SAS screen wordings.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-04-27 19:54:57 +02:00
parent a272338f59
commit 7070cbfb05
16 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingCoordinator.swift
+4 -4
View File
@@ -37,15 +37,15 @@ final class KeyVerificationDataLoadingCoordinator: KeyVerificationDataLoadingCoo
// MARK: - Setup
init(session: MXSession, otherUserId: String, otherDeviceId: String) {
let keyVerificationDataLoadingViewModel = KeyVerificationDataLoadingViewModel(session: session, otherUserId: otherUserId, otherDeviceId: otherDeviceId)
init(session: MXSession, verificationKind: KeyVerificationKind, otherUserId: String, otherDeviceId: String) {
let keyVerificationDataLoadingViewModel = KeyVerificationDataLoadingViewModel(session: session, verificationKind: verificationKind, otherUserId: otherUserId, otherDeviceId: otherDeviceId)
let keyVerificationDataLoadingViewController = KeyVerificationDataLoadingViewController.instantiate(with: keyVerificationDataLoadingViewModel)
self.keyVerificationDataLoadingViewModel = keyVerificationDataLoadingViewModel
self.keyVerificationDataLoadingViewController = keyVerificationDataLoadingViewController
}
init(session: MXSession, incomingKeyVerificationRequest: MXKeyVerificationRequest) {
let keyVerificationDataLoadingViewModel = KeyVerificationDataLoadingViewModel(session: session, keyVerificationRequest: incomingKeyVerificationRequest)
init(session: MXSession, verificationKind: KeyVerificationKind, incomingKeyVerificationRequest: MXKeyVerificationRequest) {
let keyVerificationDataLoadingViewModel = KeyVerificationDataLoadingViewModel(session: session, verificationKind: verificationKind, keyVerificationRequest: incomingKeyVerificationRequest)
let keyVerificationDataLoadingViewController = KeyVerificationDataLoadingViewController.instantiate(with: keyVerificationDataLoadingViewModel)
self.keyVerificationDataLoadingViewModel = keyVerificationDataLoadingViewModel
self.keyVerificationDataLoadingViewController = keyVerificationDataLoadingViewController
Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewController.swift
+1 -1
View File
@@ -47,7 +47,7 @@ final class KeyVerificationDataLoadingViewController: UIViewController {
// Do any additional setup after loading the view.
self.title = VectorL10n.deviceVerificationTitle
self.title = self.viewModel.verificationKind.verificationTitle
self.vc_removeBackTitle()
self.setupViews()
Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewModel.swift
+5 -2
View File
@@ -31,6 +31,7 @@ final class KeyVerificationDataLoadingViewModel: KeyVerificationDataLoadingViewM
// MARK: Private
private let session: MXSession
private(set) var verificationKind: KeyVerificationKind
private let otherUserId: String?
private let otherDeviceId: String?
private let keyVerificationService = KeyVerificationService()
@@ -46,15 +47,17 @@ final class KeyVerificationDataLoadingViewModel: KeyVerificationDataLoadingViewM
// MARK: - Setup
init(session: MXSession, otherUserId: String, otherDeviceId: String) {
init(session: MXSession, verificationKind: KeyVerificationKind, otherUserId: String, otherDeviceId: String) {
self.session = session
self.verificationKind = verificationKind
self.otherUserId = otherUserId
self.otherDeviceId = otherDeviceId
self.keyVerificationRequest = nil
}
init(session: MXSession, keyVerificationRequest: MXKeyVerificationRequest) {
init(session: MXSession, verificationKind: KeyVerificationKind, keyVerificationRequest: MXKeyVerificationRequest) {
self.session = session
self.verificationKind = verificationKind
self.otherUserId = nil
self.otherDeviceId = nil
self.keyVerificationRequest = keyVerificationRequest
Riot/Modules/KeyVerification/Common/Loading/KeyVerificationDataLoadingViewModelType.swift
+2
View File
@@ -35,5 +35,7 @@ protocol KeyVerificationDataLoadingViewModelType {
var viewDelegate: KeyVerificationDataLoadingViewModelViewDelegate? { get set }
var coordinatorDelegate: KeyVerificationDataLoadingViewModelCoordinatorDelegate? { get set }
var verificationKind: KeyVerificationKind { get }
func process(viewAction: KeyVerificationDataLoadingViewAction)
}