refactor(crypto): Use the session ID stored in RemoteEventTimelineItem to decide what to redecrypt

In future commits this will allow us to redecrypt more messages when we
get an update, not just UTDs. This should help us update warnings on
messages when we get new information e.g. about whether a device is
verified.

Author: andybalaam

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

@@ -1049,8 +1049,6 @@ impl<P: RoomDataProvider> TimelineController<P> {
         decryptor: impl Decryptor,
         session_ids: Option<BTreeSet<String>>,
     ) {
-        use super::EncryptedMessage;
-
         let mut state = self.state.clone().write_owned().await;
 
         let should_retry = move |session_id: &str| {
@@ -1065,15 +1063,12 @@ impl<P: RoomDataProvider> TimelineController<P> {
             .items
             .iter()
             .enumerate()
-            .filter_map(|(idx, item)| match item.as_event()?.content().as_unable_to_decrypt()? {
-                EncryptedMessage::MegolmV1AesSha2 { session_id, .. }
-                    if should_retry(session_id) =>
-                {
+            .filter_map(|(idx, item)| {
+                if should_retry(item.as_event()?.as_remote()?.session_id.as_ref()?) {
                     Some(idx)
+                } else {
+                    None
                 }
-                EncryptedMessage::MegolmV1AesSha2 { .. }
-                | EncryptedMessage::OlmV1Curve25519AesSha2 { .. }
-                | EncryptedMessage::Unknown => None,
             })
             .collect();
 
@@ -1096,16 +1091,14 @@ impl<P: RoomDataProvider> TimelineController<P> {
                 async move {
                     let event_item = item.as_event()?;
 
-                    let session_id = match event_item.content().as_unable_to_decrypt()? {
-                        EncryptedMessage::MegolmV1AesSha2 { session_id, .. }
-                            if should_retry(session_id) =>
-                        {
-                            session_id
-                        }
-                        EncryptedMessage::MegolmV1AesSha2 { .. }
-                        | EncryptedMessage::OlmV1Curve25519AesSha2 { .. }
-                        | EncryptedMessage::Unknown => return None,
-                    };
+                    let session_id =
+                        event_item.as_remote()?.session_id.as_ref().and_then(|session_id| {
+                            if should_retry(session_id) {
+                                Some(session_id)
+                            } else {
+                                None
+                            }
+                        });
 
                     tracing::Span::current().record("session_id", session_id);