Browse Source

chore: Upgrade crates

merge-requests/1461/head
Kévin Commaille 2 years ago
parent
commit
33d06a93e8
No known key found for this signature in database
GPG Key ID: 29A48C1F03620416
  1. 1310
      Cargo.lock
  2. 4
      Cargo.toml
  3. 14
      src/secret.rs
  4. 5
      src/session/model/room/mod.rs

1310
Cargo.lock generated

File diff suppressed because it is too large Load Diff

4
Cargo.toml

@ -75,7 +75,7 @@ sourceview = { package = "sourceview5", version = "0.7" }
[dependencies.matrix-sdk] [dependencies.matrix-sdk]
git = "https://github.com/matrix-org/matrix-rust-sdk.git" git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "f945a50d22aabb14e018d74303d6d6d26779d423" rev = "8895ce40d13faa79012144c97044990284215758"
features = [ features = [
"socks", "socks",
"sso-login", "sso-login",
@ -86,7 +86,7 @@ features = [
[dependencies.matrix-sdk-ui] [dependencies.matrix-sdk-ui]
git = "https://github.com/matrix-org/matrix-rust-sdk.git" git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "f945a50d22aabb14e018d74303d6d6d26779d423" rev = "8895ce40d13faa79012144c97044990284215758"
default-features = false default-features = false
features = ["e2e-encryption", "native-tls"] features = ["e2e-encryption", "native-tls"]

14
src/secret.rs

@ -126,6 +126,20 @@ impl UserFacingError for oo7::dbus::Error {
oo7::dbus::Error::Deleted => gettext( oo7::dbus::Error::Deleted => gettext(
"The item was deleted.", "The item was deleted.",
), ),
oo7::dbus::Error::Service(s) => match s {
oo7::dbus::ServiceError::ZBus(_) => gettext(
"An unknown error occurred when interacting with the D-Bus Secret Service.",
),
oo7::dbus::ServiceError::IsLocked => gettext(
"The collection or item is locked.",
),
oo7::dbus::ServiceError::NoSession => gettext(
"The D-Bus Secret Service session does not exist.",
),
oo7::dbus::ServiceError::NoSuchObject => gettext(
"The collection or item does not exist.",
),
},
oo7::dbus::Error::Dismissed => gettext( oo7::dbus::Error::Dismissed => gettext(
"The request to the D-Bus Secret Service was cancelled. Make sure to accept any prompt asking to access it.", "The request to the D-Bus Secret Service was cancelled. Make sure to accept any prompt asking to access it.",
), ),

5
src/session/model/room/mod.rs

@ -1184,10 +1184,7 @@ impl Room {
spawn_tokio!(async move { spawn_tokio!(async move {
matrix_room matrix_room
.send( .send(ReactionEventContent::new(Annotation::new(relates_to, key)))
ReactionEventContent::new(Annotation::new(relates_to, key)),
None,
)
.await .await
}) })
.await .await

Loading…
Cancel
Save