Merge pull request #557 from kevinaboos/tsp

Author: kevinaboos

Cargo.lock

@@ -41,6 +41,7 @@ matrix-sdk = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "
 matrix-sdk-ui = { git = "https://github.com/matrix-org/matrix-rust-sdk", branch = "main", default-features = false, features = [ "rustls-tls" ] }
 rand = "0.8.5"
 rangemap = "1.5.0"
+sanitize-filename = "0.6"
 serde = "1.0"
 serde_json = "1.0"
 tokio = { version = "1.43.1", features = ["macros", "rt-multi-thread"] }
@@ -52,15 +53,47 @@ bitflags = "2.6.0"
 indexmap = "2.6.0"
 blurhash = { version = "0.2.3", default-features = false }
 
+tsp_sdk = { git = "https://github.com/openwallet-foundation-labs/tsp.git", optional = true, features = ["async", "resolve"] }
+# tsp_sdk = { version = "0.8.0", optional = true, default-features = false, features = ["async", "resolve"] }
+quinn = { version = "0.11.8", default-features = false }
+
+
 [features]
 default = []
+## Enables experimental support for using TSP wallets.
+tsp = ["dep:tsp_sdk"]
+
 ## Hides the command prompt console on Windows.
 hide_windows_console = []
+
 ## Logs all diffs received by the Matrix RoomListService.
 log_room_list_diffs = []
+
 ## Logs all diffs to all room timelines.
 log_timeline_diffs = []
 
+
+[patch.crates-io]
+## This is required to avoid a version conflict on the libsqlite3-sys crate,
+## which is a native crate that can only exist once in the dependency graph.
+## The `matrix-sdk` crate's dependencies require a specific version of `libsqlite3-sys`
+## (via rustsqlite which requires libsqlite3-sys 0.33.0),
+## whereas the `tsp_sdk` crate depends on `sqlx`, which requires a different version
+## of `libsqlite3-sys` (via `aries-askar`, which depends on `askar-storage`,
+## which requires libsqlite3-sys 0.30.0).
+## So this patch is a custom version of sqlx that *pretends* to be 0.8.6
+## (even though in reality uses the newest commit of `sqlx`,
+## which recently was updated to allow for a *range* of versions of `libsqlite3-sys`).
+## See <https://github.com/launchbadge/sqlx/pull/3928/files#diff-4f4849707ed063bc5de6d9f6d105f0e7baf62d1085b3c8aee4a547468b89248fR57>
+# sqlx = { git = "https://github.com/project-robius/sqlx.git", branch = "version_0.9_alpha_as_0.8.6" }
+sqlx = { git = "https://github.com/project-robius/sqlx.git", branch = "update_libsqlite3-sys_version" }
+
+## This is required for the askar repos to work with the above-patched `sqlx` crate,
+## more specifically, the updated `libsqlite3-sys` version (0.31.0).
+## See <https://github.com/openwallet-foundation/askar/pull/386>
+askar-storage = { git = "https://github.com/openwallet-foundation/askar.git", rev = "0b919bb58205416df7cd2cc1a24ce52373cbe105" }
+
+
 [package.metadata.docs.rs]
 all-features = true
 

Cargo.toml

@@ -0,0 +1,8 @@
+## Icons
+
+Nearly all icons used in Robrix are obtained from [SVG Repo](https://www.svgrepo.com/). Every icon downloaded from that website is used in accordance with [their licensing terms here]( https://www.svgrepo.com/page/licensing/).
+
+
+Other icons are individually attributed below, as required.
+
+* Add Wallet by Creative Stall from <a href="https://thenounproject.com/browse/icons/term/add-wallet/" target="_blank" title="Add Wallet Icons">Noun Project</a> (CC BY 3.0)

License Attributions.md

@@ -20,11 +20,7 @@ use crate::{
         JoinLeaveRoomModalWidgetRefExt,
     },
     login::login_screen::LoginAction,
-    persistent_state::{
-        load_window_state,
-        save_app_state,
-        save_window_state,
-    },
+    persistence,
     shared::callout_tooltip::{
         CalloutTooltipOptions,
         CalloutTooltipWidgetRefExt,
@@ -41,7 +37,6 @@ use crate::{
         VerificationModalWidgetRefExt,
     },
 };
-use serde::{self, Deserialize, Serialize};
 
 live_design! {
     use link::theme::*;
@@ -116,7 +111,7 @@ live_design! {
                         // but behind the verification modal.
                         new_message_context_menu = <NewMessageContextMenu> { }
 
-                        // We want the verification modal to always show up on top of
+                        // We want the verification modal to always show up in front of
                         // all other elements when an incoming verification request is received.
                         verification_modal = <Modal> {
                             content: {
@@ -153,6 +148,8 @@ impl LiveRegister for App {
         // then other modules widgets.
         makepad_widgets::live_design(cx);
         crate::shared::live_design(cx);
+        #[cfg(feature = "tsp")]
+        crate::tsp::live_design(cx);
         crate::settings::live_design(cx);
         crate::room::live_design(cx);
         crate::join_leave_room_modal::live_design(cx);
@@ -181,13 +178,20 @@ impl MatchEvent for App {
         // such that background threads/tasks will be able to can access it.
         let _app_data_dir = crate::app_data_dir();
         log!("App::handle_startup(): app_data_dir: {:?}", _app_data_dir);
-        self.update_login_visibility(cx);
 
-        log!("App::handle_startup(): starting matrix sdk loop");
-        crate::sliding_sync::start_matrix_tokio().unwrap();
-        if let Err(e) = load_window_state(self.ui.window(id!(main_window)), cx) {
+        if let Err(e) = persistence::load_window_state(self.ui.window(id!(main_window)), cx) {
             error!("Failed to load window state: {}", e);
         }
+
+        self.update_login_visibility(cx);
+
+        log!("App::Startup: starting matrix sdk loop");
+        let _tokio_rt = crate::sliding_sync::start_matrix_tokio().unwrap();
+
+        #[cfg(feature = "tsp")] {
+            log!("App::Startup: initializing TSP (Trust Spanning Protocol) module.");
+            crate::tsp::tsp_init(_tokio_rt).unwrap();
+        }
     }
 
     fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions) {
@@ -353,13 +357,34 @@ impl AppMain for App {
 
         if let Event::Shutdown = event {
             let window_ref = self.ui.window(id!(main_window));
-            if let Err(e) = save_window_state(window_ref, cx) {
-                error!("Failed to save window state. Error details: {}", e);
+            if let Err(e) = persistence::save_window_state(window_ref, cx) {
+                error!("Failed to save window state. Error: {e}");
             }
             if let Some(user_id) = current_user_id() {
                 let app_state = self.app_state.clone();
-                if let Err(e) = save_app_state(app_state, user_id) {
-                    error!("Failed to save app state. Error details: {}", e);
+                if let Err(e) = persistence::save_app_state(app_state, user_id) {
+                    error!("Failed to save app state. Error: {e}");
+                }
+            }
+            #[cfg(feature = "tsp")] {
+                // Save the TSP wallet state, if it exists, with a 3-second timeout.
+                let tsp_state = std::mem::take(&mut *crate::tsp::tsp_state_ref().lock().unwrap());
+                if tsp_state.has_content() {
+                    let res = crate::sliding_sync::block_on_async_with_timeout(
+                        Some(std::time::Duration::from_secs(3)),
+                        async move {
+                            match tsp_state.close_and_serialize().await {
+                                Ok(saved_state) => match persistence::save_tsp_state_async(saved_state).await {
+                                    Ok(_) => { }
+                                    Err(e) => error!("Failed to save TSP wallet state. Error: {e}"),
+                                }
+                                Err(e) => error!("Failed to close and serialize TSP wallet state. Error: {e}"),
+                            }
+                        },
+                    );
+                    if let Err(_e) = res {
+                        error!("Failed to save TSP wallet state before app shutdown. Error: Timed Out.");
+                    }
                 }
             }
         }
@@ -517,14 +542,3 @@ pub enum AppStateAction {
     RoomLoadedSuccessfully(OwnedRoomId),
     None,
 }
-
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
-/// The state of the window geometry
-pub struct WindowGeomState {
-    /// A tuple containing the window's width and height.
-    pub inner_size: (f64, f64),
-    /// A tuple containing the window's x and y position.
-    pub position: (f64, f64),
-    /// Maximise fullscreen if true.
-    pub is_fullscreen: bool,
-}

resources/icons/add_wallet.svg

@@ -6,14 +6,23 @@ use std::{borrow::Cow, cell::RefCell, collections::BTreeMap, ops::{DerefMut, Ran
 use bytesize::ByteSize;
 use imbl::Vector;
 use makepad_widgets::{image_cache::ImageBuffer, *};
-use matrix_sdk::{room::{reply::{EnforceThread, Reply}, RoomMember}, ruma::{
-    events::{receipt::Receipt, room::{
-        message::{
-            AudioMessageEventContent, EmoteMessageEventContent, FileMessageEventContent, FormattedBody, ImageMessageEventContent, KeyVerificationRequestEventContent, LocationMessageEventContent, MessageFormat, MessageType, NoticeMessageEventContent, RoomMessageEventContent, TextMessageEventContent, VideoMessageEventContent
-        }, ImageInfo, MediaSource
+use matrix_sdk::{
+    room::{reply::{EnforceThread, Reply}, RoomMember},
+    ruma::{
+        events::{
+            receipt::Receipt,
+            room::{
+                message::{
+                    AudioMessageEventContent, EmoteMessageEventContent, FileMessageEventContent, FormattedBody, ImageMessageEventContent, KeyVerificationRequestEventContent, LocationMessageEventContent, MessageFormat, MessageType, NoticeMessageEventContent, RoomMessageEventContent, TextMessageEventContent, VideoMessageEventContent
+                },
+                ImageInfo, MediaSource
+            },
+            sticker::{StickerEventContent, StickerMediaSource},
+        },
+        matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, OwnedEventId, OwnedMxcUri, OwnedRoomId, UserId
     },
-    sticker::{StickerEventContent, StickerMediaSource}}, matrix_uri::MatrixId, uint, EventId, MatrixToUri, MatrixUri, OwnedEventId, OwnedMxcUri, OwnedRoomId, UserId
-}, OwnedServerName};
+    OwnedServerName,
+};
 use matrix_sdk_ui::timeline::{
     self, EmbeddedEvent, EncryptedMessage, EventTimelineItem, InReplyToDetails, MemberProfileChange, MsgLikeContent, MsgLikeKind, PollState, RoomMembershipChange, TimelineDetails, TimelineEventItemId, TimelineItem, TimelineItemContent, TimelineItemKind, VirtualTimelineItem
 };
@@ -1264,7 +1273,7 @@ impl Widget for RoomScreen {
         let room_screen_widget_uid = self.widget_uid();
 
         while let Some(subview) = self.view.draw_walk(cx, scope, walk).step() {
-            // We only care about drawing the portal list.
+            // Here, we only need to handle drawing the portal list.
             let portal_list_ref = subview.as_portal_list();
             let Some(mut list_ref) = portal_list_ref.borrow_mut() else {
                 error!("!!! RoomScreen::draw_walk(): BUG: expected a PortalList widget, but got something else");
@@ -1627,11 +1636,11 @@ impl RoomScreen {
                     }
                 }
                 TimelineUpdate::PaginationError { error, direction } => {
-                    error!("Pagination error ({direction}) in room {}: {error:?}", tl.room_id);
+                    error!("Pagination error ({direction}) in room \"{}\", {}: {error:?}", self.room_name, tl.room_id);
                     enqueue_popup_notification(PopupItem {
-                        message: format!("Error loading earlier messages in \"{}\": {error}", self.room_name),
-                        kind: PopupKind::Error,
+                        message: utils::stringify_pagination_error(&error, &self.room_name),
                         auto_dismissal_duration: None,
+                        kind: PopupKind::Error,
                     });
                     done_loading = true;
                 }

resources/icons/import.svg

@@ -46,9 +46,6 @@ live_design! {
     use crate::shared::collapsible_header::*;
     use crate::home::room_preview::*;
 
-    // An empty view that takes up no space in the portal list.
-    Empty = <View> { }
-
     StatusLabel = <View> {
         width: Fill, height: Fit,
         align: { x: 0.5, y: 0.5 }
@@ -80,7 +77,7 @@ live_design! {
 
             collapsible_header = <CollapsibleHeader> {}
             room_preview = <RoomPreview> {}
-            empty = <Empty> {}
+            empty = <View> {}
             status_label = <StatusLabel> {}
             bottom_filler = <View> {
                 width: Fill,

resources/icons/import2.svg

@@ -1,3 +1,7 @@
+//! A modal dialog for joining or leaving rooms in Matrix.
+//!
+//! Also used as a confirmation dialog for accepting or rejecting room invites.
+
 use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;