Merge pull request #234 from kevinaboos/fix_tombstoned_rooms_sdk_upgrade

Upgrade to newer SDK version that has removed `RoomList::entries()`

Cargo.toml

@@ -37,7 +37,7 @@ htmlize = "1.0.5"
 imbl = { version = "3.0.0", features = ["serde"] }  # same as matrix-sdk-ui
 imghdr = "0.7.0"
 linkify = "0.10.0"
-matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = [ "experimental-sliding-sync", "e2e-encryption", "automatic-room-key-forwarding", "markdown", "sqlite", "rustls-tls", "bundled-sqlite" ] }
+matrix-sdk    = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = [ "experimental-sliding-sync", "e2e-encryption", "automatic-room-key-forwarding", "markdown", "sqlite", "rustls-tls", "bundled-sqlite" ] }
 matrix-sdk-ui = { git = "https://github.com/matrix-org/matrix-rust-sdk", default-features = false, features = [ "rustls-tls" ] }
 rand = "0.8.5"
 rangemap = "1.5.0"

src/home/room_screen.rs

@@ -12,7 +12,7 @@ use matrix_sdk::{
                 FormattedBody, ImageMessageEventContent, LocationMessageEventContent, MessageFormat, MessageType, NoticeMessageEventContent, RoomMessageEventContent, TextMessageEventContent
             },
             MediaSource,
-        }, matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, RoomId, UserId
+        }, matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, UserId
     },
     OwnedServerName,
 };
@@ -1220,6 +1220,7 @@ impl Widget for RoomScreen {
                     }
 
                     if !link_was_handled {
+                        log!("Opening URL \"{}\"", url);
                         if let Err(e) = robius_open::Uri::new(&url).open() {
                             error!("Failed to open URL {:?}. Error: {:?}", url, e);
                         }
@@ -2275,7 +2276,7 @@ fn populate_message_view(
     cx: &mut Cx2d,
     list: &mut PortalList,
     item_id: usize,
-    room_id: &RoomId,
+    room_id: &OwnedRoomId,
     event_tl_item: &EventTimelineItem,
     message: &timeline::Message,
     prev_event: Option<&Arc<TimelineItem>>,
@@ -2596,7 +2597,7 @@ fn populate_location_message_content(
 fn draw_replied_to_message(
     cx: &mut Cx2d,
     replied_to_message_view: &ViewRef,
-    room_id: &RoomId,
+    room_id: &OwnedRoomId,
     message: &timeline::Message,
     message_event_id: Option<&EventId>,
 ) -> (bool, Option<OwnedEventId>) {
@@ -2873,7 +2874,7 @@ fn populate_small_state_event(
     cx: &mut Cx,
     list: &mut PortalList,
     item_id: usize,
-    room_id: &RoomId,
+    room_id: &OwnedRoomId,
     event_tl_item: &EventTimelineItem,
     event_content: &impl SmallStateEventContent,
     item_drawn_status: ItemDrawnStatus,
@@ -2970,7 +2971,7 @@ fn set_timestamp(item: &WidgetRef, live_id_path: &[LiveId], timestamp: MilliSeco
 fn set_avatar_and_get_username(
     cx: &mut Cx,
     avatar: AvatarRef,
-    room_id: &RoomId,
+    room_id: &OwnedRoomId,
     sender_user_id: &UserId,
     sender_profile: &TimelineDetails<Profile>,
     event_id: Option<&EventId>,

src/home/rooms_list.rs

@@ -302,6 +302,14 @@ impl Widget for RoomsList {
                             .unwrap_or_else(|| {
                                 error!("Error: couldn't find room {room_id} to remove room");
                             });
+
+                        // TODO: send an action to the RoomScreen to hide this room
+                        //       if it is currently being displayed,
+                        //       and also ensure that the room's TimelineUIState is preserved
+                        //       and saved (if the room has not been left),
+                        //       and also that it's MediaCache instance is put into a special state
+                        //       where its internal update sender gets replaced upon next usage
+                        //       (that is, upon the next time that same room is opened by the user).
                     }
                     RoomsListUpdate::ClearRooms => {
                         self.all_rooms.clear();

src/home/welcome_screen.rs

@@ -28,19 +28,6 @@ live_design! {
                 }
             }
 
-            subtitle = <Label> {
-                text: "
-                    Our Matrix client is under heavy development.\nFor now, you can access the rooms you've joined in other clients.\nBut don't worry, we're working on expanding its features.\n
-                    Tip: to load older messages, click on a selected room (repeatedly).
-                    ",
-                draw_text: {
-                    color: (WELCOME_TEXT_COLOR),
-                    text_style: {
-                        font_size: 14.
-                    }
-                }
-            }
-
             // Using the HTML widget to taking advantage of embedding a link within text with proper vertical alignment
             <RobrixHtml> {
                 padding: {top: 12, left: 0.}
@@ -59,7 +46,8 @@ live_design! {
                     // }
                 }
                 body:"
-                Look out for the latest announcements in our Matrix channel: <a href=\"https://matrix.to/#/#robius-robrix:matrix.org\">[m] Robrix</a><br/>
+                Our Matrix client is under heavy development.\nFor now, you can access the rooms you've joined in other clients.\nBut don't worry, we're working on expanding its features.\n
+                Look for the latest announcements in our Matrix channel: <b>#robrix:matrix.org</b><br/>
                 "
             }
         }

src/login/login_screen.rs

@@ -247,6 +247,7 @@ impl MatchEvent for LoginScreen {
         let homeserver_input = self.view.text_input(id!(homeserver_input));
 
         if signup_button.clicked(actions) {
+            log!("Opening URL \"{}\"", MATRIX_SIGN_UP_URL);
             let _ = robius_open::Uri::new(MATRIX_SIGN_UP_URL).open();
         }