self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-17 11:26:26 +02:00
Code Issues Releases Activity

All: Do not display master key upgrade warnings for new master keys

Browse Source
This commit is contained in:
Laurent Cozic 2021-08-27 11:30:21 +01:00
parent 814f602bd6
commit 70efaddeaf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/services/e2ee/EncryptionService.ts
View File

@ -189,7 +189,9 @@ export default class EncryptionService {
} }
masterKeysThatNeedUpgrading(masterKeys: MasterKeyEntity[]) { masterKeysThatNeedUpgrading(masterKeys: MasterKeyEntity[]) {
return MasterKey.allWithoutEncryptionMethod(masterKeys, this.defaultMasterKeyEncryptionMethod_); const output = MasterKey.allWithoutEncryptionMethod(masterKeys, this.defaultMasterKeyEncryptionMethod_);
// Anything below 5 is a new encryption method and doesn't need an upgrade
return output.filter(mk => mk.encryption_method <= 5);
} }
async upgradeMasterKey(model: MasterKeyEntity, decryptionPassword: string) { async upgradeMasterKey(model: MasterKeyEntity, decryptionPassword: string) {