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

User verification: Update start verification flow.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-03-13 19:00:14 +01:00
parent ac7369963a
commit e4ebe0ea6c
4 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/UserVerification/Start/UserVerificationStartCoordinator.swift
+5
View File
@@ -63,6 +63,11 @@ final class UserVerificationStartCoordinator: UserVerificationStartCoordinatorTy
// MARK: - UserVerificationStartViewModelCoordinatorDelegate
extension UserVerificationStartCoordinator: UserVerificationStartViewModelCoordinatorDelegate {
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, otherDidAcceptRequest request: MXKeyVerificationRequest) {
self.delegate?.userVerificationStartCoordinator(self, otherDidAcceptRequest: request)
}
func userVerificationStartViewModelDidCancel(_ viewModel: UserVerificationStartViewModelType) {
self.delegate?.userVerificationStartCoordinatorDidCancel(self)
}
Riot/Modules/UserVerification/Start/UserVerificationStartCoordinatorType.swift
+3
View File
@@ -19,6 +19,9 @@
import Foundation
protocol UserVerificationStartCoordinatorDelegate: class {
func userVerificationStartCoordinator(_ coordinator: UserVerificationStartCoordinatorType, otherDidAcceptRequest request: MXKeyVerificationRequest)
func userVerificationStartCoordinator(_ coordinator: UserVerificationStartCoordinatorType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction)
func userVerificationStartCoordinator(_ coordinator: UserVerificationStartCoordinatorType, didTransactionCancelled transaction: MXSASTransaction)
Riot/Modules/UserVerification/Start/UserVerificationStartViewModel.swift
+16 -54
View File
@@ -37,6 +37,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
private let session: MXSession
private let roomMember: MXRoomMember
private let verificationManager: MXKeyVerificationManager
private let keyVerificationService: KeyVerificationService
private var keyVerificationRequest: MXKeyVerificationRequest?
@@ -55,6 +56,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
self.session = session
self.verificationManager = session.crypto.keyVerificationManager
self.roomMember = roomMember
self.keyVerificationService = KeyVerificationService()
}
deinit {
@@ -86,7 +88,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
self.verificationManager.requestVerificationByDM(withUserId: self.roomMember.userId,
roomId: nil,
fallbackText: "",
methods: [MXKeyVerificationMethodSAS],
methods: self.keyVerificationService.supportedKeyVerificationMethods(),
success: { [weak self] (keyVerificationRequest) in
guard let self = self else {
return
@@ -94,9 +96,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
self.keyVerificationRequest = keyVerificationRequest
self.update(viewState: .loaded(self.viewData))
self.registerKeyVerificationDidChangeNotification(keyVerificationRequest: keyVerificationRequest)
self.registerTransactionDidStateChangeNotification()
self.registerKeyVerificationRequestDidChangeNotification(for: keyVerificationRequest)
}, failure: { [weak self] error in
self?.update(viewState: .error(error))
})
@@ -114,55 +114,13 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
keyVerificationRequest.cancel(with: MXTransactionCancelCode.user(), success: nil, failure: nil)
}
// MARK: - MXKeyVerificationTransactionDidChange
// MARK: - MXKeyVerificationRequestDidChange
private func registerTransactionDidStateChangeNotification() {
NotificationCenter.default.addObserver(self, selector: #selector(transactionDidStateChange(notification:)), name: .MXKeyVerificationTransactionDidChange, object: nil)
}
private func unregisterTransactionDidStateChangeNotification() {
NotificationCenter.default.removeObserver(self, name: .MXKeyVerificationTransactionDidChange, object: nil)
}
@objc private func transactionDidStateChange(notification: Notification) {
guard let transaction = notification.object as? MXIncomingSASTransaction else {
return
}
guard let keyVerificationRequest = self.keyVerificationRequest,
let transactionDMEventId = transaction.dmEventId,
keyVerificationRequest.requestId == transactionDMEventId else {
return
}
switch transaction.state {
case MXSASTransactionStateShowSAS:
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.userVerificationStartViewModel(self, didCompleteWithIncomingTransaction: transaction)
case MXSASTransactionStateCancelled:
guard let reason = transaction.reasonCancelCode else {
return
}
self.unregisterTransactionDidStateChangeNotification()
self.update(viewState: .cancelled(reason))
case MXSASTransactionStateCancelledByMe:
guard let reason = transaction.reasonCancelCode else {
return
}
self.unregisterTransactionDidStateChangeNotification()
self.update(viewState: .cancelledByMe(reason))
default:
break
}
}
// MARK: - MXKeyVerificationTransactionDidChange
private func registerKeyVerificationDidChangeNotification(keyVerificationRequest: MXKeyVerificationRequest) {
private func registerKeyVerificationRequestDidChangeNotification(for keyVerificationRequest: MXKeyVerificationRequest) {
NotificationCenter.default.addObserver(self, selector: #selector(keyVerificationRequestDidChange(notification:)), name: .MXKeyVerificationRequestDidChange, object: keyVerificationRequest)
}
private func unregisterKeyVerificationDidChangeNotification() {
private func unregisterKeyVerificationRequestDidChangeNotification() {
NotificationCenter.default.removeObserver(self, name: .MXKeyVerificationRequestDidChange, object: nil)
}
@@ -176,22 +134,26 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
}
switch keyVerificationRequest.state {
case MXKeyVerificationRequestStateAccepted:
self.unregisterKeyVerificationDidChangeNotification()
case MXKeyVerificationRequestStateAccepted:
self.unregisterKeyVerificationRequestDidChangeNotification()
self.coordinatorDelegate?.userVerificationStartViewModel(self, otherDidAcceptRequest: currentKeyVerificationRequest)
case MXKeyVerificationRequestStateReady:
self.unregisterKeyVerificationRequestDidChangeNotification()
self.coordinatorDelegate?.userVerificationStartViewModel(self, otherDidAcceptRequest: currentKeyVerificationRequest)
case MXKeyVerificationRequestStateCancelled:
guard let reason = keyVerificationRequest.reasonCancelCode else {
return
}
self.unregisterKeyVerificationDidChangeNotification()
self.unregisterKeyVerificationRequestDidChangeNotification()
self.update(viewState: .cancelled(reason))
case MXKeyVerificationRequestStateCancelledByMe:
guard let reason = keyVerificationRequest.reasonCancelCode else {
return
}
self.unregisterKeyVerificationDidChangeNotification()
self.unregisterKeyVerificationRequestDidChangeNotification()
self.update(viewState: .cancelledByMe(reason))
case MXKeyVerificationRequestStateExpired:
self.unregisterKeyVerificationDidChangeNotification()
self.unregisterKeyVerificationRequestDidChangeNotification()
self.update(viewState: .error(UserVerificationStartViewModelError.keyVerificationRequestExpired))
default:
break
Riot/Modules/UserVerification/Start/UserVerificationStartViewModelType.swift
+2
View File
@@ -24,6 +24,8 @@ protocol UserVerificationStartViewModelViewDelegate: class {
protocol UserVerificationStartViewModelCoordinatorDelegate: class {
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, otherDidAcceptRequest request: MXKeyVerificationRequest)
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didCompleteWithIncomingTransaction transaction: MXSASTransaction)
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didTransactionCancelled transaction: MXSASTransaction)