From 89abb75d4ddc905f0e6de446db2c3c4481ca2aed Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Wed, 24 Apr 2024 12:16:17 +0100 Subject: [PATCH] crypto: Include UTD cause in FFI EncryptedMessage --- bindings/matrix-sdk-ffi/src/timeline/content.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/timeline/content.rs b/bindings/matrix-sdk-ffi/src/timeline/content.rs index de9302b7e..3c41525ae 100644 --- a/bindings/matrix-sdk-ffi/src/timeline/content.rs +++ b/bindings/matrix-sdk-ffi/src/timeline/content.rs @@ -14,7 +14,7 @@ use std::{collections::HashMap, sync::Arc}; -use matrix_sdk::room::power_levels::power_level_user_changes; +use matrix_sdk::{crypto::types::events::UtdCause, room::power_levels::power_level_user_changes}; use matrix_sdk_ui::timeline::{PollResult, TimelineDetails}; use tracing::warn; @@ -214,6 +214,10 @@ pub enum EncryptedMessage { MegolmV1AesSha2 { /// The ID of the session used to encrypt the message. session_id: String, + + /// What we know about what caused this UTD. E.g. was this event sent + /// when we were not a member of this room? + cause: UtdCause, }, Unknown, } @@ -227,9 +231,9 @@ impl EncryptedMessage { let sender_key = sender_key.clone(); Self::OlmV1Curve25519AesSha2 { sender_key } } - Message::MegolmV1AesSha2 { session_id, .. } => { + Message::MegolmV1AesSha2 { session_id, cause, .. } => { let session_id = session_id.clone(); - Self::MegolmV1AesSha2 { session_id } + Self::MegolmV1AesSha2 { session_id, cause: *cause } } Message::Unknown => Self::Unknown, }