fix: Fix a rebasing issue.

matrix-org · Jan 18, 2024 · d1643f2 · d1643f2
1 parent 61ece69
commit d1643f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # UNRELEASED
 
 -   Report failures to callback when importing backed-up room keys. The
@@ -9,7 +8,6 @@
 
 **BREAKING CHANGES**
 
-
 -   Rename `OlmMachine.init_from_store` introduced in v3.6.0 to
     `OlmMachine.initFromStore`.
     ([#84](https://github.com/matrix-org/matrix-rust-sdk-crypto-wasm/pull/84))

diff --git a/src/machine.rs b/src/machine.rs
@@ -994,7 +994,8 @@ impl OlmMachine {
         let mut failures = 0;
         for backed_up_room_keys_entry in backed_up_room_keys.entries() {
             let backed_up_room_keys_entry: Array = backed_up_room_keys_entry?.dyn_into()?;
-            let room_id = identifiers::RoomId::try_from_js_value(backed_up_room_keys_entry.get(0))?;
+            let room_id =
+                identifiers::RoomId::try_from_js_value(backed_up_room_keys_entry.get(0))?.inner;
 
             let room_room_keys: Map = backed_up_room_keys_entry.get(1).dyn_into()?;