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

Merge branch 'develop' into riot_2918

Browse Source 
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
This commit is contained in:
SBiOSoftWhare
2020-03-30 09:55:40 +02:00
parent eb940c29eb ba64f7a232
commit edd80b0493
6 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
View File

@@ -209,6 +209,7 @@ final class KeyVerificationVerifyByScanningViewModel: KeyVerificationVerifyBySca
}
guard self.keyVerificationRequest.requestId == transaction.transactionId else {
NSLog("[KeyVerificationVerifyByScanningViewModel] transactionDidStateChange: Not for our transaction (\(self.keyVerificationRequest.requestId)): \(transaction.transactionId)")
return
}