Merge remote-tracking branch 'origin/complete_security_allow_device_verification_retry' into complete_security_allow_device_verification_retry

This commit is contained in:
manuroe
2020-09-25 10:14:27 +02:00
26 changed files with 1076 additions and 363 deletions
@@ -29,7 +29,7 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
private let session: MXSession
private let verificationFlow: KeyVerificationFlow
private let verificationKind: KeyVerificationKind
private var completeSecurityCoordinator: KeyVerificationSelfVerifyWaitCoordinatorType?
private weak var completeSecurityCoordinator: KeyVerificationSelfVerifyWaitCoordinatorType?
private var otherUserId: String {