Upgrade matrix-sdk

Cargo.lock

@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cf008e5e1a9e9e22a7d3c9a4992e21a350290069e36d8fb72304ed17e8f2d2"
+checksum = "59a194f9d963d8099596278594b3107448656ba73831c9d8c783e613ce86da64"
 dependencies = [
  "flate2",
  "futures-core",
@@ -597,6 +597,7 @@ dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
+ "serde",
  "wasm-bindgen",
  "windows-link",
 ]
@@ -843,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
 dependencies = [
  "powerfmt",
 ]
@@ -1374,9 +1375,9 @@ dependencies = [
 
 [[package]]
 name = "g2gen"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a8e3a10ca47bce6c3f36b5ed98a08636806e07793390a5bce8c2cab2eee309"
+checksum = "c5a7e0eb46f83a20260b850117d204366674e85d3a908d90865c78df9a6b1dfc"
 dependencies = [
  "g2poly",
  "proc-macro2",
@@ -1386,9 +1387,9 @@ dependencies = [
 
 [[package]]
 name = "g2p"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bce512b75277aca7d5e1a9efa4d2966b29b5da602af3e29a65e14dc210274ae"
+checksum = "539e2644c030d3bf4cd208cb842d2ce2f80e82e6e8472390bcef83ceba0d80ad"
 dependencies = [
  "g2gen",
  "g2poly",
@@ -1396,9 +1397,9 @@ dependencies = [
 
 [[package]]
 name = "g2poly"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feebd4c1b1833bea3876ecc7c2f84520818f86de7b4c3b82e064f68ea1d8cdaa"
+checksum = "312d2295c7302019c395cfb90dacd00a82a2eabd700429bba9c7a3f38dbbe11b"
 
 [[package]]
 name = "gdk-pixbuf"
@@ -2270,14 +2271,15 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b2fd658b06e56721792c5df4475705b6cda790e9298d19d2f8af083457bcd127"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -2566,9 +2568,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+checksum = "c102670231191d07d37a35af3eb77f1f0dbf7a71be51a962dcd57ea607be7260"
 dependencies = [
  "jiff-static",
  "log",
@@ -2579,9 +2581,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+checksum = "4cdde31a9d349f1b1f51a0b3714a5940ac022976f4b49485fc04be052b183b4c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2645,6 +2647,12 @@ dependencies = [
  "typewit",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2851,9 +2859,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lru"
@@ -2998,7 +3006,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "anymap2",
  "aquamarine",
@@ -3021,12 +3029,14 @@ dependencies = [
  "imbl",
  "indexmap",
  "js_int",
+ "language-tags",
  "matrix-sdk-base",
  "matrix-sdk-common",
  "matrix-sdk-indexeddb",
  "matrix-sdk-sqlite",
  "mime",
  "mime2ext",
+ "oauth2",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
@@ -3036,6 +3046,7 @@ dependencies = [
  "serde",
  "serde_html_form",
  "serde_json",
+ "sha2",
  "tempfile",
  "thiserror 2.0.12",
  "tokio",
@@ -3052,7 +3063,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "as_variant",
  "async-trait",
@@ -3079,7 +3090,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "async-trait",
  "eyeball-im",
@@ -3102,7 +3113,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "aes",
  "aquamarine",
@@ -3143,7 +3154,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3171,7 +3182,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-qrcode"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "byteorder",
  "qrcode",
@@ -3183,7 +3194,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sqlite"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "async-trait",
  "deadpool-sqlite",
@@ -3205,7 +3216,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "base64",
  "blake3",
@@ -3224,7 +3235,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-ui"
 version = "0.10.0"
-source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff#dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=f8236a8b96ff685b23a80c6eb8c479c56f445174#f8236a8b96ff685b23a80c6eb8c479c56f445174"
 dependencies = [
  "as_variant",
  "async-once-cell",
@@ -3493,6 +3504,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "oauth2"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d"
+dependencies = [
+ "base64",
+ "chrono",
+ "getrandom 0.2.15",
+ "http",
+ "rand 0.8.5",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "sha2",
+ "thiserror 1.0.69",
+ "url",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -3539,9 +3570,9 @@ checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
 
 [[package]]
 name = "oo7"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b37e8790c4ddf13c930a64ec856342039d6dc2eeecd14123a0a4bcdf680d8b70"
+checksum = "6cb23d3ec3527d65a83be1c1795cb883c52cfa57147d42acc797127df56fc489"
 dependencies = [
  "ashpd",
  "endi",
@@ -4160,9 +4191,9 @@ dependencies = [
 
 [[package]]
 name = "rqrr"
-version = "0.9.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f126a9b02152815d84315316e7a759ee18a216d057095d56d19cec68a428b385"
+checksum = "aeac129c92ff0305d8bf9da5511039e27261d1d29af65c7ef17dc7568dfa7064"
 dependencies = [
  "g2p",
  "lru",
@@ -4400,9 +4431,9 @@ checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.0"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -4910,9 +4941,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.40"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -4931,9 +4962,9 @@ checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.21"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",

Cargo.toml

@@ -72,7 +72,7 @@ sourceview = { package = "sourceview5", version = "0.9" }
 [dependencies.matrix-sdk]
 # version = "0.10"
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+rev = "f8236a8b96ff685b23a80c6eb8c479c56f445174"
 features = [
     "socks",
     "sso-login",
@@ -83,12 +83,12 @@ features = [
 [dependencies.matrix-sdk-store-encryption]
 # version = "0.10"
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+rev = "f8236a8b96ff685b23a80c6eb8c479c56f445174"
 
 [dependencies.matrix-sdk-ui]
 # version = "0.10"
 git = "https://github.com/matrix-org/matrix-rust-sdk.git"
-rev = "dbdbfd0b38d19b69e5e8b6ad3faa9fc3604c84ff"
+rev = "f8236a8b96ff685b23a80c6eb8c479c56f445174"
 
 [dependencies.ruma]
 # version = "0.12.1"

src/secret/linux.rs

@@ -570,7 +570,6 @@ impl UserFacingError for oo7::dbus::Error {
                 "Could not access the default collection. Make sure a keyring was created and set as default.",
             ),
             Error::ZBus(_) |
-            Error::Utf8(_) |
             Error::Crypto(_) |
             Error::IO(_) => gettext(
                 "An unexpected error occurred when interacting with the D-Bus Secret Service.",

src/session/view/content/room_history/message_toolbar/mod.rs

@@ -12,12 +12,12 @@ use matrix_sdk::{
     attachment::{AttachmentConfig, AttachmentInfo, BaseFileInfo, Thumbnail},
     room::edit::EditedContent,
 };
-use matrix_sdk_ui::timeline::{AttachmentSource, RepliedToInfo, TimelineItemContent};
+use matrix_sdk_ui::timeline::{
+    AttachmentSource, EnforceThread, RepliedToInfo, TimelineItemContent,
+};
 use ruma::{
     events::{
-        room::message::{
-            ForwardThread, LocationMessageEventContent, MessageType, RoomMessageEventContent,
-        },
+        room::message::{LocationMessageEventContent, MessageType, RoomMessageEventContent},
         Mentions,
     },
     OwnedRoomId,
@@ -485,7 +485,7 @@ mod imp {
                 Some(RelationInfo::Reply(replied_to_info)) => {
                     let handle = spawn_tokio!(async move {
                         matrix_timeline
-                            .send_reply(content, replied_to_info, ForwardThread::Yes)
+                            .send_reply(content, replied_to_info, EnforceThread::MaybeThreaded)
                             .await
                     });
                     if let Err(error) = handle.await.unwrap() {