Sliding Sync timeline events and extensions

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

@@ -418,7 +418,7 @@ impl OlmMachine {
         key_counts: HashMap<String, i32>,
         unused_fallback_keys: Option<Vec<String>>,
     ) -> Result<String, CryptoStoreError> {
-        let events: ToDevice = serde_json::from_str(events)?;
+        let to_device: ToDevice = serde_json::from_str(events)?;
         let device_changes: RumaDeviceLists = device_changes.into();
         let key_counts: BTreeMap<DeviceKeyAlgorithm, UInt> = key_counts
             .into_iter()
@@ -436,7 +436,7 @@ impl OlmMachine {
             unused_fallback_keys.map(|u| u.into_iter().map(DeviceKeyAlgorithm::from).collect());
 
         let events = self.runtime.block_on(self.inner.receive_sync_changes(
-            events,
+            to_device.events,
             &device_changes,
             &key_counts,
             unused_fallback_keys.as_deref(),

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

@@ -19,7 +19,7 @@ use ruma::{
             },
         },
         message::send_message_event::v3::Response as RoomMessageResponse,
-        sync::sync_events::v3::DeviceLists as RumaDeviceLists,
+        sync::sync_events::DeviceLists as RumaDeviceLists,
         to_device::send_event_to_device::v3::Response as ToDeviceResponse,
     },
     assign,

bindings/matrix-sdk-crypto-js/src/sync_events.rs

@@ -9,7 +9,7 @@ use crate::{identifiers, js::downcast};
 #[wasm_bindgen]
 #[derive(Debug)]
 pub struct DeviceLists {
-    pub(crate) inner: ruma::api::client::sync::sync_events::v3::DeviceLists,
+    pub(crate) inner: ruma::api::client::sync::sync_events::DeviceLists,
 }
 
 #[wasm_bindgen]
@@ -19,7 +19,7 @@ impl DeviceLists {
     /// `changed` and `left` must be an array of `UserId`.
     #[wasm_bindgen(constructor)]
     pub fn new(changed: Option<Array>, left: Option<Array>) -> Result<DeviceLists, JsError> {
-        let mut inner = ruma::api::client::sync::sync_events::v3::DeviceLists::default();
+        let mut inner = ruma::api::client::sync::sync_events::DeviceLists::default();
 
         inner.changed = changed
             .unwrap_or_default()