Merge branch 'main' into search_messages_3#122

Author: alanpoon

Cargo.lock

@@ -54,15 +54,27 @@ indexmap = "2.6.0"
 blurhash = { version = "0.2.3", default-features = false }
 regex = "1.11.1"
 
+## Dependencies for TSP support.
 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 }
+quinn = { version = "0.11.8", default-features = false, optional = true }
+percent-encoding = { version = "2.3", optional = true }
+## The following reqwest features were taken from the tsp_sdk's `Cargo.toml` file.
+## I'm not sure if all of them are actually needed.
+reqwest = { version = "0.12", default-features = false, features = [
+    "rustls-tls-native-roots",
+    "json",
+    "stream",
+    "charset",
+    "http2",
+    "macos-system-configuration",
+] }
 
 
 [features]
 default = []
 ## Enables experimental support for using TSP wallets.
-tsp = ["dep:tsp_sdk"]
+tsp = ["dep:tsp_sdk", "dep:quinn", "dep:percent-encoding"]
 
 ## Hides the command prompt console on Windows.
 hide_windows_console = []

Cargo.toml

@@ -186,7 +186,7 @@ These are generally sorted in order of priority. If you're interested in helping
 - [x] Keyword filters for the list of all rooms: https://github.com/project-robius/robrix/issues/123
 - [ ] Collapsible/expandable view of contiguous "small" events: https://github.com/project-robius/robrix/issues/118
 - [ ] Display multimedia (audio/video/gif) message events: https://github.com/project-robius/robrix/issues/120
-- [ ] User settings screen
+- [x] User settings screen
 - [ ] Dedicated view of spaces
 - [ ] Link previews beneath messages: https://github.com/project-robius/robrix/issues/81
 - [ ] Search messages within a room: https://github.com/project-robius/robrix/issues/122