Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3135 from vector-im/remove_qr_code_scanned_alert

Browse source 
QR code verification: Remove other scan my code alert
This commit is contained in:
SBiOSoftWhare 2020-04-22 10:05:34 +02:00 committed by GitHub
commit 8ab007d7a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewAction.swift
View file

@ -23,7 +23,6 @@ enum KeyVerificationVerifyByScanningViewAction {
case loadData
case cancel
case scannedCode(payloadData: Data)
case cannotScan
case acknowledgeOtherScannedMyCode(Bool)
case cannotScan
case acknowledgeMyUserScannedOtherCode
}

22
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewController.swift
View file

@ -156,9 +156,7 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
case .error(let error):
self.render(error: error)
case .scannedCodeValidated(let isValid):
self.renderScannedCode(valid: isValid)
case .otherUserScannedMyCode:
self.renderOtherScannedMyCode()
self.renderScannedCode(valid: isValid)
case .cancelled(let reason):
self.renderCancelled(reason: reason)
case .cancelledByMe(let reason):
@ -214,24 +212,6 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
}
}
private func renderOtherScannedMyCode() {
let alert = UIAlertController(title: VectorL10n.keyVerificationVerifyQrCodeOtherScanMyCodeTitle,
message: nil,
preferredStyle: .alert)
let okAction = UIAlertAction(title: Bundle.mxk_localizedString(forKey: "yes"), style: .default, handler: { _ in
self.viewModel.process(viewAction: .acknowledgeOtherScannedMyCode(true))
})
alert.addAction(okAction)
let cancelAction = UIAlertAction(title: Bundle.mxk_localizedString(forKey: "no"), style: .cancel, handler: { _ in
self.viewModel.process(viewAction: .acknowledgeOtherScannedMyCode(false))
})
alert.addAction(cancelAction)
self.present(alert, animated: true, completion: nil)
}
private func renderCancelled(reason: MXTransactionCancelCode) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)

16
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
View file

@ -64,8 +64,6 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
self.scannedQRCode(payloadData: payloadData)
case .cannotScan:
self.startSASVerification()
case .acknowledgeOtherScannedMyCode(let acknowledgeOtherScannedMyCode):
self.acknowledgeOtherScannedMyCode(acknowledgeOtherScannedMyCode)
case .cancel:
self.cancel()
case .acknowledgeMyUserScannedOtherCode:
@ -149,16 +147,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.keyVerificationVerifyByScanningViewModel(self, didScanOtherQRCodeData: scannedQRCodeData, withTransaction: qrCodeTransaction)
}
private func acknowledgeOtherScannedMyCode(_ acknowledgeOtherScannedMyCode: Bool) {
guard let qrCodeTransaction = self.qrCodeTransaction else {
return
}
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.keyVerificationVerifyByScanningViewModel(self, qrCodeDidScannedByOtherWithTransaction: qrCodeTransaction)
}
}
private func removePendingQRCodeTransaction() {
guard let qrCodeTransaction = self.qrCodeTransaction else {
@ -252,7 +241,8 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.keyVerificationVerifyByScanningViewModelDidCancel(self)
case .qrScannedByOther:
self.update(viewState: .otherUserScannedMyCode)
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.keyVerificationVerifyByScanningViewModel(self, qrCodeDidScannedByOtherWithTransaction: transaction)
case .cancelled:
guard let reason = transaction.reasonCancelCode else {
return

3
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewState.swift
View file

@ -27,8 +27,7 @@ struct KeyVerificationVerifyByScanningViewData {
enum KeyVerificationVerifyByScanningViewState {
case loading
case loaded(viewData: KeyVerificationVerifyByScanningViewData)
case scannedCodeValidated(isValid: Bool)
case otherUserScannedMyCode
case scannedCodeValidated(isValid: Bool)
case cancelled(MXTransactionCancelCode)
case cancelledByMe(MXTransactionCancelCode)
case error(Error)