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

KeyVerificationVerifyByScanningViewController: Handle transaction cancel when QR code scanning is on screen.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-04-21 17:01:04 +02:00
parent 0ca213fab2
commit 8fee72694e
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
+31 -9
View File
@@ -40,9 +40,9 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
@IBOutlet private weak var scanCodeButton: UIButton!
@IBOutlet private weak var cannotScanButton: UIButton!
@IBOutlet weak var qrCodeContainerView: UIView!
@IBOutlet private weak var qrCodeContainerView: UIView!
@IBOutlet weak var scanButtonContainerView: UIView!
@IBOutlet private weak var scanButtonContainerView: UIView!
// MARK: Private
@@ -53,7 +53,11 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
private var cameraAccessAlertPresenter: CameraAccessAlertPresenter!
private var cameraAccessManager: CameraAccessManager!
private weak var qrCodeReaderViewController: QRCodeReaderViewController!
private weak var qrCodeReaderViewController: QRCodeReaderViewController?
private var alertPresentingViewController: UIViewController {
return self.qrCodeReaderViewController ?? self
}
// MARK: - Setup
@@ -201,10 +205,9 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
private func renderScannedCode(valid: Bool) {
if valid {
self.qrCodeReaderViewController.view.isUserInteractionEnabled = false
self.qrCodeReaderViewController.stopScanning()
self.stopQRCodeScanningIfPresented()
self.presentCodeValidated(animated: true) {
self.dismiss(animated: true, completion: {
self.dismissQRCodeScanningIfPresented(animated: true, completion: {
self.viewModel.process(viewAction: .acknowledgeMyUserScannedOtherCode)
})
}
@@ -231,8 +234,11 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
private func renderCancelled(reason: MXTransactionCancelCode) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.stopQRCodeScanningIfPresented()
self.errorPresenter.presentError(from: self, title: "", message: VectorL10n.deviceVerificationCancelled, animated: true) {
self.errorPresenter.presentError(from: self.alertPresentingViewController, title: "", message: VectorL10n.deviceVerificationCancelled, animated: true) {
self.dismissQRCodeScanningIfPresented(animated: false)
self.viewModel.process(viewAction: .cancel)
}
}
@@ -241,7 +247,8 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
if reason.value != MXTransactionCancelCode.user().value {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.errorPresenter.presentError(from: self, title: "", message: VectorL10n.deviceVerificationCancelledByMe(reason.humanReadable), animated: true) {
self.errorPresenter.presentError(from: alertPresentingViewController, title: "", message: VectorL10n.deviceVerificationCancelledByMe(reason.humanReadable), animated: true) {
self.dismissQRCodeScanningIfPresented(animated: false)
self.viewModel.process(viewAction: .cancel)
}
} else {
@@ -279,6 +286,21 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
}
}
}
private func stopQRCodeScanningIfPresented() {
guard let qrCodeReaderViewController = self.qrCodeReaderViewController else {
return
}
qrCodeReaderViewController.view.isUserInteractionEnabled = false
qrCodeReaderViewController.stopScanning()
}
private func dismissQRCodeScanningIfPresented(animated: Bool, completion: (() -> Void)? = nil) {
guard self.qrCodeReaderViewController?.presentingViewController != nil else {
return
}
self.dismiss(animated: animated, completion: completion)
}
// MARK: - Actions
@@ -316,6 +338,6 @@ extension KeyVerificationVerifyByScanningViewController: QRCodeReaderViewControl
}
func qrCodeReaderViewControllerDidCancel(_ viewController: QRCodeReaderViewController) {
self.dismiss(animated: true, completion: nil)
self.dismissQRCodeScanningIfPresented(animated: true)
}
}