quenousimporte
/
notes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use async function to save remote data

This commit is contained in:
quenousimporte 2023-09-21 21:35:46 +02:00
parent 6f35967bfc
commit 8024a513b1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main.js
View File

@ -402,6 +402,7 @@ var snippets = [
function encryptstring(str) function encryptstring(str)
{ {
console.log("encrypting...");
var key = localStorage.getItem("pgpkeys").split("-----BEGIN PGP PRIVATE KEY BLOCK-----")[0]; var key = localStorage.getItem("pgpkeys").split("-----BEGIN PGP PRIVATE KEY BLOCK-----")[0];
var publicKey = null; var publicKey = null;
return openpgp.readKey({ armoredKey: key }) return openpgp.readKey({ armoredKey: key })
@ -420,6 +421,7 @@ function encryptstring(str)
function decryptstring(str) function decryptstring(str)
{ {
console.log("decrypting...");
var key = localStorage.getItem("pgpkeys").split("-----END PGP PUBLIC KEY BLOCK-----")[1]; var key = localStorage.getItem("pgpkeys").split("-----END PGP PUBLIC KEY BLOCK-----")[1];
var privateKey = null; var privateKey = null;
return openpgp.readKey({ armoredKey: key }) return openpgp.readKey({ armoredKey: key })
@ -1940,7 +1942,7 @@ function inactivityalert()
alert("Last save was one hour ago. Should you refresh?"); alert("Last save was one hour ago. Should you refresh?");
} }
async function save() function save()
{ {
clearTimeout(workerid); clearTimeout(workerid);
@ -1994,20 +1996,13 @@ async function save()
if (isremote()) if (isremote())
{ {
var datatosend = JSON.stringify(localdata); var datatosend = JSON.stringify(localdata);
if (localStorage.getItem("pgpkeys")) encryptstring(datatosend)
.then(encrypted =>
{ {
console.log("encrypting..."); console.log("sending data to php server...");
var key = localStorage.getItem("pgpkeys").split("-----BEGIN PGP PRIVATE KEY BLOCK-----")[0]; pending = true;
var publicKey = await openpgp.readKey({ armoredKey: key }); return queryremote({action: "push", data: encrypted})
datatosend = await openpgp.encrypt({ })
message: await openpgp.createMessage({ text: datatosend }),
encryptionKeys: publicKey });
}
console.log("sending data to php server...");
pending = true;
queryremote({action: "push", data: datatosend})
.then(() => .then(() =>
{ {
console.log("...data saved on server"); console.log("...data saved on server");
@ -2029,7 +2024,6 @@ async function save()
console.log("save failed. Data unsaved on server, manual action required."); console.log("save failed. Data unsaved on server, manual action required.");
} }
}); });
} }
else else
{ {