mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 00:02:47 +00:00
Merge pull request #3135 from vector-im/remove_qr_code_scanned_alert
QR code verification: Remove other scan my code alert
This commit is contained in:
commit
8ab007d7a8
4 changed files with 6 additions and 38 deletions
|
@ -24,6 +24,5 @@ enum KeyVerificationVerifyByScanningViewAction {
|
|||
case cancel
|
||||
case scannedCode(payloadData: Data)
|
||||
case cannotScan
|
||||
case acknowledgeOtherScannedMyCode(Bool)
|
||||
case acknowledgeMyUserScannedOtherCode
|
||||
}
|
||||
|
|
|
@ -157,8 +157,6 @@ final class KeyVerificationVerifyByScanningViewController: UIViewController {
|
|||
self.render(error: error)
|
||||
case .scannedCodeValidated(let isValid):
|
||||
self.renderScannedCode(valid: isValid)
|
||||
case .otherUserScannedMyCode:
|
||||
self.renderOtherScannedMyCode()
|
||||
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)
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
@ -151,15 +149,6 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
|
|||
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 {
|
||||
return
|
||||
|
@ -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
|
||||
|
|
|
@ -28,7 +28,6 @@ enum KeyVerificationVerifyByScanningViewState {
|
|||
case loading
|
||||
case loaded(viewData: KeyVerificationVerifyByScanningViewData)
|
||||
case scannedCodeValidated(isValid: Bool)
|
||||
case otherUserScannedMyCode
|
||||
case cancelled(MXTransactionCancelCode)
|
||||
case cancelledByMe(MXTransactionCancelCode)
|
||||
case error(Error)
|
||||
|
|
Loading…
Reference in a new issue