chore: Bump Ruma.

Author: poljar

crates/matrix-qrcode/Cargo.toml

@@ -27,5 +27,8 @@ byteorder = "1.4.3"
 image = { version = "0.23.14", optional = true }
 qrcode = { version = "0.12.0", default-features = false }
 rqrr = { version = "0.4.0", optional = true }
-ruma-identifiers = { git = "https://github.com/ruma/ruma", rev = "6c4892664" }
 thiserror = "1.0.25"
+
+[dependencies.ruma-identifiers]
+git = "https://github.com/ruma/ruma/"
+rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"

crates/matrix-sdk-appservice/Cargo.toml

@@ -37,8 +37,8 @@ url = "2"
 warp = { version = "0.3.1", optional = true, default-features = false }
 
 [dependencies.ruma]
-git = "https://github.com/ruma/ruma"
-rev = "6c4892664"
+git = "https://github.com/ruma/ruma/"
+rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
 features = ["client-api-c", "appservice-api-s", "unstable-pre-spec"]
 
 [dev-dependencies]

crates/matrix-sdk-base/Cargo.toml

@@ -19,7 +19,14 @@ rustdoc-args = ["--cfg", "feature=\"docs\""]
 default = []
 encryption = ["matrix-sdk-crypto"]
 qrcode = ["matrix-sdk-crypto/qrcode"]
-sled_state_store = ["sled", "pbkdf2", "hmac", "sha2", "rand", "chacha20poly1305"]
+sled_state_store = [
+    "sled",
+    "pbkdf2",
+    "hmac",
+    "sha2",
+    "rand",
+    "chacha20poly1305",
+]
 sled_cryptostore = ["matrix-sdk-crypto/sled_cryptostore"]
 
 docs = ["encryption", "sled_cryptostore"]
@@ -35,7 +42,6 @@ matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
 matrix-sdk-crypto = { version = "0.4.0", path = "../matrix-sdk-crypto", optional = true }
 pbkdf2 = { version = "0.9.0", default-features = false, optional = true }
 rand = { version = "0.8.4", optional = true }
-ruma = { git = "https://github.com/ruma/ruma", rev = "6c4892664", features = ["client-api-c", "unstable-pre-spec"] }
 serde = { version = "1.0.126", features = ["rc"] }
 serde_json = "1.0.64"
 sha2 = { version = "0.9.5", optional = true }
@@ -44,6 +50,11 @@ thiserror = "1.0.25"
 tracing = "0.1.26"
 zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
+[dependencies.ruma]
+git = "https://github.com/ruma/ruma/"
+rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+features = ["client-api-c", "unstable-pre-spec"]
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
 version = "1.7.1"
 default-features = false
@@ -60,7 +71,10 @@ clap = "2.33.3"
 rustyline = "9.0.0"
 rustyline-derive = "0.5.0"
 syntect = "4.5.0"
-tokio = { version = "1.7.1", default-features = false, features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.7.1", default-features = false, features = [
+    "rt-multi-thread",
+    "macros",
+] }
 tempfile = "3.2.0"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

crates/matrix-sdk-base/src/client.rs

@@ -650,6 +650,7 @@ impl BaseClient {
         &self,
         response: api::sync::sync_events::Response,
     ) -> Result<SyncResponse> {
+        #[allow(unused_variables)]
         let api::sync::sync_events::Response {
             next_batch,
             rooms,
@@ -658,6 +659,7 @@ impl BaseClient {
             to_device,
             device_lists,
             device_one_time_keys_count,
+            device_unused_fallback_key_types,
             ..
         } = response;
 
@@ -679,8 +681,13 @@ impl BaseClient {
                 // decrypts to-device events, but leaves room events alone.
                 // This makes sure that we have the decryption keys for the room
                 // events at hand.
-                o.receive_sync_changes(to_device, &device_lists, &device_one_time_keys_count)
-                    .await?
+                o.receive_sync_changes(
+                    to_device,
+                    &device_lists,
+                    &device_one_time_keys_count,
+                    device_unused_fallback_key_types.as_deref(),
+                )
+                .await?
             } else {
                 to_device
             }

crates/matrix-sdk-common/Cargo.toml

@@ -13,11 +13,18 @@ version = "0.4.1"
 
 [dependencies]
 async-trait = "0.1.50"
-ruma = { git = "https://github.com/ruma/ruma", rev = "6c4892664", features = ["client-api-c"] }
 serde = "1.0.126"
 
+[dependencies.ruma]
+git = "https://github.com/ruma/ruma/"
+rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+features = ["client-api-c"]
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-uuid = { version = "0.8.2", default-features = false, features = ["v4", "serde"] }
+uuid = { version = "0.8.2", default-features = false, features = [
+    "v4",
+    "serde",
+] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
 version = "1.7.1"
@@ -36,4 +43,8 @@ features = ["now"]
 async-lock = "2.4.0"
 futures-util = { version = "0.3.15", default-features = false, features = ["channel"] }
 wasm-bindgen-futures = "0.4.24"
-uuid = { version = "0.8.2", default-features = false, features = ["v4", "wasm-bindgen", "serde"] }
+uuid = { version = "0.8.2", default-features = false, features = [
+    "v4",
+    "wasm-bindgen",
+    "serde",
+] }

crates/matrix-sdk-crypto/Cargo.toml

@@ -38,10 +38,6 @@ matrix-sdk-common = { version = "0.4.0", path = "../matrix-sdk-common" }
 olm-rs = { version = "2.1", features = ["serde"] }
 pbkdf2 = { version = "0.9.0", default-features = false }
 rand = "0.8.4"
-ruma = { git = "https://github.com/ruma/ruma", rev = "6c4892664", features = [
-    "client-api-c",
-    "unstable-pre-spec",
-] }
 serde = { version = "1.0.126", features = ["derive", "rc"] }
 serde_json = "1.0.64"
 sha2 = "0.9.5"
@@ -50,6 +46,11 @@ thiserror = "1.0.25"
 tracing = "0.1.26"
 zeroize = { version = "1.3.0", features = ["zeroize_derive"] }
 
+[dependencies.ruma]
+git = "https://github.com/ruma/ruma/"
+rev = "fdbc4d6d1dd273c8a6ac95b329943ed8c68df70d"
+features = ["client-api-c", "unstable-pre-spec"]
+
 [dev-dependencies]
 criterion = { version = "0.3.4", features = [
     "async",

crates/matrix-sdk-crypto/README.md

@@ -33,12 +33,14 @@ async fn main() -> Result<(), OlmError> {
     let to_device_events = ToDevice::default();
     let changed_devices = DeviceLists::default();
     let one_time_key_counts = BTreeMap::default();
+    let unused_fallback_keys = Some(Vec::new());
 
     // Push changes that the server sent to us in a sync response.
     let decrypted_to_device = machine.receive_sync_changes(
         to_device_events,
         &changed_devices,
-        &one_time_key_counts
+        &one_time_key_counts,
+        unused_fallback_keys.as_deref(),
     ).await?;
 
     // Pull requests that we need to send out.

crates/matrix-sdk-crypto/src/backups/mod.rs

@@ -30,7 +30,8 @@ use std::{
 
 use matrix_sdk_common::{locks::RwLock, uuid::Uuid};
 use ruma::{
-    api::client::r0::backup::RoomKeyBackup, DeviceKeyAlgorithm, DeviceKeyId, RoomId, UserId,
+    api::client::r0::backup::RoomKeyBackup, serde::Raw, DeviceKeyAlgorithm, DeviceKeyId, RoomId,
+    UserId,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -369,6 +370,11 @@ impl BackupMachine {
                 .or_default()
                 .insert(session_id.clone());
 
+            let session = Raw::from_json(
+                serde_json::value::to_raw_value(&session)
+                    .expect("Can't serialize a backed up room key"),
+            );
+
             backup
                 .entry(room_id)
                 .or_insert_with(|| RoomKeyBackup::new(BTreeMap::new()))

crates/matrix-sdk-crypto/src/error.rs

@@ -213,4 +213,6 @@ pub(crate) enum SessionCreationError {
     DeviceMissingCurveKey(Box<UserId>, Box<DeviceId>),
     #[error("Error creating new Olm session for {0} {1}: {2:?}")]
     OlmError(Box<UserId>, Box<DeviceId>, OlmSessionError),
+    #[error("Error deserializing the one-time key: {0}")]
+    InvalidJson(#[from] serde_json::Error),
 }