mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-04-29 16:59:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

encryption of note history if the note is encrypted

Browse Source
This commit is contained in:
azivner
2017-11-02 23:36:58 -04:00
parent 4073f6a967
commit 471f7c669d
3 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/javascripts/encryption.js
+27
View File
@@ -235,10 +235,37 @@ function encryptNoteAndSendToServer() {
saveNoteToServer(note);
encryptNoteHistory(note.detail.note_id);
setNoteBackgroundIfEncrypted(note);
});
}
function encryptNoteHistory(noteId) {
$.ajax({
url: baseApiUrl + 'notes-history/' + noteId + "?encryption=0",
type: 'GET',
success: result => {
for (const row of result) {
row.note_title = encryptString(row.note_title);
row.note_text = encryptString(row.note_text);
row.encryption = 1;
$.ajax({
url: baseApiUrl + 'notes-history',
type: 'PUT',
contentType: 'application/json',
data: JSON.stringify(row),
success: result => console.log('Note history ' + row.note_history_id + ' encrypted'),
error: () => alert("Error encrypting note history.")
});
}
},
error: () => alert("Error getting note history.")
});
}
function decryptNoteAndSendToServer() {
handleEncryption(true, true, () => {
const note = globalCurrentNote;
public/javascripts/note_history.js
+12 -4
View File
@@ -24,7 +24,7 @@ function showNoteHistoryDialog(noteId, noteHistoryId) {
const dateModified = getDateFromTS(row.date_modified_to);
$("#note-history-list").append($('<option>', {
value: row.id,
value: row.note_history_id,
text: formatDateTime(dateModified)
}));
}
@@ -46,8 +46,16 @@ $(document).bind('keydown', 'alt+h', showCurrentNoteHistory);
$("#note-history-list").on('change', () => {
const optVal = $("#note-history-list").find(":selected").val();
const historyItem = globalHistoryItems.find(r => r.id == optVal); // non-strict comparison is important here!!!
const historyItem = globalHistoryItems.find(r => r.note_history_id === optVal);
$("#note-history-title").html(historyItem.note_title);
$("#note-history-content").html(historyItem.note_text);
let noteTitle = historyItem.note_title;
let noteText = historyItem.note_text;
if (historyItem.encryption > 0) {
noteTitle = decryptString(noteTitle);
noteText = decryptString(noteText);
}
$("#note-history-title").html(noteTitle);
$("#note-history-content").html(noteText);
});