Skip to content

Commit 5a8aef8

Browse files
committed
Bump sdk to 7126fc8a2
... which includes matrix-org/matrix-rust-sdk#5099, which moves `ProcessedToDeviceEvent` to matrix-sdk-common.
1 parent 2bb9c5f commit 5a8aef8

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

CHANGELOG.md

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

3-
- Update matrix-rust-sdk to `6ab11a032`.
3+
- Update matrix-rust-sdk to `7126fc8a2`.
44

55
- Add a new error code for `MegolmDecryptionError`, `DecryptionErrorCode::MismatchedSender`, indicating that the sender of the event does not match the owner of the device that established the Megolm session. ([#248](https://github.com/matrix-org/matrix-rust-sdk-crypto-wasm/pull/248))
66

Cargo.lock

Lines changed: 5 additions & 5 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
@@ -64,9 +64,9 @@ futures-util = "0.3.27"
6464
getrandom = { version = "0.3.0", features = ["wasm_js"] }
6565
http = "1.1.0"
6666
js-sys = "0.3.49"
67-
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", features = ["js"] }
68-
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", default-features = false, features = ["e2e-encryption"] }
69-
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "6ab11a032", optional = true }
67+
matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "7126fc8a2", features = ["js"] }
68+
matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "7126fc8a2", default-features = false, features = ["e2e-encryption"] }
69+
matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "7126fc8a2", optional = true }
7070
serde = "1.0.91"
7171
serde_json = "1.0.91"
7272
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 = "6ab11a032"
87+
rev = "7126fc8a2"
8888
default-features = false
8989
features = ["js", "automatic-room-key-forwarding"]
9090

src/types.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,13 @@ impl InvalidToDeviceEvent {
492492
/// If the event cannot be mapped into one of those types, we instead return
493493
/// `None`, indicating the event should be discarded.
494494
pub fn processed_to_device_event_to_js_value(
495-
processed_to_device_event: matrix_sdk_crypto::types::ProcessedToDeviceEvent,
495+
processed_to_device_event: matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent,
496496
) -> Option<JsValue> {
497497
let result = match processed_to_device_event {
498-
matrix_sdk_crypto::types::ProcessedToDeviceEvent::Decrypted { raw, encryption_info } => {
498+
matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::Decrypted {
499+
raw,
500+
encryption_info,
501+
} => {
499502
match encryption_info.try_into() {
500503
Ok(encryption_info) => {
501504
DecryptedToDeviceEvent { raw_event: raw.json().get().into(), encryption_info }
@@ -513,13 +516,13 @@ pub fn processed_to_device_event_to_js_value(
513516
}
514517
}
515518
}
516-
matrix_sdk_crypto::types::ProcessedToDeviceEvent::UnableToDecrypt(utd) => {
519+
matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::UnableToDecrypt(utd) => {
517520
UTDToDeviceEvent { raw_event: utd.json().get().into() }.into()
518521
}
519-
matrix_sdk_crypto::types::ProcessedToDeviceEvent::PlainText(plain) => {
522+
matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::PlainText(plain) => {
520523
PlainTextToDeviceEvent { raw_event: plain.json().get().into() }.into()
521524
}
522-
matrix_sdk_crypto::types::ProcessedToDeviceEvent::Invalid(invalid) => {
525+
matrix_sdk_common::deserialized_responses::ProcessedToDeviceEvent::Invalid(invalid) => {
523526
InvalidToDeviceEvent { raw_event: invalid.json().get().into() }.into()
524527
}
525528
};

0 commit comments

Comments
 (0)