From ee51ed78be5a3094d2dd8c9b142a41817cdf04ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 23 Jul 2020 14:35:29 +0200
Subject: [PATCH] crypto: Allow users to check the SAS even after a mac event
 was received.

---
 matrix_sdk_crypto/src/verification/sas.rs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/matrix_sdk_crypto/src/verification/sas.rs b/matrix_sdk_crypto/src/verification/sas.rs
index 8162ffc6..ebc94f02 100644
--- a/matrix_sdk_crypto/src/verification/sas.rs
+++ b/matrix_sdk_crypto/src/verification/sas.rs
@@ -260,6 +260,7 @@ impl Sas<KeyReceived> {
             verification_flow_id: self.verification_flow_id,
             ids: self.ids,
             state: MacReceived {
+                we_started: self.state.we_started,
                 verified_devices: devices,
                 verified_master_keys: master_keys,
             },
@@ -305,6 +306,7 @@ impl Sas<Confirmed> {
 }
 
 struct MacReceived {
+    we_started: bool,
     verified_devices: Vec<Box<DeviceId>>,
     verified_master_keys: Vec<String>,
 }
@@ -321,6 +323,24 @@ impl Sas<MacReceived> {
             },
         }
     }
+
+    fn get_emoji(&self) -> Vec<(&'static str, &'static str)> {
+        get_emoji(
+            &self.inner,
+            &self.ids,
+            &self.verification_flow_id,
+            self.state.we_started,
+        )
+    }
+
+    fn get_decimal(&self) -> (u32, u32, u32) {
+        get_decimal(
+            &self.inner,
+            &self.ids,
+            &self.verification_flow_id,
+            self.state.we_started,
+        )
+    }
 }
 
 struct Done {
@@ -448,7 +468,7 @@ mod test {
         let event = wrap_to_device_event(bob.user_id(), bob.get_mac_event_content());
 
         let alice = alice.into_mac_received(&event);
-        // assert!(!alice.get_emoji().is_empty());
+        assert!(!alice.get_emoji().is_empty());
         let alice = alice.confirm();
 
         let event = wrap_to_device_event(alice.user_id(), alice.get_mac_event_content());