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

Revert "refactor(bindings): Fetch latest event earlier"

Browse Source 
This reverts commit 7d1372195c.
This commit is contained in:
Jonas Platte
2023-01-17 17:45:24 +01:00
committed by Jonas Platte
parent 9e12a88e03
commit e64b2f65da
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ pub struct SlidingSyncRoom {
inner: matrix_sdk::SlidingSyncRoom,
timeline: TimelineLock,
client: Client,
latest_room_message: Option<Arc<EventTimelineItem>>,
}
#[uniffi::export]
@@ -130,7 +129,8 @@ impl SlidingSyncRoom {
#[allow(clippy::significant_drop_in_scrutinee)]
pub fn latest_room_message(&self) -> Option<Arc<EventTimelineItem>> {
self.latest_room_message.clone()
let item = RUNTIME.block_on(self.inner.latest_event())?;
Some(Arc::new(EventTimelineItem(item)))
}
}
@@ -565,13 +565,10 @@ impl SlidingSync {
pub fn get_room(&self, room_id: String) -> anyhow::Result<Option<Arc<SlidingSyncRoom>>> {
Ok(self.inner.get_room(OwnedRoomId::try_from(room_id)?).map(|inner| {
let latest_room_message = RUNTIME
.block_on(async { Some(Arc::new(EventTimelineItem(inner.latest_event().await?))) });
Arc::new(SlidingSyncRoom {
inner,
client: self.client.clone(),
timeline: Default::default(),
latest_room_message,
})
}))
}
@@ -590,14 +587,10 @@ impl SlidingSync {
.into_iter()
.map(|o| {
o.map(|inner| {
let latest_room_message = RUNTIME.block_on(async {
Some(Arc::new(EventTimelineItem(inner.latest_event().await?)))
});
Arc::new(SlidingSyncRoom {
inner,
client: self.client.clone(),
timeline: Default::default(),
latest_room_message,
})
})
})