From b3941ca2543161fb48bc68362865cededc83e4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Fri, 21 Aug 2020 16:39:15 +0200
Subject: [PATCH] crypto: Verify user identities when we're the first one to
 confirm as well.

---
 matrix_sdk_crypto/src/verification/machine.rs | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/matrix_sdk_crypto/src/verification/machine.rs b/matrix_sdk_crypto/src/verification/machine.rs
index d71e85d8..e69d5e21 100644
--- a/matrix_sdk_crypto/src/verification/machine.rs
+++ b/matrix_sdk_crypto/src/verification/machine.rs
@@ -189,15 +189,19 @@ impl VerificationMachine {
                 if let Some(s) = self.get_sas(&e.content.transaction_id) {
                     self.receive_event_helper(&s, event);
 
-                    if s.is_done() && !s.mark_device_as_verified().await? {
-                        if let Some(r) = s.cancel() {
-                            self.outgoing_to_device_messages.insert(
-                                r.0,
-                                OutgoingRequest {
-                                    request_id: r.0,
-                                    request: Arc::new(r.1.into()),
-                                },
-                            );
+                    if s.is_done() {
+                        if !s.mark_device_as_verified().await? {
+                            if let Some(r) = s.cancel() {
+                                self.outgoing_to_device_messages.insert(
+                                    r.0,
+                                    OutgoingRequest {
+                                        request_id: r.0,
+                                        request: Arc::new(r.1.into()),
+                                    },
+                                );
+                            }
+                        } else {
+                            s.mark_identity_as_verified().await?;
                         }
                     }
                 };