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

Key verification: Update verified screen UI.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-04-28 20:27:48 +02:00
parent f678835014
commit 15588f8fb5
5 changed files with 147 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
+60 -32
View File
@@ -116,39 +116,67 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
// MARK: - Public methods
// func start() {
// let rootCoordinator: Coordinator & Presentable
//
// switch self.verificationFlow {
// case .verifyUser(let roomMember):
// rootCoordinator = self.createUserVerificationStartCoordinator(with: roomMember)
// case .verifyDevice(let userId, let deviceId):
// if userId == self.session.myUser.userId {
// rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
// } else {
// rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
// }
// case .incomingRequest(let incomingKeyVerificationRequest):
// rootCoordinator = self.createDataLoadingScreenCoordinator(with: incomingKeyVerificationRequest)
// case .incomingSASTransaction(let incomingSASTransaction):
// rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: incomingSASTransaction.otherUserId, otherDeviceId: incomingSASTransaction.otherDeviceId)
// case .completeSecurity(let isNewSignIn):
// rootCoordinator = self.createCompleteSecurityCoordinator(isNewSignIn: isNewSignIn)
// }
//
// rootCoordinator.start()
//
// self.add(childCoordinator: rootCoordinator)
//
// if self.navigationRouter.modules.isEmpty == false {
// self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
// self?.remove(childCoordinator: rootCoordinator)
// })
// } else {
// self.navigationRouter.setRootModule(rootCoordinator) { [weak self] in
// self?.remove(childCoordinator: rootCoordinator)
// }
// }
// }
func start() {
let rootCoordinator: Coordinator & Presentable
switch self.verificationFlow {
case .verifyUser(let roomMember):
rootCoordinator = self.createUserVerificationStartCoordinator(with: roomMember)
case .verifyDevice(let userId, let deviceId):
if userId == self.session.myUser.userId {
rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
} else {
rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
}
case .incomingRequest(let incomingKeyVerificationRequest):
rootCoordinator = self.createDataLoadingScreenCoordinator(with: incomingKeyVerificationRequest)
case .incomingSASTransaction(let incomingSASTransaction):
rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: incomingSASTransaction.otherUserId, otherDeviceId: incomingSASTransaction.otherDeviceId)
case .completeSecurity(let isNewSignIn):
rootCoordinator = self.createCompleteSecurityCoordinator(isNewSignIn: isNewSignIn)
}
rootCoordinator.start()
self.add(childCoordinator: rootCoordinator)
if self.navigationRouter.modules.isEmpty == false {
self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
self?.remove(childCoordinator: rootCoordinator)
})
} else {
self.navigationRouter.setRootModule(rootCoordinator) { [weak self] in
self?.remove(childCoordinator: rootCoordinator)
}
}
// let rootCoordinator: Coordinator & Presentable
//
//
// let coordinator = KeyVerificationScanConfirmationCoordinator(session: self.session, transaction: MXQRCodeTransaction(), codeScanning: .myQRCodeScanned, verificationKind: self.verificationKind)
// coordinator.delegate = self
//
// rootCoordinator = coordinator
//
// rootCoordinator.start()
//
// self.add(childCoordinator: rootCoordinator)
//
// if self.navigationRouter.modules.isEmpty == false {
// self.navigationRouter.push(rootCoordinator, animated: true, popCompletion: { [weak self] in
// self?.remove(childCoordinator: rootCoordinator)
// })
// } else {
// self.navigationRouter.setRootModule(rootCoordinator) { [weak self] in
// self?.remove(childCoordinator: rootCoordinator)
// }
// }
let viewController = KeyVerificationVerifiedViewController.instantiate(with: self.verificationKind)
viewController.delegate = self
self.navigationRouter.setRootModule(viewController)
}
func toPresentable() -> UIViewController {