chore: fixes and formatting

Signed-off-by: Skye Elliot <[email protected]>

Author: kaylendog

crates/matrix-sdk-base/src/response_processors/room/msc4186/mod.rs

@@ -118,6 +118,7 @@ pub async fn update_any_room(
         ambiguity_cache,
         &mut new_user_ids,
         state_store,
+        #[cfg(feature = "e2e-encryption")]
         e2ee.clone(),
     )
     .await?;

crates/matrix-sdk-base/src/response_processors/room/sync_v2.rs

@@ -192,6 +192,7 @@ pub async fn update_left_room(
         ambiguity_cache,
         &mut (),
         state_store,
+        #[cfg(feature = "e2e-encryption")]
         e2ee.clone(),
     )
     .await?;
@@ -206,6 +207,7 @@ pub async fn update_left_room(
         ambiguity_cache,
         &mut (),
         state_store,
+        #[cfg(feature = "e2e-encryption")]
         e2ee.clone(),
     )
     .await?;

crates/matrix-sdk-base/src/response_processors/state_events.rs

@@ -158,7 +158,8 @@ pub mod sync {
                             room_info.handle_state_event(
                                 &room_event
                                     .event
-                                    // TODO: UNSAFE CAST - someone evil could encrypt something that isn't a state event.
+                                    // TODO: UNSAFE CAST - someone evil could encrypt something that
+                                    // isn't a state event.
                                     .deserialize_as_unchecked::<AnySyncStateEvent>()
                                     .unwrap(),
                             );

crates/matrix-sdk-base/src/room/encryption.rs

@@ -33,11 +33,11 @@ impl Room {
 #[derive(Debug)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 pub enum EncryptionState {
-    /// The room is encrypted.
+    /// The room is encrypted, not including state events.
     Encrypted,
 
-    /// The room is encrypted, along with state events.
-    EncryptedState,
+    /// The room is encrypted, including state events.
+    StateEncrypted,
 
     /// The room is not encrypted.
     NotEncrypted,
@@ -48,9 +48,16 @@ pub enum EncryptionState {
 }
 
 impl EncryptionState {
-    /// Check whether `EncryptionState` is [`Encrypted`][Self::Encrypted].
+    /// Check whether `EncryptionState` is [`Encrypted`][Self::Encrypted] or
+    /// [`StateEncrypted`][Self::StateEncrypted].
     pub fn is_encrypted(&self) -> bool {
-        matches!(self, Self::Encrypted | Self::EncryptedState)
+        matches!(self, Self::Encrypted | Self::StateEncrypted)
+    }
+
+    /// Check whether `EncryptionState` is
+    /// [`StateEncrypted`][Self::StateEncrypted].
+    pub fn is_state_encrypted(&self) -> bool {
+        matches!(self, Self::StateEncrypted)
     }
 
     /// Check whether `EncryptionState` is [`Unknown`][Self::Unknown].
@@ -153,12 +160,12 @@ mod tests {
     fn test_encryption_state() {
         assert!(EncryptionState::Unknown.is_unknown());
         assert!(EncryptionState::Encrypted.is_unknown().not());
-        assert!(EncryptionState::EncryptedState.is_unknown().not());
+        assert!(EncryptionState::StateEncrypted.is_unknown().not());
         assert!(EncryptionState::NotEncrypted.is_unknown().not());
 
         assert!(EncryptionState::Unknown.is_encrypted().not());
         assert!(EncryptionState::Encrypted.is_encrypted());
-        assert!(EncryptionState::EncryptedState.is_encrypted());
+        assert!(EncryptionState::StateEncrypted.is_encrypted());
         assert!(EncryptionState::NotEncrypted.is_encrypted().not());
     }
 }

crates/matrix-sdk/src/room/futures.rs

@@ -420,7 +420,7 @@ impl<'a> IntoFuture for SendStateEventRaw<'a> {
             let mut state_key = state_key.to_owned();
 
             #[cfg(feature = "e2e-encryption")]
-            if room.latest_encryption_state().await?.is_encrypted() {
+            if room.latest_encryption_state().await?.is_state_encrypted() {
                 if matches!(
                     event_type,
                     "m.room.create"

crates/matrix-sdk/src/room/mod.rs

@@ -647,7 +647,8 @@ impl Room {
                 SyncStateEvent::Original(_)
             )))
         ) {
-            // Cast safety: The state key is not used during decryption, and the types overlap sufficiently.
+            // Cast safety: The state key is not used during decryption, and the types
+            // overlap sufficiently.
             if let Ok(event) = self.decrypt_event(event.cast_ref_unchecked(), push_ctx).await {
                 return event;
             }
@@ -811,7 +812,8 @@ impl Room {
     /// Request to update the encryption state for this room.
     ///
     /// It does nothing if the encryption state is already
-    /// [`EncryptionState::Encrypted`], [`EncryptionState::EncryptedState`], or [`EncryptionState::NotEncrypted`].
+    /// [`EncryptionState::Encrypted`], [`EncryptionState::StateEncrypted`], or
+    /// [`EncryptionState::NotEncrypted`].
     pub async fn request_encryption_state(&self) -> Result<()> {
         if !self.inner.encryption_state().is_unknown() {
             return Ok(());

crates/matrix-sdk/src/test_utils/mod.rs

@@ -266,8 +266,8 @@ macro_rules! assert_decrypted_message_eq {
     }};
 }
 
-/// Given a [`TimelineEvent`], assert that the event was decrypted and that its content
-/// matches the given pattern.
+/// Given a [`TimelineEvent`], assert that the event is an encrypted state
+/// event, and that its content matches the given pattern via a let binding.
 #[macro_export]
 macro_rules! assert_let_decrypted_state_event_content {
     ($pat:pat = $event:expr, $($msg:tt)*) => {