fix(crypto api): resetEncryption always calls resetKeyBackup

matrix-org · Jan 23, 2025 · 431bfe5 · 431bfe5
1 parent c0e30ce
commit 431bfe5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/crypto-api/index.ts b/src/crypto-api/index.ts
@@ -401,7 +401,7 @@ export interface CryptoApi {
      * - Disable backing up room keys and delete any existing backups.
      * - Remove the default secret storage key from the account data (ie: the recovery key).
      * - Reset the cross-signing keys.
-     * - Re-enable backing up room keys if enabled before.
+     * - Create a new key backup.
      *
      * @param authUploadDeviceSigningKeys - Callback to authenticate the upload of device signing keys.
      *      Used when resetting the cross signing keys.

diff --git a/src/rust-crypto/rust-crypto.ts b/src/rust-crypto/rust-crypto.ts
@@ -1477,8 +1477,6 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
      * Implementation of {@link CryptoApi#resetEncryption}.
      */
     public async resetEncryption(authUploadDeviceSigningKeys: UIAuthCallback<void>): Promise<void> {
-        const backupEnabled = (await this.backupManager.getActiveBackupVersion()) !== null;
-
         // Disable backup, and delete all the backups from the server
         await this.backupManager.deleteAllKeyBackupVersions();
 
@@ -1491,10 +1489,8 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
             authUploadDeviceSigningKeys,
         });
 
-        // If key backup was enabled, we create a new backup
-        if (backupEnabled) {
-            await this.resetKeyBackup();
-        }
+        // Create a new key backup
+        await this.resetKeyBackup();
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////