Merge branch 'main' into async-callback-infrastructure

Signed-off-by: Daniel Salinas <[email protected]>

Author: zzorba

Cargo.lock

@@ -63,7 +63,7 @@ reqwest = { version = "0.12.12", default-features = false }
 rmp-serde = "1.3.0"
 # Be careful to use commits from the https://github.com/ruma/ruma/tree/ruma-0.12
 # branch until a proper release with breaking changes happens.
-ruma = { git = "https://github.com/ruma/ruma", rev = "689d9613a985edc089b5b729e6d9362f09b5df4f", features = [
+ruma = { git = "https://github.com/ruma/ruma", rev = "a8fd1b0322649bf59e2a5cfc73ab4fe46b21edd7", features = [
     "client-api-c",
     "compat-upload-signatures",
     "compat-user-id",
@@ -79,7 +79,9 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "689d9613a985edc089b5b729e6
     "unstable-msc4171",
     "unstable-msc4278",
     ] }
-ruma-common = { git = "https://github.com/ruma/ruma", rev = "689d9613a985edc089b5b729e6d9362f09b5df4f" }
+ruma-common = { git = "https://github.com/ruma/ruma", rev = "a8fd1b0322649bf59e2a5cfc73ab4fe46b21edd7" }
+sentry = "0.36.0"
+sentry-tracing = "0.36.0"
 serde = "1.0.217"
 serde_html_form = "0.2.7"
 serde_json = "1.0.138"
@@ -101,7 +103,7 @@ url = "2.5.4"
 uuid = "1.12.1"
 vodozemac = { version = "0.9.0", features = ["insecure-pk-encryption"] }
 wasm-bindgen = "0.2.84"
-wasm-bindgen-test = "0.3.33"
+wasm-bindgen-test = "0.3.50"
 web-sys = "0.3.69"
 wiremock = "0.6.2"
 zeroize = "1.8.1"

Cargo.toml

@@ -7,7 +7,7 @@ use matrix_sdk_base::{
 };
 use matrix_sdk_sqlite::SqliteStateStore;
 use matrix_sdk_test::{event_factory::EventFactory, JoinedRoomBuilder, StateTestEvent};
-use matrix_sdk_ui::{timeline::TimelineFocus, Timeline};
+use matrix_sdk_ui::timeline::{TimelineBuilder, TimelineFocus};
 use ruma::{
     api::client::membership::get_member_events,
     device_id,
@@ -182,7 +182,7 @@ pub fn load_pinned_events_benchmark(c: &mut Criterion) {
                 .await
                 .unwrap();
 
-            let timeline = Timeline::builder(&room)
+            let timeline = TimelineBuilder::new(&room)
                 .with_focus(TimelineFocus::PinnedEvents {
                     max_events_to_load: 100,
                     max_concurrent_requests: 10,

benchmarks/benches/room_bench.rs

@@ -1,7 +1,7 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use matrix_sdk::test_utils::mocks::MatrixMockServer;
 use matrix_sdk_test::{event_factory::EventFactory, JoinedRoomBuilder, StateTestEvent};
-use matrix_sdk_ui::Timeline;
+use matrix_sdk_ui::timeline::TimelineBuilder;
 use ruma::{
     events::room::message::RoomMessageEventContentWithoutRelation, owned_room_id, owned_user_id,
     EventId,
@@ -102,7 +102,7 @@ pub fn create_timeline_with_initial_events(c: &mut Criterion) {
         BenchmarkId::new("create_timeline_with_initial_events", format!("{NUM_EVENTS} events")),
         |b| {
             b.to_async(&runtime).iter(|| async {
-                let timeline = Timeline::builder(&room)
+                let timeline = TimelineBuilder::new(&room)
                     .track_read_marker_and_receipts()
                     .build()
                     .await

benchmarks/benches/timeline.rs

@@ -1337,7 +1337,8 @@ impl OlmMachine {
                 let (sas, request) = self.runtime.block_on(device.start_verification())?;
 
                 Some(StartSasResult {
-                    sas: Sas { inner: sas, runtime: self.runtime.handle().to_owned() }.into(),
+                    sas: Sas { inner: Box::new(sas), runtime: self.runtime.handle().to_owned() }
+                        .into(),
                     request: request.into(),
                 })
             } else {

bindings/matrix-sdk-crypto-ffi/src/machine.rs

@@ -224,8 +224,8 @@ impl From<&ToDeviceRequest> for Request {
     }
 }
 
-impl From<&RoomMessageRequest> for Request {
-    fn from(r: &RoomMessageRequest) -> Self {
+impl From<&Box<RoomMessageRequest>> for Request {
+    fn from(r: &Box<RoomMessageRequest>) -> Self {
         Self::RoomMessage {
             request_id: r.txn_id.to_string(),
             room_id: r.room_id.to_string(),

bindings/matrix-sdk-crypto-ffi/src/responses.rs

@@ -88,7 +88,7 @@ impl Verification {
     /// returns `None` if the verification is not a `Sas` verification.
     pub fn as_sas(&self) -> Option<Arc<Sas>> {
         if let InnerVerification::SasV1(sas) = &self.inner {
-            Some(Sas { inner: sas.to_owned(), runtime: self.runtime.to_owned() }.into())
+            Some(Sas { inner: sas.clone(), runtime: self.runtime.to_owned() }.into())
         } else {
             None
         }
@@ -98,7 +98,7 @@ impl Verification {
     /// returns `None` if the verification is not a `QrCode` verification.
     pub fn as_qr(&self) -> Option<Arc<QrCode>> {
         if let InnerVerification::QrV1(qr) = &self.inner {
-            Some(QrCode { inner: qr.to_owned(), runtime: self.runtime.to_owned() }.into())
+            Some(QrCode { inner: qr.clone(), runtime: self.runtime.to_owned() }.into())
         } else {
             None
         }
@@ -108,7 +108,7 @@ impl Verification {
 /// The `m.sas.v1` verification flow.
 #[derive(uniffi::Object)]
 pub struct Sas {
-    pub(crate) inner: InnerSas,
+    pub(crate) inner: Box<InnerSas>,
     pub(crate) runtime: Handle,
 }
 
@@ -324,7 +324,7 @@ impl From<QrVerificationState> for QrCodeState {
 /// verification flow.
 #[derive(uniffi::Object)]
 pub struct QrCode {
-    pub(crate) inner: InnerQr,
+    pub(crate) inner: Box<InnerQr>,
     pub(crate) runtime: Handle,
 }
 
@@ -669,7 +669,7 @@ impl VerificationRequest {
     ///   verification flow.
     pub fn start_sas_verification(&self) -> Result<Option<StartSasResult>, CryptoStoreError> {
         Ok(self.runtime.block_on(self.inner.start_sas())?.map(|(sas, r)| StartSasResult {
-            sas: Arc::new(Sas { inner: sas, runtime: self.runtime.clone() }),
+            sas: Arc::new(Sas { inner: Box::new(sas), runtime: self.runtime.clone() }),
             request: r.into(),
         }))
     }
@@ -690,7 +690,7 @@ impl VerificationRequest {
         Ok(self
             .runtime
             .block_on(self.inner.generate_qr_code())?
-            .map(|qr| QrCode { inner: qr, runtime: self.runtime.clone() }.into()))
+            .map(|qr| QrCode { inner: Box::new(qr), runtime: self.runtime.clone() }.into()))
     }
 
     /// Pass data from a scanned QR code to an active verification request and
@@ -717,7 +717,7 @@ impl VerificationRequest {
             let request = qr.reciprocate()?;
 
             Some(ScanResult {
-                qr: QrCode { inner: qr, runtime: self.runtime.clone() }.into(),
+                qr: QrCode { inner: Box::new(qr), runtime: self.runtime.clone() }.into(),
                 request: request.into(),
             })
         } else {

bindings/matrix-sdk-crypto-ffi/src/verification.rs

@@ -19,6 +19,8 @@ Breaking changes:
 
 Additions:
 
+- Support for adding a Sentry layer to the FFI bindings has been added. Only `tracing` statements with
+  the field `sentry=true` will be forwarded to Sentry, in addition to default Sentry filters.
 - Add room topic string to `StateEventContent`
 - Add `UploadSource` for representing upload data - this is analogous to `matrix_sdk_ui::timeline::AttachmentSource`
 - Add `Client::observe_account_data_event` and `Client::observe_room_account_data_event` to

bindings/matrix-sdk-ffi/CHANGELOG.md

@@ -37,6 +37,7 @@ 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", "unstable-msc4278"] }
+sentry-tracing = "0.36.0"
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -61,6 +62,32 @@ uniffi = { workspace = true, features = ["tokio"] }
 [target.'cfg(target_os = "android")'.dependencies]
 paranoid-android = "0.2.1"
 
+[target.'cfg(target_os = "android")'.dependencies.sentry]
+version = "0.36.0"
+default-features = false
+features = [
+    # TLS lib specific for Android.
+    "rustls",
+    # Most default features enabled otherwise.
+    "backtrace",
+    "contexts",
+    "panic",
+    "reqwest"
+]
+
+[target.'cfg(all(not(target_os = "android")), not(target_arch = "wasm32")))'.dependencies.sentry]
+version = "0.36.0"
+default-features = false
+features = [
+    # TLS lib used on non-Android platforms.
+    "native-tls",
+    # Most default features enabled otherwise.
+    "backtrace",
+    "contexts",
+    "panic",
+    "reqwest"
+]
+
 [target.'cfg(target_arch = "wasm32")'.dependencies.matrix-sdk]
 workspace = true
 features = [
@@ -74,7 +101,7 @@ features = [
     "uniffi",
 ]
 
-[target.'cfg(all(target_os = "android", not(target_arch = "wasm32")))'.dependencies.matrix-sdk]
+[target.'cfg(target_os = "android")'.dependencies.matrix-sdk]
 workspace = true
 features = [
     "anyhow",