Merge pull request #6452 from vector-im/andy/6443_sas_verification

Outgoing SAS User Verification Flow
element-hq · Aug 18, 2022 · 3c4af39 · 3c4af39
2 parents 72485da + 561acf5
commit 3c4af39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...les/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift b/...les/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
@@ -173,7 +173,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
  // Remove pending QR code transaction, as we are going to use SAS verification
  self.removePendingQRCodeTransaction()
 
- if keyVerificationTransaction is MXOutgoingSASTransaction == false {
+ if keyVerificationTransaction is MXSASTransaction == false || keyVerificationTransaction.isIncoming {
  MXLog.debug("[KeyVerificationVerifyByScanningViewModel] SAS transaction should be outgoing")
  self.unregisterTransactionDidStateChangeNotification()
  self.update(viewState: .error(KeyVerificationVerifyByScanningViewModelError.unknown))

diff --git a/Riot/Modules/KeyVerification/User/Start/UserVerificationStartViewModel.swift b/Riot/Modules/KeyVerification/User/Start/UserVerificationStartViewModel.swift
@@ -122,7 +122,7 @@ final class UserVerificationStartViewModel: UserVerificationStartViewModelType {
  }
 
  @objc private func keyVerificationRequestDidChange(notification: Notification) {
- guard let keyVerificationRequest = notification.object as? MXKeyVerificationByDMRequest else {
+ guard let keyVerificationRequest = notification.object as? MXKeyVerificationRequest else {
  return
  }