From 6e1de8a5eec9515d99af57e0cd0266d9fca86a71 Mon Sep 17 00:00:00 2001
From: Ivan Enderlin <ivan@mnt.io>
Date: Thu, 15 Jun 2023 09:26:33 +0200
Subject: [PATCH] fix(ffi): `RoomListItem::full_room` returns a `Room` with a
 `Timeline`.

---
 bindings/matrix-sdk-ffi/src/room.rs      |  6 +++---
 bindings/matrix-sdk-ffi/src/room_list.rs | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bindings/matrix-sdk-ffi/src/room.rs b/bindings/matrix-sdk-ffi/src/room.rs
index c06021203ab..a3f3a07136a 100644
--- a/bindings/matrix-sdk-ffi/src/room.rs
+++ b/bindings/matrix-sdk-ffi/src/room.rs
@@ -241,7 +241,7 @@ impl Room {
 
             let listener: Arc<dyn TimelineListener> = listener.into();
             let timeline_stream =
-                Arc::new(TaskHandle::new(RUNTIME.spawn(timeline_stream.for_each(move |diff| {
+                TaskHandle::new(RUNTIME.spawn(timeline_stream.for_each(move |diff| {
                     let listener = listener.clone();
                     let fut = RUNTIME.spawn_blocking(move || {
                         listener.on_update(Arc::new(TimelineDiff::new(diff)))
@@ -252,11 +252,11 @@ impl Room {
                             error!("Timeline listener error: {e}");
                         }
                     }
-                }))));
+                })));
 
             RoomTimelineListenerResult {
                 items: timeline_items.into_iter().map(TimelineItem::from_arc).collect(),
-                items_stream: timeline_stream,
+                items_stream: Arc::new(timeline_stream),
             }
         })
     }
diff --git a/bindings/matrix-sdk-ffi/src/room_list.rs b/bindings/matrix-sdk-ffi/src/room_list.rs
index 94abd04ffe6..213c49f4942 100644
--- a/bindings/matrix-sdk-ffi/src/room_list.rs
+++ b/bindings/matrix-sdk-ffi/src/room_list.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, sync::Arc};
+use std::{
+    fmt::Debug,
+    sync::{Arc, RwLock},
+};
 
 use eyeball_im::VectorDiff;
 use futures_util::{pin_mut, StreamExt};
@@ -203,7 +206,10 @@ impl RoomListItem {
     }
 
     fn full_room(&self) -> Arc<Room> {
-        Arc::new(Room::new(self.inner.inner_room().clone()))
+        Arc::new(Room::with_timeline(
+            self.inner.inner_room().clone(),
+            Arc::new(RwLock::new(Some(RUNTIME.block_on(async { self.inner.timeline().await })))),
+        ))
     }
 
     fn subscribe(&self, settings: Option<RoomSubscription>) {