Handle immediate outgoing backup requests

element-hq · Aug 2, 2023 · 64463f4 · 64463f4
1 parent bfe6c37
commit 64463f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/e2ee/CryptoClient.ts b/src/e2ee/CryptoClient.ts
@@ -296,6 +296,7 @@ export class CryptoClient {
     public async enableKeyBackup(info: IKeyBackupInfoRetrieved): Promise<void> {
         this.client.on("to_device.decrypted", this.onToDeviceMessage);
         await this.engine.enableKeyBackup(info);
+        this.engine.backupRoomKeys();
     }
 
     /**
@@ -308,7 +309,7 @@ export class CryptoClient {
 
     private readonly onToDeviceMessage = (msg: IToDeviceMessage): void => {
         if (msg.type === "m.room_key") {
-            this.engine.machine.backupRoomKeys();
+            this.engine.backupRoomKeys();
         }
     };
 }
diff --git a/src/e2ee/RustEngine.ts b/src/e2ee/RustEngine.ts
@@ -148,6 +148,13 @@ export class RustEngine {
         await this.machine.disableBackup();
     }
 
+    public async backupRoomKeys() {
+        const request = await this.machine.backupRoomKeys();
+        if (request) {
+            await this.processKeysBackupRequest(request);
+        }
+    }
+
     private async processKeysClaimRequest(request: KeysClaimRequest) {
         const resp = await this.client.doRequest("POST", "/_matrix/client/v3/keys/claim", null, JSON.parse(request.body));
         await this.machine.markRequestAsSent(request.id, request.type, JSON.stringify(resp));