Skip to content

Commit 95d9b29

Browse files
committed
Bump SDK to eeaa091
This includes matrix-org/matrix-rust-sdk#5048. The significant changes for us are that `AnyOutgoingRequest::RoomMessage`, `OutgoingVerificationRequest::InRoom`, `Verification::SasV1` and `Verification::QrV1` are all now `Box`es that we need to deref.
1 parent 52f70d9 commit 95d9b29

File tree

5 files changed

+38
-31
lines changed

5 files changed

+38
-31
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# UNRELEASED
22

3-
- Update matrix-rusk-sdk to `59ecb1edb`.
3+
- Update matrix-rusk-sdk to `eeaa09102`, which includes:
4+
5+
- Send stable identifier `sender_device_keys` for MSC4147 (Including device
6+
keys with Olm-encrypted events).
7+
([#4964](https://github.com/matrix-org/matrix-rust-sdk/pull/4964))
8+
9+
- Fix bug which caused room keys to be unnecessarily rotated on every send in the
10+
presence of blacklisted/withheld devices in the room.
11+
([#4954](https://github.com/matrix-org/matrix-rust-sdk/pull/4954))
12+
13+
- Fix [#2729](https://github.com/matrix-org/matrix-rust-sdk/issues/2729) which in rare
14+
cases can cause room key oversharing.
15+
([#4975](https://github.com/matrix-org/matrix-rust-sdk/pull/4975))
416

517
- **BREAKING**: `OlmMachine.receiveSyncChanges` now returns a list of
618
`ProcessedToDeviceEvent` instead of a JSON-encoded list of JSON-encoded events.

Cargo.lock

Lines changed: 14 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ futures-util = "0.3.27"
6565
getrandom = { version = "0.3.0", features = ["wasm_js"] }
6666
http = "1.1.0"
6767
js-sys = "0.3.49"
68-
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "59ecb1edb", features = ["js"] }
69-
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "59ecb1edb", default-features = false, features = ["e2e-encryption"] }
70-
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "59ecb1edb", optional = true }
68+
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "eeaa09102", features = ["js"] }
69+
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "eeaa09102", default-features = false, features = ["e2e-encryption"] }
70+
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "eeaa09102", optional = true }
7171
serde = "1.0.91"
7272
serde_json = "1.0.91"
7373
serde-wasm-bindgen = "0.6.5"
@@ -84,7 +84,7 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] }
8484

8585
[dependencies.matrix-sdk-crypto]
8686
git = "https://github.com/matrix-org/matrix-rust-sdk"
87-
rev = "59ecb1edb"
87+
rev = "eeaa09102"
8888
default-features = false
8989
features = ["js", "automatic-room-key-forwarding"]
9090

src/requests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ pub fn outgoing_request_to_js_value(
513513
}
514514

515515
AnyOutgoingRequest::RoomMessage(request) => {
516-
JsValue::from(RoomMessageRequest::try_from((request_id, request))?)
516+
JsValue::from(RoomMessageRequest::try_from((request_id, request.as_ref()))?)
517517
}
518518
})
519519
}

src/verification.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ impl TryFrom<Verification> for JsValue {
104104
use matrix_sdk_crypto::Verification::*;
105105

106106
Ok(match verification.0 {
107-
SasV1(sas) => JsValue::from(Sas { inner: sas }),
107+
SasV1(sas) => JsValue::from(Sas { inner: *sas }),
108108

109109
#[cfg(feature = "qrcode")]
110-
QrV1(qr) => JsValue::from(Qr { inner: qr }),
110+
QrV1(qr) => JsValue::from(Qr { inner: *qr }),
111111

112112
_ => {
113113
return Err(JsError::new(
@@ -1093,9 +1093,10 @@ impl TryFrom<OutgoingVerificationRequest> for JsValue {
10931093
JsValue::from(requests::ToDeviceRequest::try_from((request_id, &request))?)
10941094
}
10951095

1096-
InRoom(request) => {
1097-
JsValue::from(requests::RoomMessageRequest::try_from((request_id, &request))?)
1098-
}
1096+
InRoom(request) => JsValue::from(requests::RoomMessageRequest::try_from((
1097+
request_id,
1098+
request.as_ref(),
1099+
))?),
10991100
})
11001101
}
11011102
}

0 commit comments

Comments
 (0)