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

Device Verification: Stay in infinite waiting

Browse source 
#2878

Don't stop listening to transaction updates if we receive unexpected events else you block the state machine.
This commit is contained in:
manuroe 2019-12-09 18:31:25 +01:00
parent 9069b19aaf
commit 0adf6067ac
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.rst
View file

@ -4,6 +4,9 @@ Changes in 0.10.4 (2019-xx-xx)
Improvements:
* ON/OFF Cross-signing development in a Lab setting (#2855).
Bug fix:
* Device Verification: Stay in infinite waiting (#2878).
Changes in 0.10.3 (2019-12-05)
===============================================

5
Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewModel.swift
View file

@ -115,21 +115,22 @@ final class DeviceVerificationStartViewModel: DeviceVerificationStartViewModelTy
guard let transaction = notification.object as? MXOutgoingSASTransaction else {
return
}
self.unregisterTransactionDidStateChangeNotification()
switch transaction.state {
case MXSASTransactionStateShowSAS:
self.unregisterTransactionDidStateChangeNotification()
self.coordinatorDelegate?.deviceVerificationStartViewModel(self, didCompleteWithOutgoingTransaction: transaction)
case MXSASTransactionStateCancelled:
guard let reason = transaction.reasonCancelCode else {
return
}
self.unregisterTransactionDidStateChangeNotification()
self.update(viewState: .cancelled(reason))
case MXSASTransactionStateCancelledByMe:
guard let reason = transaction.reasonCancelCode else {
return
}
self.unregisterTransactionDidStateChangeNotification()
self.update(viewState: .cancelledByMe(reason))
default:
break

5
Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewModel.swift
View file

@ -103,11 +103,6 @@ final class DeviceVerificationVerifyViewModel: DeviceVerificationVerifyViewModel
return
}
self.update(viewState: .error(error))
case MXSASTransactionStateCancelled:
guard let reason = transaction.reasonCancelCode else {
return
}
self.update(viewState: .cancelled(reason))
case MXSASTransactionStateCancelledByMe:
guard let reason = transaction.reasonCancelCode else {
return