Update matrix-rust-sdk to 183116a4b1

and adapt encrypt_room_event to preserve its interface despite the
change introduced in
matrix-org/matrix-rust-sdk#5936 .

Author: andybalaam

Cargo.lock

@@ -64,9 +64,9 @@ futures-util = "0.3.27"
 getrandom = { version = "0.3.0", features = ["wasm_js"] }
 http = "1.1.0"
 js-sys = "0.3.49"
-matrix-sdk-common = { features = ["js",  "experimental-encrypted-state-events"], version="0.16.0" }
-matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], version="0.16.0" }
-matrix-sdk-qrcode = { optional = true, version="0.16.0" }
+matrix-sdk-common = { features = ["js",  "experimental-encrypted-state-events"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "183116a4b1888039ad4d1714ac0d97f1375cc45a" }
+matrix-sdk-indexeddb = { default-features = false, features = ["e2e-encryption"], git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "183116a4b1888039ad4d1714ac0d97f1375cc45a" }
+matrix-sdk-qrcode = { optional = true, git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "183116a4b1888039ad4d1714ac0d97f1375cc45a" }
 serde = "1.0.91"
 serde_json = "1.0.91"
 serde-wasm-bindgen = "0.6.5"
@@ -85,7 +85,8 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] }
 [dependencies.matrix-sdk-crypto]
 default-features = false
 features = ["js", "automatic-room-key-forwarding", "experimental-encrypted-state-events"]
-version = "0.16.0"
+git = "https://github.com/matrix-org/matrix-rust-sdk"
+rev = "183116a4b1888039ad4d1714ac0d97f1375cc45a"
 
 [lints.rust]
 # Workaround for https://github.com/rustwasm/wasm-bindgen/issues/4283, while we work up the courage to upgrade

Cargo.toml

@@ -521,9 +521,19 @@ impl OlmMachine {
         let me = self.inner.clone();
 
         Ok(future_to_promise(async move {
-            Ok(serde_json::to_string(
-                &me.encrypt_room_event_raw(&room_id, event_type.as_ref(), &content).await?,
-            )?)
+            let encryption_result =
+                me.encrypt_room_event_raw(&room_id, event_type.as_ref(), &content).await?;
+
+            // Note: encryption_result contains EncryptionInfo that we discard here, but
+            // might conceivably be of interest to our callers in future.
+            //
+            // See https://github.com/matrix-org/matrix-rust-sdk/pull/5936 for the change that
+            // added this info.
+            //
+            // For now, we just return the event content, which preserves the same interface
+            // we had before.
+
+            Ok(serde_json::to_string(&encryption_result.content)?)
         }))
     }