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

KeyVerificationVerifyByScanningViewModel: Remove pending QR code transaction when not used.

Browse Source
This commit is contained in:
SBiOSoftWhare
2020-03-17 14:06:56 +01:00
parent 93cf1e6e31
commit 4ee6de3836
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/DeviceVerification/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
+11 -3
View File
@@ -51,7 +51,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
}
deinit {
// TODO: Remove QR code transaction if needed
self.removePendingQRCodeTransaction()
}
// MARK: - Public
@@ -79,7 +79,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
let qrCodePlayloadData: Data?
let canShowScanAction: Bool
self.qrCodeTransaction = self.keyVerificationManager.qrCodeTransaction(withTransactionId: self.keyVerificationRequest.requestId)
if let supportedVerificationMethods = self.keyVerificationRequest.myMethods {
@@ -143,6 +143,13 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
qrCodeTransaction.otherUserScannedMyQrCode(acknowledgeOtherScannedMyCode)
}
private func removePendingQRCodeTransaction() {
guard let qrCodeTransaction = self.qrCodeTransaction else {
return
}
self.keyVerificationManager.removeQRCodeTransaction(withTransactionId: qrCodeTransaction.transactionId)
}
// MARK: SAS
private func startSASVerification() {
@@ -154,7 +161,8 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
return
}
// TODO: Remove QR code transaction
// Remove pending QR code transaction, as we are going to use SAS verification
self.removePendingQRCodeTransaction()
if deviceVerificationTransaction is MXOutgoingSASTransaction == false {
NSLog("[KeyVerificationVerifyByScanningViewModel] SAS transaction should be outgoing")