ui: Remove the e2e-encryption feature from the matrix-sdk-ui crate

It does not make much sense to create an UI client that does not support
end-to-end encryption, besides disabling the feature was broken for
quite some time.

Author: poljar

bindings/matrix-sdk-ffi/Cargo.toml

@@ -28,7 +28,7 @@ eyeball-im = { workspace = true }
 extension-trait = "1.0.1"
 futures-util = { workspace = true }
 log-panics = { version = "2", features = ["with-backtrace"] }
-matrix-sdk-ui = { workspace = true, features = ["e2e-encryption", "uniffi"] }
+matrix-sdk-ui = { workspace = true, features = ["uniffi"] }
 mime = "0.3.16"
 once_cell = { workspace = true }
 ruma = { workspace = true, features = ["html", "unstable-unspecified", "unstable-msc3488", "compat-unset-avatar", "unstable-msc3245-v1-compat"] }

crates/matrix-sdk-ui/Cargo.toml

@@ -8,9 +8,7 @@ license = "Apache-2.0"
 rust-version = { workspace = true }
 
 [features]
-default = ["e2e-encryption", "native-tls"]
-
-e2e-encryption = ["matrix-sdk/e2e-encryption"]
+default = ["native-tls"]
 
 native-tls = ["matrix-sdk/native-tls"]
 rustls-tls = ["matrix-sdk/rustls-tls"]
@@ -37,7 +35,7 @@ growable-bloom-filter = { workspace = true }
 imbl = { workspace = true, features = ["serde"] }
 indexmap = "2.0.0"
 itertools = { workspace = true }
-matrix-sdk = { workspace = true, features = ["experimental-sliding-sync"] }
+matrix-sdk = { workspace = true, features = ["experimental-sliding-sync", "e2e-encryption"] }
 matrix-sdk-base = { workspace = true }
 mime = "0.3.16"
 once_cell = { workspace = true }

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

@@ -24,10 +24,9 @@ use ruma::{events::AnySyncTimelineEvent, RoomVersionId};
 use tokio::sync::broadcast::error::RecvError;
 use tracing::{info, info_span, trace, warn, Instrument, Span};
 
-#[cfg(feature = "e2e-encryption")]
-use super::to_device::{handle_forwarded_room_key_event, handle_room_key_event};
 use super::{
     controller::{TimelineController, TimelineSettings},
+    to_device::{handle_forwarded_room_key_event, handle_room_key_event},
     Error, Timeline, TimelineDropHandle, TimelineFocus,
 };
 use crate::{
@@ -330,23 +329,17 @@ impl TimelineBuilder {
         // Not using room.add_event_handler here because RoomKey events are
         // to-device events that are not received in the context of a room.
 
-        #[cfg(feature = "e2e-encryption")]
         let room_key_handle = client.add_event_handler(handle_room_key_event(
             controller.clone(),
             room.room_id().to_owned(),
         ));
-        #[cfg(feature = "e2e-encryption")]
+
         let forwarded_room_key_handle = client.add_event_handler(handle_forwarded_room_key_event(
             controller.clone(),
             room.room_id().to_owned(),
         ));
 
-        let handles = vec![
-            #[cfg(feature = "e2e-encryption")]
-            room_key_handle,
-            #[cfg(feature = "e2e-encryption")]
-            forwarded_room_key_handle,
-        ];
+        let handles = vec![room_key_handle, forwarded_room_key_handle];
 
         let room_key_from_backups_join_handle = {
             let inner = controller.clone();
@@ -391,7 +384,6 @@ impl TimelineBuilder {
             }),
         };
 
-        #[cfg(feature = "e2e-encryption")]
         if has_events {
             // The events we're injecting might be encrypted events, but we might
             // have received the room key to decrypt them while nobody was listening to the

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

@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(feature = "e2e-encryption")]
-use std::collections::BTreeSet;
-use std::{fmt, sync::Arc};
+use std::{collections::BTreeSet, fmt, sync::Arc};
 
 use as_variant::as_variant;
 use eyeball_im::{ObservableVectorEntry, VectorDiff};
 use eyeball_im_util::vector::VectorObserverExt;
 use futures_core::Stream;
 use imbl::Vector;
-#[cfg(all(test, feature = "e2e-encryption"))]
+#[cfg(test)]
 use matrix_sdk::crypto::OlmMachine;
 use matrix_sdk::{
     deserialized_responses::SyncTimelineEvent,
@@ -31,10 +29,6 @@ use matrix_sdk::{
     },
     Result, Room,
 };
-#[cfg(test)]
-use ruma::events::receipt::ReceiptEventContent;
-#[cfg(all(test, feature = "e2e-encryption"))]
-use ruma::RoomId;
 use ruma::{
     api::client::receipt::create_receipt::v3::ReceiptType as SendReceiptType,
     events::{
@@ -50,21 +44,21 @@ use ruma::{
     EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedTransactionId, RoomVersionId,
     TransactionId, UserId,
 };
+#[cfg(test)]
+use ruma::{events::receipt::ReceiptEventContent, RoomId};
 use tokio::sync::{RwLock, RwLockWriteGuard};
-use tracing::{debug, error, field::debug, info, instrument, trace, warn};
-#[cfg(feature = "e2e-encryption")]
-use tracing::{field, info_span, Instrument as _};
+use tracing::{
+    debug, error, field, field::debug, info, info_span, instrument, trace, warn, Instrument as _,
+};
 
 pub(super) use self::state::{
     EventMeta, FullEventMeta, TimelineEnd, TimelineMetadata, TimelineState,
     TimelineStateTransaction,
 };
-#[cfg(feature = "e2e-encryption")]
-use super::traits::Decryptor;
 use super::{
     event_handler::TimelineEventKind,
     event_item::{ReactionStatus, RemoteEventOrigin},
-    traits::RoomDataProvider,
+    traits::{Decryptor, RoomDataProvider},
     util::{rfind_event_by_id, rfind_event_item, RelativePosition},
     Error, EventSendState, EventTimelineItem, InReplyToDetails, Message, PaginationError, Profile,
     ReactionInfo, RepliedToEvent, TimelineDetails, TimelineEventItemId, TimelineFocus,
@@ -939,7 +933,6 @@ impl<P: RoomDataProvider> TimelineController<P> {
         true
     }
 
-    #[cfg(feature = "e2e-encryption")]
     #[instrument(skip(self, room), fields(room_id = ?room.room_id()))]
     pub(super) async fn retry_event_decryption(
         &self,
@@ -949,7 +942,7 @@ impl<P: RoomDataProvider> TimelineController<P> {
         self.retry_event_decryption_inner(room.to_owned(), session_ids).await
     }
 
-    #[cfg(all(test, feature = "e2e-encryption"))]
+    #[cfg(test)]
     pub(super) async fn retry_event_decryption_test(
         &self,
         room_id: &RoomId,
@@ -959,7 +952,6 @@ impl<P: RoomDataProvider> TimelineController<P> {
         self.retry_event_decryption_inner((olm_machine, room_id.to_owned()), session_ids).await
     }
 
-    #[cfg(feature = "e2e-encryption")]
     async fn retry_event_decryption_inner(
         &self,
         decryptor: impl Decryptor,

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

@@ -198,7 +198,6 @@ impl TimelineState {
         txn.commit();
     }
 
-    #[cfg(feature = "e2e-encryption")]
     pub(super) async fn retry_event_decryption<P: RoomDataProvider, Fut>(
         &mut self,
         retry_one: impl Fn(Arc<TimelineItem>) -> Fut,
@@ -635,7 +634,6 @@ impl TimelineStateTransaction<'_> {
                 self.meta.all_events.push_back(event_meta.base_meta());
             }
 
-            #[cfg(feature = "e2e-encryption")]
             TimelineItemPosition::Update(_) => {
                 if let Some(event) =
                     self.meta.all_events.iter_mut().find(|e| e.event_id == event_meta.event_id)

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

@@ -234,7 +234,6 @@ pub(super) enum TimelineItemPosition {
     /// A single item is updated.
     ///
     /// This only happens when a UTD must be replaced with the decrypted event.
-    #[cfg(feature = "e2e-encryption")]
     Update(usize),
 }
 
@@ -249,7 +248,6 @@ pub(super) struct HandleEventResult {
     ///
     /// This can happen only if there was a UTD item that has been decrypted
     /// into an item that was filtered out with the event filter.
-    #[cfg(feature = "e2e-encryption")]
     pub(super) item_removed: bool,
 
     /// How many items were updated?
@@ -433,7 +431,6 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
         if !self.result.item_added {
             trace!("No new item added");
 
-            #[cfg(feature = "e2e-encryption")]
             if let Flow::Remote { position: TimelineItemPosition::Update(idx), .. } = self.ctx.flow
             {
                 // If add was not called, that means the UTD event is one that
@@ -821,7 +818,6 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
                     | TimelineItemPosition::End { origin } => origin,
 
                     // For updates, reuse the origin of the encrypted event.
-                    #[cfg(feature = "e2e-encryption")]
                     TimelineItemPosition::Update(idx) => self.items[idx]
                         .as_event()
                         .and_then(|ev| Some(ev.as_remote()?.origin))
@@ -966,7 +962,6 @@ impl<'a, 'o> TimelineEventHandler<'a, 'o> {
                 }
             }
 
-            #[cfg(feature = "e2e-encryption")]
             Flow::Remote { position: TimelineItemPosition::Update(idx), .. } => {
                 trace!("Updating timeline item at position {idx}");
                 let id = self.items[*idx].internal_id.clone();

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

@@ -89,7 +89,6 @@ pub(in crate::timeline) enum RemoteEventOrigin {
     /// The event came from pagination.
     Pagination,
     /// We don't know.
-    #[cfg(feature = "e2e-encryption")]
     Unknown,
 }
 

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

@@ -76,7 +76,6 @@ mod reactions;
 mod read_receipts;
 #[cfg(test)]
 mod tests;
-#[cfg(feature = "e2e-encryption")]
 mod to_device;
 mod traits;
 mod util;
@@ -217,7 +216,6 @@ impl Timeline {
     /// }
     /// # anyhow::Ok(()) };
     /// ```
-    #[cfg(feature = "e2e-encryption")]
     pub async fn retry_decryption<S: Into<String>>(
         &self,
         session_ids: impl IntoIterator<Item = S>,
@@ -230,7 +228,6 @@ impl Timeline {
             .await;
     }
 
-    #[cfg(feature = "e2e-encryption")]
     #[tracing::instrument(skip(self))]
     async fn retry_decryption_for_all_events(&self) {
         self.controller.retry_event_decryption(self.room(), None).await;

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

@@ -68,7 +68,6 @@ use crate::{
 mod basic;
 mod echo;
 mod edit;
-#[cfg(feature = "e2e-encryption")]
 mod encryption;
 mod event_filter;
 mod invalid;

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

@@ -329,7 +329,6 @@ async fn test_read_receipts_updates_on_back_paginated_filtered_events() {
     assert_pending!(stream);
 }
 
-#[cfg(feature = "e2e-encryption")]
 #[async_test]
 async fn test_read_receipts_updates_on_message_decryption() {
     use std::{io::Cursor, iter};

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

@@ -16,21 +16,21 @@ use std::future::Future;
 
 use futures_util::FutureExt as _;
 use indexmap::IndexMap;
-#[cfg(all(test, feature = "e2e-encryption"))]
+#[cfg(test)]
 use matrix_sdk::crypto::{DecryptionSettings, TrustRequirement};
-#[cfg(feature = "e2e-encryption")]
-use matrix_sdk::{deserialized_responses::TimelineEvent, Result};
-use matrix_sdk::{event_cache::paginator::PaginableRoom, BoxFuture, Room};
+use matrix_sdk::{
+    deserialized_responses::TimelineEvent, event_cache::paginator::PaginableRoom, BoxFuture,
+    Result, Room,
+};
 use matrix_sdk_base::latest_event::LatestEvent;
-#[cfg(feature = "e2e-encryption")]
-use ruma::{events::AnySyncTimelineEvent, serde::Raw};
 use ruma::{
     events::{
         fully_read::FullyReadEventContent,
         receipt::{Receipt, ReceiptThread, ReceiptType},
-        AnyMessageLikeEventContent,
+        AnyMessageLikeEventContent, AnySyncTimelineEvent,
     },
     push::{PushConditionRoomCtx, Ruleset},
+    serde::Raw,
     EventId, OwnedEventId, OwnedTransactionId, OwnedUserId, RoomVersionId, UserId,
 };
 use tracing::{debug, error};
@@ -275,22 +275,20 @@ impl RoomDataProvider for Room {
 
 // Internal helper to make most of retry_event_decryption independent of a room
 // object, which is annoying to create for testing and not really needed
-#[cfg(feature = "e2e-encryption")]
 pub(super) trait Decryptor: Clone + Send + Sync + 'static {
     fn decrypt_event_impl(
         &self,
         raw: &Raw<AnySyncTimelineEvent>,
     ) -> impl Future<Output = Result<TimelineEvent>> + Send;
 }
 
-#[cfg(feature = "e2e-encryption")]
 impl Decryptor for Room {
     async fn decrypt_event_impl(&self, raw: &Raw<AnySyncTimelineEvent>) -> Result<TimelineEvent> {
         self.decrypt_event(raw.cast_ref()).await
     }
 }
 
-#[cfg(all(test, feature = "e2e-encryption"))]
+#[cfg(test)]
 impl Decryptor for (matrix_sdk_base::crypto::OlmMachine, ruma::OwnedRoomId) {
     async fn decrypt_event_impl(&self, raw: &Raw<AnySyncTimelineEvent>) -> Result<TimelineEvent> {
         let (olm_machine, room_id) = self;

crates/matrix-sdk-ui/tests/integration/encryption_sync_service.rs

@@ -2,6 +2,7 @@ use std::sync::{Arc, Mutex};
 
 use futures_util::{pin_mut, StreamExt as _};
 use matrix_sdk::test_utils::logged_in_client_with_server;
+use matrix_sdk_base::crypto::store::Changes;
 use matrix_sdk_test::async_test;
 use matrix_sdk_ui::encryption_sync_service::{
     EncryptionSyncPermit, EncryptionSyncService, WithLocking,
@@ -291,18 +292,14 @@ async fn test_encryption_sync_always_reloads_todevice_token() -> anyhow::Result<
     // This encryption sync now conceptually goes to sleep, and another encryption
     // sync starts in another process, runs a sync and changes the to-device
     // token cached on disk.
-    #[cfg(feature = "e2e-encryption")]
-    {
-        use matrix_sdk_base::crypto::store::Changes;
-        if let Some(olm_machine) = &*client.olm_machine_for_testing().await {
-            olm_machine
-                .store()
-                .save_changes(Changes {
-                    next_batch_token: Some("nb2".to_owned()),
-                    ..Default::default()
-                })
-                .await?;
-        }
+    if let Some(olm_machine) = &*client.olm_machine_for_testing().await {
+        olm_machine
+            .store()
+            .save_changes(Changes {
+                next_batch_token: Some("nb2".to_owned()),
+                ..Default::default()
+            })
+            .await?;
     }
 
     // Next iteration must have reloaded the latest to-device token.