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

User verification: User device verification flow when verify a session.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-01-31 15:09:19 +01:00
parent 57568fc769
commit 3d942ea8f2
3 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/UserVerification/Start/UserVerificationStartCoordinator.swift
+1 -1
View File
@@ -67,7 +67,7 @@ extension UserVerificationStartCoordinator: UserVerificationStartViewModelCoordi
self.delegate?.userVerificationStartCoordinatorDidCancel(self)
}
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction) {
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didCompleteWithIncomingTransaction transaction: MXSASTransaction) {
self.delegate?.userVerificationStartCoordinator(self, didCompleteWithOutgoingTransaction: transaction)
}
Riot/Modules/UserVerification/Start/UserVerificationStartViewModel.swift
+1 -1
View File
@@ -138,7 +138,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
switch transaction.state {
case MXSASTransactionStateShowSAS:
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.userVerificationStartViewModel(self, didCompleteWithOutgoingTransaction: transaction)
self.coordinatorDelegate?.userVerificationStartViewModel(self, didCompleteWithIncomingTransaction: transaction)
case MXSASTransactionStateCancelled:
guard let reason = transaction.reasonCancelCode else {
return
Riot/Modules/UserVerification/UserVerificationCoordinator.swift
+11 -35
View File
@@ -90,35 +90,15 @@ final class UserVerificationCoordinator: NSObject, UserVerificationCoordinatorTy
private func presentDeviceVerification(for deviceId: String) {
guard let deviceInfo = self.session.crypto.device(withDeviceId: deviceId, ofUser: self.userId) else {
NSLog("[UserVerificationCoordinator] Device not found")
return
}
let deviceVerificationCoordinator = DeviceVerificationCoordinator(navigationRouter: self.navigationRouter, session: self.session, userId: self.userId, otherDeviceId: deviceId)
deviceVerificationCoordinator.delegate = self
deviceVerificationCoordinator.start()
let encryptionInfoView: EncryptionInfoView = EncryptionInfoView(deviceInfo: deviceInfo, andMatrixSession: session)
encryptionInfoView.delegate = self
self.add(childCoordinator: deviceVerificationCoordinator)
// Skip the intro page
encryptionInfoView.displayLegacyVerificationScreen()
// Display the legacy verification view in full screen
// TODO: Do not reuse the legacy EncryptionInfoView and create a screen from scratch
let viewController = UIViewController()
viewController.view.backgroundColor = ThemeService.shared().theme.backgroundColor
viewController.view.addSubview(encryptionInfoView)
encryptionInfoView.translatesAutoresizingMaskIntoConstraints = false
let superViewMargins = viewController.view.layoutMarginsGuide
NSLayoutConstraint.activate([
encryptionInfoView.topAnchor.constraint(equalTo: superViewMargins.topAnchor),
encryptionInfoView.leadingAnchor.constraint(equalTo: superViewMargins.leadingAnchor),
encryptionInfoView.trailingAnchor.constraint(equalTo: superViewMargins.trailingAnchor),
encryptionInfoView.bottomAnchor.constraint(equalTo: superViewMargins.bottomAnchor)
])
self.navigationRouter.push(viewController, animated: true, popCompletion: nil)
self.navigationRouter.push(deviceVerificationCoordinator, animated: true, popCompletion: {
self.remove(childCoordinator: deviceVerificationCoordinator)
})
}
}
@@ -152,16 +132,12 @@ extension UserVerificationCoordinator: UserVerificationSessionStatusCoordinatorD
}
}
// MARK: - MXKEncryptionInfoViewDelegate
extension UserVerificationCoordinator: MXKEncryptionInfoViewDelegate {
func encryptionInfoView(_ encryptionInfoView: MXKEncryptionInfoView!, didDeviceInfoVerifiedChange deviceInfo: MXDeviceInfo!) {
self.presenter.toPresentable().dismiss(animated: true) {
}
}
// MARK: - UserVerificationCoordinatorDelegate
extension UserVerificationCoordinator: DeviceVerificationCoordinatorDelegate {
func encryptionInfoViewDidClose(_ encryptionInfoView: MXKEncryptionInfoView!) {
func deviceVerificationCoordinatorDidComplete(_ coordinator: DeviceVerificationCoordinatorType, otherUserId: String, otherDeviceId: String) {
self.presenter.toPresentable().dismiss(animated: true) {
self.remove(childCoordinator: coordinator)
}
}
}