matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00
Code Activity

Element-R: fix bootstrapSecretStorage not resetting key backup when requested (#3976)

Browse Source 
* pull resetKeyBackup outside of if statement

* fix broken conflict resolution

* prettier
This commit is contained in:
Hubert Chathi
2023-12-29 09:19:11 -05:00
committed by GitHub
parent f2625348d8
commit febef3fc7c
2 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rust-crypto/rust-crypto.ts
View File

@@ -732,10 +732,10 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, RustCryptoEv
await this.secretStorage.store("m.cross_signing.master", crossSigningPrivateKeys.masterKey);
await this.secretStorage.store("m.cross_signing.user_signing", crossSigningPrivateKeys.userSigningKey);
await this.secretStorage.store("m.cross_signing.self_signing", crossSigningPrivateKeys.self_signing_key);
}
if (setupNewKeyBackup) {
await this.resetKeyBackup();
}
if (setupNewKeyBackup) {
await this.resetKeyBackup();
}
}