ffi: Remove sliding sync things from UDL

bindings/matrix-sdk-ffi/src/api.udl

@@ -23,15 +23,6 @@ dictionary NotificationItem {
 
 interface TimelineEvent {};
 
-dictionary UpdateSummary {
-    sequence<string> lists;
-    sequence<string> rooms;
-};
-
-callback interface SlidingSyncObserver {
-    void did_receive_sync_update(UpdateSummary summary);
-};
-
 enum SlidingSyncState {
     /// Sliding Sync has not started to load anything yet.
     "NotLoaded",
@@ -46,50 +37,6 @@ enum SlidingSyncState {
     "FullyLoaded",
 };
 
-callback interface SlidingSyncListStateObserver {
-    void did_receive_update(SlidingSyncState new_state);
-};
-
-// Used by `SlidingSync` _and_ `RoomList`. Be careful.
-[Enum]
-interface RoomListEntry {
-    Empty();
-    Invalidated(string room_id);
-    Filled(string room_id);
-};
-
-[Enum]
-interface SlidingSyncListRoomsListDiff {
-    Append(sequence<RoomListEntry> values);
-    Insert(u32 index, RoomListEntry value);
-    Set(u32 index, RoomListEntry value);
-    Remove(u32 index);
-    PushBack(RoomListEntry value);
-    PushFront(RoomListEntry value);
-    PopBack();
-    PopFront();
-    Clear();
-    Reset(sequence<RoomListEntry> values);
-};
-
-callback interface SlidingSyncListRoomListObserver {
-    void did_receive_update(SlidingSyncListRoomsListDiff diff);
-};
-
-callback interface SlidingSyncListRoomsCountObserver {
-    void did_receive_update(u32 count);
-};
-
-callback interface SlidingSyncListRoomItemsObserver {
-    void did_receive_update();
-};
-
-interface SlidingSyncList {};
-
-callback interface SlidingSyncListOnceBuilt {
-    SlidingSyncList update_list(SlidingSyncList list);
-};
-
 dictionary CreateRoomParameters {
     string? name;
     string? topic = null;

bindings/matrix-sdk-ffi/src/lib.rs

@@ -38,11 +38,14 @@ mod timeline;
 mod tracing;
 
 use async_compat::TOKIO1 as RUNTIME;
-use matrix_sdk::ruma::events::room::{message::RoomMessageEventContent, MediaSource};
+use matrix_sdk::{
+    ruma::events::room::{message::RoomMessageEventContent, MediaSource},
+    SlidingSyncState,
+};
 
 use self::{
     client::*, error::ClientError, event::*, notification::*, platform::*, session_verification::*,
-    sliding_sync::*, task_handle::TaskHandle, timeline::MediaSourceExt,
+    task_handle::TaskHandle, timeline::MediaSourceExt,
 };
 
 uniffi::include_scaffolding!("api");

bindings/matrix-sdk-ffi/src/room_list.rs

@@ -8,8 +8,10 @@ use futures_util::{pin_mut, StreamExt};
 use ruma::RoomId;
 
 use crate::{
-    room::Room, timeline::EventTimelineItem, Client, RoomListEntry, RoomSubscription, TaskHandle,
-    UnreadNotificationsCount, RUNTIME,
+    room::Room,
+    sliding_sync::{RoomListEntry, RoomSubscription, UnreadNotificationsCount},
+    timeline::EventTimelineItem,
+    Client, TaskHandle, RUNTIME,
 };
 
 #[uniffi::export]

bindings/matrix-sdk-ffi/src/sliding_sync.rs

@@ -3,20 +3,17 @@ use std::sync::{Arc, RwLock};
 use anyhow::Context;
 use eyeball_im::VectorDiff;
 use futures_util::{future::join3, pin_mut, StreamExt};
-pub use matrix_sdk::{
-    ruma::api::client::sync::sync_events::v4::SyncRequestListFilters, Client as MatrixClient,
-    LoopCtrl, RoomListEntry as MatrixRoomEntry, SlidingSyncBuilder as MatrixSlidingSyncBuilder,
-    SlidingSyncMode, SlidingSyncState,
-};
 use matrix_sdk::{
     ruma::{
         api::client::sync::sync_events::{
-            v4::RoomSubscription as RumaRoomSubscription,
+            v4::{RoomSubscription as RumaRoomSubscription, SyncRequestListFilters},
             UnreadNotificationsCount as RumaUnreadNotificationsCount,
         },
         assign, IdParseError, OwnedRoomId, RoomId,
     },
     sliding_sync::SlidingSyncSelectiveModeBuilder as MatrixSlidingSyncSelectiveModeBuilder,
+    LoopCtrl, RoomListEntry as MatrixRoomEntry, SlidingSyncBuilder as MatrixSlidingSyncBuilder,
+    SlidingSyncMode, SlidingSyncState,
 };
 use matrix_sdk_ui::timeline::SlidingSyncRoomExt;
 use tracing::{error, warn};
@@ -250,6 +247,7 @@ pub struct SlidingSyncAddTimelineListenerResult {
     pub task_handle: Arc<TaskHandle>,
 }
 
+#[derive(uniffi::Record)]
 pub struct UpdateSummary {
     /// The lists (according to their name), which have seen an update
     pub lists: Vec<String>,
@@ -288,6 +286,7 @@ impl From<matrix_sdk::UpdateSummary> for UpdateSummary {
     }
 }
 
+#[derive(uniffi::Enum)]
 pub enum SlidingSyncListRoomsListDiff {
     Append { values: Vec<RoomListEntry> },
     Insert { index: u32, value: RoomListEntry },
@@ -327,7 +326,8 @@ impl From<VectorDiff<MatrixRoomEntry>> for SlidingSyncListRoomsListDiff {
     }
 }
 
-#[derive(Clone, Debug)]
+// Used by `SlidingSync` _and_ `RoomList`. Be careful.
+#[derive(Clone, Debug, uniffi::Enum)]
 pub enum RoomListEntry {
     Empty,
     Invalidated { room_id: String },
@@ -352,18 +352,22 @@ impl From<&MatrixRoomEntry> for RoomListEntry {
     }
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncListRoomItemsObserver: Sync + Send {
     fn did_receive_update(&self);
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncListRoomListObserver: Sync + Send {
     fn did_receive_update(&self, diff: SlidingSyncListRoomsListDiff);
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncListRoomsCountObserver: Sync + Send {
     fn did_receive_update(&self, new_count: u32);
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncListStateObserver: Sync + Send {
     fn did_receive_update(&self, new_state: SlidingSyncState);
 }
@@ -533,11 +537,12 @@ impl SlidingSyncListBuilder {
     }
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncListOnceBuilt: Sync + Send {
     fn update_list(&self, list: Arc<SlidingSyncList>) -> Arc<SlidingSyncList>;
 }
 
-#[derive(Clone)]
+#[derive(Clone, uniffi::Object)]
 pub struct SlidingSyncList {
     inner: matrix_sdk::SlidingSyncList,
 }
@@ -628,6 +633,7 @@ impl SlidingSyncList {
     }
 }
 
+#[uniffi::export(callback_interface)]
 pub trait SlidingSyncObserver: Sync + Send {
     fn did_receive_sync_update(&self, summary: UpdateSummary);
 }