mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-17 21:20:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(matrix-sdk): room::Common:event() don't return decryption error

Browse Source
This commit is contained in:
Julian Sparber
2022-05-17 17:03:28 +02:00
committed by GitHub
parent 7d439b1697
commit 5bd7d17234
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/matrix-sdk/src/room/common.rs
View File

@@ -478,12 +478,15 @@ impl Common {
let event = self.client.send(request, None).await?.event;
#[cfg(feature = "e2e-encryption")]
if let AnySyncRoomEvent::MessageLike(AnySyncMessageLikeEvent::RoomEncrypted(
SyncMessageLikeEvent::Original(encrypted_event),
)) = event.deserialize_as::<AnySyncRoomEvent>()?
{
Ok(self.decrypt_event(&encrypted_event).await?)
} else {
if let Ok(AnySyncRoomEvent::MessageLike(AnySyncMessageLikeEvent::RoomEncrypted(
SyncMessageLikeEvent::Original(encrypted_event),
))) = event.deserialize_as::<AnySyncRoomEvent>()
{
if let Ok(event) = self.decrypt_event(&encrypted_event).await {
return Ok(event);
}
}
Ok(RoomEvent { event, encryption_info: None })
}