crypto(verification): pass a copy of the other DeviceData in betwee…

…n the (Requested, Ready) and (Created, Ready) states
matrix-org · Oct 24, 2024 · 142d420 · 142d420
1 parent ef8d3f9
commit 142d420
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 92 deletions.
diff --git a/bindings/matrix-sdk-crypto-ffi/src/verification.rs b/bindings/matrix-sdk-crypto-ffi/src/verification.rs
@@ -752,7 +752,7 @@ impl VerificationRequest {
             RustVerificationRequestState::Ready {
                 their_methods,
                 our_methods,
-                other_device_id: _,
+                other_device_data: _,
             } => VerificationRequestState::Ready {
                 their_methods: their_methods.iter().map(|m| m.to_string()).collect(),
                 our_methods: our_methods.iter().map(|m| m.to_string()).collect(),

diff --git a/crates/matrix-sdk-crypto/src/verification/machine.rs b/crates/matrix-sdk-crypto/src/verification/machine.rs
@@ -412,7 +412,13 @@ impl VerificationMachine {
                 };
 
                 if request.flow_id() == &flow_id {
-                    request.receive_ready(event.sender(), c);
+                    if let Some(device_data) =
+                        self.store.get_device(event.sender(), c.from_device()).await?
+                    {
+                        request.receive_ready(event.sender(), c, device_data);
+                    } else {
+                        warn!("Could not retrieve the data for the accepting device, ignoring it");
+                    }
                 } else {
                     flow_id_mismatch();
                 }