Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Fix handling of disabled master keys when enabling E2EE

pull/5448/head
Laurent Cozic 2021-09-09 19:24:52 +01:00
parent d33b99cffb
commit a2c6461af8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,8 +162,8 @@ export function showMissingMasterKeyMessage(syncInfo: SyncInfo, notLoadedMasterK
export function getDefaultMasterKey(): MasterKeyEntity {
let mk = getActiveMasterKey();
if (!mk || !mk.enabled) {
if (!mk || masterKeyEnabled(mk)) {
mk = MasterKey.latest();
}
return mk && mk.enabled ? mk : null;
return mk && masterKeyEnabled(mk) ? mk : null;
}