Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 09:16:45 +01:00
Code Issues Packages Projects Releases Activity

when reloading tree after sync, decrypt tree items if in encryption context

Browse Source
This commit is contained in:
azivner
2017-11-03 21:20:06 -04:00
parent cf45594d89
commit bd71547258
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
public/javascripts/encryption.js
View File

@@ -72,6 +72,22 @@ function computeScrypt(password, salt, callback) {
});
}
function decryptTreeItems() {
if (!isEncryptionAvailable()) {
return;
}
for (const noteId of globalAllNoteIds) {
const note = getNodeByKey(noteId);
if (note.data.encryption > 0) {
const title = decryptString(note.data.note_title);
note.setTitle(title);
}
}
}
$("#encryption-password-form").submit(() => {
const password = $("#encryption-password").val();
$("#encryption-password").val("");
@@ -81,15 +97,7 @@ $("#encryption-password-form").submit(() => {
globalDataKey = key;
for (const noteId of globalAllNoteIds) {
const note = getNodeByKey(noteId);
if (note.data.encryption > 0) {
const title = decryptString(note.data.note_title);
note.setTitle(title);
}
}
decryptTreeItems();
if (globalEncryptionDeferred !== null) {
globalEncryptionDeferred.resolve();
@@ -97,11 +105,11 @@ $("#encryption-password-form").submit(() => {
globalEncryptionDeferred = null;
}
})
.catch(reason => {
console.log(reason);
.catch(reason => {
console.log(reason);
alert(reason);
});
alert(reason);
});
return false;
});