fix(crypto): Redecrypt non-UTD messages to remove no-longer-relevant warning shields

crates/matrix-sdk-ui/src/timeline/tests/mod.rs

@@ -414,4 +414,12 @@ impl RoomDataProvider for TestRoomDataProvider {
         let info = RoomInfo::new(*DEFAULT_TEST_ROOM_ID, RoomState::Joined);
         SharedObservable::new(info).subscribe()
     }
+
+    async fn get_encryption_info(
+        &self,
+        _session_id: &str,
+        _sender: &UserId,
+    ) -> Option<matrix_sdk::deserialized_responses::EncryptionInfo> {
+        None
+    }
 }

crates/matrix-sdk-ui/src/timeline/traits.rs

@@ -19,8 +19,10 @@ use indexmap::IndexMap;
 #[cfg(test)]
 use matrix_sdk::crypto::{DecryptionSettings, RoomEventDecryptionResult, TrustRequirement};
 use matrix_sdk::{
-    crypto::types::events::CryptoContextInfo, deserialized_responses::TimelineEvent,
-    event_cache::paginator::PaginableRoom, AsyncTraitDeps, Result, Room, SendOutsideWasm,
+    crypto::types::events::CryptoContextInfo,
+    deserialized_responses::{EncryptionInfo, TimelineEvent},
+    event_cache::paginator::PaginableRoom,
+    AsyncTraitDeps, Result, Room, SendOutsideWasm,
 };
 use matrix_sdk_base::{latest_event::LatestEvent, RoomInfo};
 use ruma::{
@@ -121,6 +123,12 @@ pub(super) trait RoomDataProvider:
     ) -> impl Future<Output = Result<(), super::Error>> + SendOutsideWasm + 'a;
 
     fn room_info(&self) -> Subscriber<RoomInfo>;
+
+    fn get_encryption_info(
+        &self,
+        session_id: &str,
+        sender: &UserId,
+    ) -> impl Future<Output = Option<EncryptionInfo>> + SendOutsideWasm;
 }
 
 impl RoomDataProvider for Room {
@@ -273,6 +281,14 @@ impl RoomDataProvider for Room {
     fn room_info(&self) -> Subscriber<RoomInfo> {
         self.subscribe_info()
     }
+
+    async fn get_encryption_info(
+        &self,
+        session_id: &str,
+        sender: &UserId,
+    ) -> Option<EncryptionInfo> {
+        self.get_encryption_info(session_id, sender).await
+    }
 }
 
 // Internal helper to make most of retry_event_decryption independent of a room

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

@@ -32,10 +32,13 @@ use futures_util::{
 use http::StatusCode;
 #[cfg(all(feature = "e2e-encryption", not(target_arch = "wasm32")))]
 pub use identity_status_changes::IdentityStatusChanges;
-#[cfg(feature = "e2e-encryption")]
-use matrix_sdk_base::crypto::{DecryptionSettings, RoomEventDecryptionResult};
 #[cfg(all(feature = "e2e-encryption", not(target_arch = "wasm32")))]
 use matrix_sdk_base::crypto::{IdentityStatusChange, RoomIdentityProvider, UserIdentity};
+#[cfg(feature = "e2e-encryption")]
+use matrix_sdk_base::{
+    crypto::{DecryptionSettings, RoomEventDecryptionResult},
+    deserialized_responses::EncryptionInfo,
+};
 use matrix_sdk_base::{
     deserialized_responses::{
         RawAnySyncOrStrippedState, RawSyncOrStrippedState, SyncOrStrippedState,
@@ -1308,6 +1311,23 @@ impl Room {
         Ok(event)
     }
 
+    /// Fetches the [`EncryptionInfo`] for the supplied session_id.
+    ///
+    /// This may be used when we receive an update for a session, and we want to
+    /// reflect the changes in messages we have received that were encrypted
+    /// with that session, e.g. to remove a warning shield because a device is
+    /// now verified.
+    #[cfg(feature = "e2e-encryption")]
+    pub async fn get_encryption_info(
+        &self,
+        session_id: &str,
+        sender: &UserId,
+    ) -> Option<EncryptionInfo> {
+        let machine = self.client.olm_machine().await;
+        let machine = machine.as_ref()?;
+        machine.get_session_encryption_info(self.room_id(), session_id, sender).await.ok()
+    }
+
     /// Forces the currently active room key, which is used to encrypt messages,
     /// to be rotated.
     ///