rust-crypto: allow reporting failures when restoring keys

matrix-org · Jan 12, 2024 · eecf09d · eecf09d
1 parent 2ef3ebb
commit eecf09d
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/rust-crypto/backup.ts b/src/rust-crypto/backup.ts
@@ -207,15 +207,18 @@ export class RustBackupManager extends TypedEventEmitter<RustBackupCryptoEvents,
             }
             keysByRoom.get(roomId)!.set(key.session_id, key);
         }
-        await this.olmMachine.importBackedUpRoomKeys(keysByRoom, (progress: BigInt, total: BigInt): void => {
-            const importOpt: ImportRoomKeyProgressData = {
-                total: Number(total),
-                successes: Number(progress),
-                stage: "load_keys",
-                failures: 0,
-            };
-            opts?.progressCallback?.(importOpt);
-        });
+        await this.olmMachine.importBackedUpRoomKeys(
+            keysByRoom,
+            (progress: BigInt, total: BigInt, failures?: BigInt): void => {
+                const importOpt: ImportRoomKeyProgressData = {
+                    total: Number(total),
+                    successes: Number(progress),
+                    stage: "load_keys",
+                    failures: failures == undefined ? 0 : Number(failures),
+                };
+                opts?.progressCallback?.(importOpt);
+            },
+        );
     }
 
     private keyBackupCheckInProgress: Promise<KeyBackupCheck | null> | null = null;