diff --git a/Cargo.lock b/Cargo.lock index eedd119575e..44740ec7769 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.13.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "assign", "js_int", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.21.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "as_variant", "assign", @@ -4845,7 +4845,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.16.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "as_variant", "base64", @@ -4878,7 +4878,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.31.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "as_variant", "indexmap", @@ -4904,7 +4904,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.12.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "headers", "http", @@ -4925,7 +4925,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.5.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "as_variant", "html5ever", @@ -4936,7 +4936,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.11.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "js_int", "thiserror 2.0.16", @@ -4945,7 +4945,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.16.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "cfg-if", "proc-macro-crate", @@ -4960,7 +4960,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.18.0" -source = "git+https://github.com/ruma/ruma?rev=15307f0eb361d7e04cfa33602fdffbf10c54a173#15307f0eb361d7e04cfa33602fdffbf10c54a173" +source = "git+https://github.com/ruma/ruma?rev=91424b1fcb6642e1a579043a308fb326dd346860#91424b1fcb6642e1a579043a308fb326dd346860" dependencies = [ "base64", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index e77a2e06fc0..1d4fd048322 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ rand = "0.8.5" regex = "1.11.2" reqwest = { version = "0.12.23", default-features = false } rmp-serde = "1.3.0" -ruma = { git = "https://github.com/ruma/ruma", rev = "15307f0eb361d7e04cfa33602fdffbf10c54a173", features = [ +ruma = { git = "https://github.com/ruma/ruma", rev = "91424b1fcb6642e1a579043a308fb326dd346860", features = [ "client-api-c", "compat-upload-signatures", "compat-arbitrary-length-ids", diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml index 92b9f1f2326..c91e06ad0a0 100644 --- a/crates/matrix-sdk-base/Cargo.toml +++ b/crates/matrix-sdk-base/Cargo.toml @@ -36,7 +36,7 @@ experimental-send-custom-to-device = [ # https://github.com/matrix-org/matrix-rust-sdk/issues/5397. experimental-encrypted-state-events = [ "e2e-encryption", - "ruma/unstable-msc3414", + "ruma/unstable-msc4362", "matrix-sdk-crypto?/experimental-encrypted-state-events" ] diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml index 91bca29b9de..3401f442b93 100644 --- a/crates/matrix-sdk-crypto/Cargo.toml +++ b/crates/matrix-sdk-crypto/Cargo.toml @@ -23,7 +23,7 @@ experimental-send-custom-to-device = [] # https://github.com/matrix-org/matrix-rust-sdk/issues/5397. experimental-encrypted-state-events = [ "matrix-sdk-common/experimental-encrypted-state-events", - "ruma/unstable-msc3414" + "ruma/unstable-msc4362" ] js = ["ruma/js", "vodozemac/js", "matrix-sdk-common/js"] diff --git a/crates/matrix-sdk-ui/Cargo.toml b/crates/matrix-sdk-ui/Cargo.toml index beb95145e95..33b87f8a066 100644 --- a/crates/matrix-sdk-ui/Cargo.toml +++ b/crates/matrix-sdk-ui/Cargo.toml @@ -29,7 +29,7 @@ unstable-msc4274 = ["matrix-sdk/unstable-msc4274"] # https://github.com/matrix-org/matrix-rust-sdk/issues/5397. experimental-encrypted-state-events = [ "matrix-sdk-base/experimental-encrypted-state-events", - "ruma/unstable-msc3414" + "ruma/unstable-msc4362" ] [dependencies] diff --git a/crates/matrix-sdk-ui/src/timeline/tests/encryption.rs b/crates/matrix-sdk-ui/src/timeline/tests/encryption.rs index 6b9dfd7f14c..04de35a0e45 100644 --- a/crates/matrix-sdk-ui/src/timeline/tests/encryption.rs +++ b/crates/matrix-sdk-ui/src/timeline/tests/encryption.rs @@ -928,7 +928,9 @@ async fn test_retry_decryption_updates_reply() { // We receive the UTD. { - let event = assert_next_matches!(stream, VectorDiff::PushBack { value } => value); + let event = + assert_next_matches_with_timeout!(stream, VectorDiff::PushBack { value } => value); + assert_let!( TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::UnableToDecrypt(EncryptedMessage::MegolmV1AesSha2 { diff --git a/testing/matrix-sdk-test/src/test_json/sync_events.rs b/testing/matrix-sdk-test/src/test_json/sync_events.rs index 587cbd73de6..54a8a55976b 100644 --- a/testing/matrix-sdk-test/src/test_json/sync_events.rs +++ b/testing/matrix-sdk-test/src/test_json/sync_events.rs @@ -125,7 +125,7 @@ pub static ENCRYPTION_WITH_ENCRYPTED_STATE_EVENTS_CONTENT: Lazy = Laz "algorithm": "m.megolm.v1.aes-sha2", "rotation_period_ms": 604800000, "rotation_period_msgs": 100, - "io.element.msc3414.encrypt_state_events": true + "io.element.msc4362.encrypt_state_events": true }) });