From 6fd129dcfaa501636e2f23e9381ad2fbad06e0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 5 Apr 2023 13:22:41 +0200 Subject: [PATCH] Remove some commented out code and fix some formatting --- crates/matrix-sdk-crypto/src/identities/device.rs | 5 +---- crates/matrix-sdk-sqlite/src/crypto_store.rs | 11 +++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/identities/device.rs b/crates/matrix-sdk-crypto/src/identities/device.rs index c0b8b2fc3..2fd5583b0 100644 --- a/crates/matrix-sdk-crypto/src/identities/device.rs +++ b/crates/matrix-sdk-crypto/src/identities/device.rs @@ -452,10 +452,7 @@ impl Device { message: encrypted.cast(), }), - Err( - OlmError::MissingSession - | OlmError::EventError(EventError::MissingSenderKey) - ) => { + Err(OlmError::MissingSession | OlmError::EventError(EventError::MissingSenderKey)) => { Ok(MaybeEncryptedRoomKey::Withheld { code: WithheldCode::NoOlm }) } Err(e) => Err(e), diff --git a/crates/matrix-sdk-sqlite/src/crypto_store.rs b/crates/matrix-sdk-sqlite/src/crypto_store.rs index eb5597da1..1659fb7cd 100644 --- a/crates/matrix-sdk-sqlite/src/crypto_store.rs +++ b/crates/matrix-sdk-sqlite/src/crypto_store.rs @@ -280,11 +280,6 @@ trait SqliteConnectionExt { data: &[u8], ) -> rusqlite::Result<()>; - // fn get_direct_withheld_info( - // &self, - // session_id: Key, - // room_id: Key, - // ) -> rusqlite::Result>>; fn set_room_settings(&self, room_id: &[u8], data: &[u8]) -> rusqlite::Result<()>; } @@ -826,9 +821,9 @@ impl CryptoStore for SqliteCryptoStore { let session_id = self.encode_key("inbound_group_session", session_id); let Some((room_id_from_db, value)) = self.acquire().await?.get_inbound_group_session(session_id).await? - else { - return Ok(None); - }; + else { + return Ok(None); + }; let room_id = self.encode_key("inbound_group_session", room_id.as_bytes()); if *room_id != room_id_from_db {