From fa9c91fb0ea2ae823a4c05fc9f6759bdebeead4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Mon, 23 May 2022 16:25:39 +0200 Subject: [PATCH] fix(crypto-ffi): Add support to encrypt custom events --- crates/matrix-sdk-crypto-ffi/src/machine.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/matrix-sdk-crypto-ffi/src/machine.rs b/crates/matrix-sdk-crypto-ffi/src/machine.rs index fbd01ee4f..e87a971ba 100644 --- a/crates/matrix-sdk-crypto-ffi/src/machine.rs +++ b/crates/matrix-sdk-crypto-ffi/src/machine.rs @@ -32,7 +32,7 @@ use ruma::{ }, events::{ key::verification::VerificationMethod, room::encrypted::OriginalSyncRoomEncryptedEvent, - AnyMessageLikeEventContent, AnySyncMessageLikeEvent, EventContent, + AnySyncMessageLikeEvent, }, DeviceKeyAlgorithm, EventId, OwnedTransactionId, OwnedUserId, RoomId, UserId, }; @@ -518,12 +518,11 @@ impl OlmMachine { content: &str, ) -> Result { let room_id = RoomId::parse(room_id)?; - let content: Box = serde_json::from_str(content)?; + let content: Value = serde_json::from_str(content)?; - let content = AnyMessageLikeEventContent::from_parts(event_type, &content)?; let encrypted_content = self .runtime - .block_on(self.inner.encrypt_room_event(&room_id, content)) + .block_on(self.inner.encrypt_room_event_raw(&room_id, content, event_type)) .expect("Encrypting an event produced an error"); Ok(serde_json::to_string(&encrypted_content)?)