mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-14 11:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(ffi): clean up sliding sync timeline API

Browse Source
This commit is contained in:
Benjamin Kampmann
2022-12-05 14:10:04 +01:00
parent 0bfa63b31e
commit f919ee3b7d
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/matrix-sdk-ffi/src/room.rs
View File

@@ -32,7 +32,7 @@ pub enum Membership {
Left,
}
type TimelineLock = Arc<RwLock<Option<Arc<Timeline>>>>;
pub(crate) type TimelineLock = Arc<RwLock<Option<Arc<Timeline>>>>;
pub struct Room {
room: SdkRoom,

17
bindings/matrix-sdk-ffi/src/sliding_sync.rs
View File

@@ -20,7 +20,10 @@ use tokio::task::JoinHandle;
use tracing::error;
use super::{Client, Room, RUNTIME};
use crate::{helpers::unwrap_or_clone_arc, EventTimelineItem, TimelineDiff, TimelineListener};
use crate::{
helpers::unwrap_or_clone_arc, room::TimelineLock, EventTimelineItem, TimelineDiff,
TimelineListener,
};
pub struct StoppableSpawn {
handle: Arc<RwLock<Option<JoinHandle<()>>>>,
@@ -84,7 +87,7 @@ impl From<RumaUnreadNotificationsCount> for UnreadNotificationsCount {
pub struct SlidingSyncRoom {
inner: matrix_sdk::SlidingSyncRoom,
timeline: Arc<RwLock<Option<Arc<Timeline>>>>,
timeline: TimelineLock,
client: Client,
}
@@ -123,14 +126,6 @@ impl SlidingSyncRoom {
.map(|room| Arc::new(Room::with_timeline(room, self.timeline.clone())))
}
/// Removes the timeline.
///
/// Timeline items cached in memory as well as timeline listeners are
/// dropped.
pub fn remove_timeline(&self) {
*self.timeline.write().unwrap() = None;
}
#[allow(clippy::significant_drop_in_scrutinee)]
pub fn latest_room_message(&self) -> Option<Arc<EventTimelineItem>> {
let item = self.inner.latest_event()?;
@@ -144,7 +139,7 @@ impl SlidingSyncRoom {
listener: Box<dyn TimelineListener>,
) -> Option<Arc<StoppableSpawn>> {
let Some(timeline) = RUNTIME.block_on(async move { self.inner.timeline().await }) else {
tracing::warn!(room_id=?self.room_id(), "Could set timeline listener: no timeline found.");
tracing::warn!(room_id=?self.room_id(), "Could not set timeline listener: no timeline found.");
return None
};