remove set_restore_status

Author: alanpoon

src/app.rs

@@ -368,15 +368,17 @@ impl AppMain for App {
         if let Event::WindowGeomChange(window_geom_change_event) = event {
             self.app_state.window_geom = Some(window_geom_change_event.new_geom.clone());
         }
-        if let (Event::WindowClosed(_) | Event::Shutdown, Some(user_id)) = (event, current_user_id()) {
-            if let Err(e) = save_room_panel(&self.app_state.rooms_panel, &user_id) {
-                log!("Bug! Failed to save room panel: {}", e);
-            }
+        if let Event::WindowClosed(_) | Event::Shutdown = event {
             if let Some(window_geom) = &self.app_state.window_geom {
                 if let Err(e) = save_window_state(window_geom) {
                     log!("Bug! Failed to save window_state: {}", e);
                 }
             }
+            if let Some(user_id) = current_user_id(){
+                if let Err(e) = save_room_panel(&self.app_state.rooms_panel, &user_id) {
+                    log!("Bug! Failed to save room panel: {}", e);
+                }
+            }
         }
         // Forward events to the MatchEvent trait implementation.
         self.match_event(cx, event);

src/home/main_desktop_ui.rs

@@ -350,7 +350,7 @@ pub enum RoomsPanelAction {
 /// Actions related to saving/restoring the UI state of the dock widget.
 #[derive(Clone, DefaultNone, Debug)]
 pub enum DockStateAction {
-    /// Save the dock state from the dock widget into the [`AppState`].
+    /// Save the room panel state from the dock widget into the [`AppState`].
     SaveToAppState,
     /// Restores the room panel state from the [`AppState`] to the dock widget.
     RestoreFromAppState,

src/home/room_screen.rs

@@ -715,14 +715,15 @@ live_design! {
         draw_bg: {
             color: (COLOR_SECONDARY)
         }
-        
+
         room_screen_wrapper = <View> {
             width: Fill, height: Fill,
             flow: Overlay,
             show_bg: true
             draw_bg: {
                 color: (COLOR_PRIMARY_DARKER)
             }
+            // Used to retreive the list of loaded rooms.
             <CachedWidget> {
                 width:0, height:0,
                 rooms_list = <RoomsList> {}
@@ -934,10 +935,6 @@ pub struct RoomScreen {
     #[rust] room_name: String,
     /// The persistent UI-relevant states for the room that this widget is currently displaying.
     #[rust] tl_state: Option<TimelineUiState>,
-    /// The status of this room being restored from previously-saved data in storage.
-    /// If `Pending` or `AllRoomsLoaded`, this RoomScreen will display a message;
-    /// otherwise, the regular RoomScreen content (the room timeline) will be shown.
-    #[rust] restore_status: RoomsPanelRestoreAction,
 }
 impl Drop for RoomScreen {
     fn drop(&mut self) {
@@ -961,6 +958,23 @@ impl Widget for RoomScreen {
         // Currently, a Signal event is only used to tell this widget
         // that its timeline events have been updated in the background.
         if let Event::Signal = event {
+            if let Some(room_id) = &self.room_id {
+                if !self.rooms_list(id!(rooms_list)).is_room_loaded(room_id) {
+                    if self.rooms_list(id!(rooms_list)).all_known_rooms_loaded() {
+                        self.view
+                        .label(id!(restore_status_label))
+                        .set_text(cx, &format!(
+                            "Room {} was not found in the homeserver's list of all rooms.",
+                            self.room_name
+                        ));
+                    } else {
+                        self.view
+                        .label(id!(restore_status_label))
+                        .set_text(cx, "[Placeholder for Spinner]");
+                    }
+                    return;
+                }
+            }
             self.process_timeline_updates(cx, &portal_list);
 
             // Ideally we would do this elsewhere on the main thread, because it's not room-specific,
@@ -969,6 +983,7 @@ impl Widget for RoomScreen {
             //       and wrap it in a `if let Event::Signal` conditional.
             user_profile_cache::process_user_profile_updates(cx);
             avatar_cache::process_avatar_updates(cx);
+
         }
 
         if let Event::Actions(actions) = event {
@@ -1041,10 +1056,11 @@ impl Widget for RoomScreen {
                 match action.downcast_ref() {
                     Some(RoomsPanelRestoreAction::Success(room_id)) => {
                         if self.room_id.as_ref().is_some_and(|r| r == room_id) {                            
-                            self.set_restore_status(cx, RoomsPanelRestoreAction::Success(room_id.clone()));
                             // Reset room_id before displaying room.
                             self.room_id = None;
                             self.set_displayed_room(cx, room_id.clone(), self.room_name.clone());
+                            self.view
+                                .label(id!(restore_status_label)).set_text(cx, "");
                             return;
                         }
                     }
@@ -1298,28 +1314,9 @@ impl Widget for RoomScreen {
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
         if let Some(room_id) = &self.room_id {
             if !self.rooms_list(id!(rooms_list)).is_room_loaded(room_id) {
-                if self.rooms_list(id!(rooms_list)).all_known_rooms_loaded() {
-                    self.view
-                    .label(id!(restore_status_label))
-                    .set_text(cx, &format!(
-                        "Room {} was not found in the homeserver's list of all rooms.",
-                        self.room_name
-                    ));
-                    return self.view.draw_walk(cx, scope, walk);
-                } else {
-                    self.view
-                    .label(id!(restore_status_label))
-                    .set_text(cx, "[Placeholder for Spinner]");
-                    return self.view.draw_walk(cx, scope, walk);
-                }
+                return self.view.draw_walk(cx, scope, walk);
             }
         }
-        // if matches!(
-        //     &self.restore_status,
-        //     RoomsPanelRestoreAction::Pending(_)) || self.rooms_list(id!(rooms_list)).all_known_rooms_loaded()
-        // {
-        //     return self.view.draw_walk(cx, scope, walk);
-        // }
 
         if self.tl_state.is_none() {
             // Tl_state may not be ready after dock loading.
@@ -2299,11 +2296,6 @@ impl RoomScreen {
     fn show_timeline(&mut self, cx: &mut Cx) {
         let room_id = self.room_id.clone()
             .expect("BUG: Timeline::show_timeline(): no room_id was set.");
-        // just an optional sanity check
-        assert!(self.tl_state.is_none(),
-            "BUG: tried to show_timeline() into a timeline with existing state. \
-            Did you forget to save the timeline state back to the global map of states?",
-        );
 
         // Obtain the current user's power levels for this room.
         submit_async_request(MatrixRequest::GetRoomPowerLevels { room_id: room_id.clone() });
@@ -2313,7 +2305,6 @@ impl RoomScreen {
             (existing, false)
         } else {
             let Some((update_sender, update_receiver, request_sender)) = take_timeline_endpoints(&room_id) else {
-                self.set_restore_status(cx, RoomsPanelRestoreAction::Pending(room_id.clone()));
                 return;
             };
             let new_tl_state = TimelineUiState {
@@ -2502,25 +2493,6 @@ impl RoomScreen {
         self.show_timeline(cx);
     }
 
-    /// This sets the RoomScreen widget to display a text label in place of the timeline.
-    pub fn set_restore_status(&mut self, cx: &mut Cx, status: RoomsPanelRestoreAction) {
-        match &status {
-            RoomsPanelRestoreAction::Pending(room_id) => {
-                // Set this RoomScreen's room_id such that it can handle a `RoomsPanelRestoreAction::Success` action.
-                self.room_id = Some(room_id.clone());
-                self.view
-                    .label(id!(restore_status_label))
-                    .set_text(cx, "[Placeholder for Spinner]");
-                self.restore_status = status;
-            }
-            _ => {
-                self.view.label(id!(restore_status_label)).set_text(cx, "");
-                self.restore_status = status;
-            }
-        }
-        self.redraw(cx);
-    }
-
     /// Sends read receipts based on the current scroll position of the timeline.
     fn send_user_read_receipts_based_on_scroll_pos(
         &mut self,
@@ -2631,13 +2603,6 @@ impl RoomScreenRef {
         let Some(mut inner) = self.borrow_mut() else { return };
         inner.set_displayed_room(cx, room_id, room_name);
     }
-
-    /// See [`RoomScreen::set_restore_status()`].
-    pub fn set_restore_status(&self, cx: &mut Cx, status: RoomsPanelRestoreAction) {
-        if let Some(mut inner) = self.borrow_mut() {
-            inner.set_restore_status(cx, status);
-        }
-    }
 }
 
 /// Actions for the room screen's tooltip.

src/home/rooms_list.rs

@@ -4,7 +4,7 @@ use imbl::HashSet;
 use makepad_widgets::*;
 use matrix_sdk::ruma::{events::tag::{TagName, Tags}, MilliSecondsSinceUnixEpoch, OwnedRoomAliasId, OwnedRoomId};
 use bitflags::bitflags;
-use crate::{app::{AppState, RoomsPanelRestoreAction}, shared::jump_to_bottom_button::UnreadMessageCount, sliding_sync::{submit_async_request, MatrixRequest, PaginationDirection}};
+use crate::{app::AppState, shared::jump_to_bottom_button::UnreadMessageCount, sliding_sync::{submit_async_request, MatrixRequest, PaginationDirection}};
 
 use super::{room_preview::RoomPreviewAction, rooms_sidebar::RoomsViewAction};
 
@@ -488,7 +488,8 @@ impl Widget for RoomsList {
                             }
                         }
                         self.update_status_rooms_count();
-                        cx.action(RoomsPanelRestoreAction::Success(room_id));
+                        // Signal the UI to update the RoomScreen
+                        SignalToUI::set_ui_signal();
                     }
                     RoomsListUpdate::UpdateRoomAvatar { room_id, avatar } => {
                         if let Some(room) = self.all_rooms.get_mut(&room_id) {

src/sliding_sync.rs

@@ -1693,7 +1693,7 @@ async fn add_new_room(room: &room_list_service::Room, room_list_service: &RoomLi
     ALL_ROOM_INFO.lock().unwrap().insert(
         room_id.clone(),
         RoomInfo {
-            room_id,
+            room_id: room_id.clone(),
             timeline,
             timeline_singleton_endpoints: Some((timeline_update_receiver, request_sender)),
             timeline_update_sender,
@@ -1702,6 +1702,7 @@ async fn add_new_room(room: &room_list_service::Room, room_list_service: &RoomLi
             replaces_tombstoned_room: tombstoned_room_replaced_by_this_room,
         },
     );
+    Cx::post_action(RoomsPanelRestoreAction::Success(room_id));
     Ok(())
 }