Skip to content

Commit 88bceaf

Browse files
committed
feat(ffi,base,ui,sdk): Migrate from sliding sync to simplified sliding sync.
This patch migrates the entire SDK to sliding sync to simplified sliding sync.
1 parent 59449bc commit 88bceaf

File tree

27 files changed

+309
-339
lines changed

27 files changed

+309
-339
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ use std::{fmt::Debug, mem::MaybeUninit, ptr::addr_of_mut, sync::Arc, time::Durat
22

33
use eyeball_im::VectorDiff;
44
use futures_util::{pin_mut, StreamExt, TryFutureExt};
5-
use matrix_sdk::ruma::{
6-
api::client::sync::sync_events::{
7-
v4::RoomSubscription as RumaRoomSubscription,
8-
UnreadNotificationsCount as RumaUnreadNotificationsCount,
5+
use matrix_sdk::{
6+
ruma::{
7+
api::client::sync::sync_events::UnreadNotificationsCount as RumaUnreadNotificationsCount,
8+
assign, RoomId,
99
},
10-
assign, RoomId,
10+
sliding_sync::http,
1111
};
1212
use matrix_sdk_ui::{
1313
room_list_service::filters::{
@@ -671,9 +671,9 @@ pub struct RoomSubscription {
671671
pub include_heroes: Option<bool>,
672672
}
673673

674-
impl From<RoomSubscription> for RumaRoomSubscription {
674+
impl From<RoomSubscription> for http::request::RoomSubscription {
675675
fn from(val: RoomSubscription) -> Self {
676-
assign!(RumaRoomSubscription::default(), {
676+
assign!(http::request::RoomSubscription::default(), {
677677
required_state: val.required_state.map(|r|
678678
r.into_iter().map(|s| (s.key.into(), s.value)).collect()
679679
).unwrap_or_default(),

crates/matrix-sdk-base/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mod rooms;
3434
pub mod read_receipts;
3535
pub use read_receipts::PreviousEventsProvider;
3636
#[cfg(feature = "experimental-sliding-sync")]
37-
mod sliding_sync;
37+
pub mod sliding_sync;
3838

3939
pub mod store;
4040
pub mod sync;

crates/matrix-sdk-base/src/rooms/normal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ use bitflags::bitflags;
2424
use eyeball::{SharedObservable, Subscriber};
2525
#[cfg(all(feature = "e2e-encryption", feature = "experimental-sliding-sync"))]
2626
use matrix_sdk_common::ring_buffer::RingBuffer;
27+
#[cfg(feature = "experimental-sliding-sync")]
28+
use ruma::events::AnySyncTimelineEvent;
2729
use ruma::{
2830
api::client::sync::sync_events::v3::RoomSummary as RumaSummary,
2931
events::{
@@ -49,8 +51,6 @@ use ruma::{
4951
EventId, MxcUri, OwnedEventId, OwnedMxcUri, OwnedRoomAliasId, OwnedRoomId, OwnedUserId,
5052
RoomAliasId, RoomId, RoomVersionId, UserId,
5153
};
52-
#[cfg(feature = "experimental-sliding-sync")]
53-
use ruma::{events::AnySyncTimelineEvent, MilliSecondsSinceUnixEpoch};
5454
use serde::{Deserialize, Serialize};
5555
use tokio::sync::broadcast;
5656
use tracing::{debug, field::debug, info, instrument, warn};

crates/matrix-sdk-base/src/sliding_sync/http.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ pub mod msc3575 {
4242
}
4343
}
4444

45+
/// HTTP types from Simplified MSC3575.
4546
pub mod simplified_msc3575 {
4647
pub use ruma::api::client::sync::sync_events::v5::*;
4748
}

0 commit comments

Comments
 (0)