sdk-ui: Add EncryptionState to RemoteEventTimelineItem

Author: richvdh

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

@@ -609,6 +609,7 @@ enum DayDividerInsertError {
 mod tests {
     use assert_matches2::assert_let;
     use eyeball_im::ObservableVector;
+    use matrix_sdk::deserialized_responses::EncryptionState;
     use ruma::{owned_event_id, owned_user_id, uint, MilliSecondsSinceUnixEpoch};
 
     use super::DayDividerAdjuster;
@@ -626,7 +627,7 @@ mod tests {
             read_receipts: Default::default(),
             is_own: false,
             is_highlighted: false,
-            encryption_info: None,
+            encryption_state: EncryptionState::Unencrypted,
             original_json: None,
             latest_edit_json: None,
             origin: crate::timeline::event_item::RemoteEventOrigin::Sync,

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

@@ -600,7 +600,7 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
         if let EventTimelineItemKind::Remote(remote_event) = &item.kind {
             if let Flow::Remote { encryption_state, .. } = &self.ctx.flow {
                 new_item = new_item.with_kind(EventTimelineItemKind::Remote(
-                    remote_event.with_encryption_info(encryption_state.as_encryption_info().cloned())
+                    remote_event.with_encryption_state(encryption_state.clone())
                 ));
             }
         }
@@ -950,7 +950,7 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
                     read_receipts: self.ctx.read_receipts.clone(),
                     is_own: self.ctx.is_own_event,
                     is_highlighted: self.ctx.is_highlighted,
-                    encryption_info: encryption_state.as_encryption_info().cloned(),
+                    encryption_state: encryption_state.clone(),
                     original_json: Some(raw_event.clone()),
                     latest_edit_json: None,
                     origin,

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

@@ -197,7 +197,7 @@ impl EventTimelineItem {
             read_receipts,
             is_own,
             is_highlighted,
-            encryption_info: encryption_state.as_encryption_info().cloned(),
+            encryption_state,
             original_json: Some(raw_sync_event),
             latest_edit_json,
             origin,
@@ -386,7 +386,9 @@ impl EventTimelineItem {
     pub fn encryption_info(&self) -> Option<&EncryptionInfo> {
         match &self.kind {
             EventTimelineItemKind::Local(_) => None,
-            EventTimelineItemKind::Remote(remote_event) => remote_event.encryption_info.as_ref(),
+            EventTimelineItemKind::Remote(remote_event) => {
+                remote_event.encryption_state.as_encryption_info()
+            }
         }
     }
 

crates/matrix-sdk-ui/src/timeline/event_item/remote.rs

@@ -15,7 +15,7 @@
 use std::fmt;
 
 use indexmap::IndexMap;
-use matrix_sdk::deserialized_responses::EncryptionInfo;
+use matrix_sdk::deserialized_responses::EncryptionState;
 use ruma::{
     events::{receipt::Receipt, AnySyncTimelineEvent},
     serde::Raw,
@@ -46,7 +46,7 @@ pub(in crate::timeline) struct RemoteEventTimelineItem {
     pub is_highlighted: bool,
 
     /// Encryption information.
-    pub encryption_info: Option<EncryptionInfo>,
+    pub encryption_state: EncryptionState,
 
     /// JSON of the original event.
     ///
@@ -68,9 +68,9 @@ pub(in crate::timeline) struct RemoteEventTimelineItem {
 }
 
 impl RemoteEventTimelineItem {
-    /// Clone the current event item, and update its `encryption_info`.
-    pub fn with_encryption_info(&self, encryption_info: Option<EncryptionInfo>) -> Self {
-        Self { encryption_info, ..self.clone() }
+    /// Clone the current event item, and update its `encryption_state`.
+    pub fn with_encryption_state(&self, encryption_state: EncryptionState) -> Self {
+        Self { encryption_state, ..self.clone() }
     }
 
     /// Clone the current event item, and redacts its fields.
@@ -101,7 +101,7 @@ impl fmt::Debug for RemoteEventTimelineItem {
             transaction_id,
             read_receipts,
             is_own,
-            encryption_info,
+            encryption_state,
             original_json: _,
             latest_edit_json: _,
             is_highlighted,
@@ -114,7 +114,7 @@ impl fmt::Debug for RemoteEventTimelineItem {
             .field("read_receipts", read_receipts)
             .field("is_own", is_own)
             .field("is_highlighted", is_highlighted)
-            .field("encryption_info", encryption_info)
+            .field("encryption_state", encryption_state)
             .field("origin", origin)
             .finish_non_exhaustive()
     }