From 78e68bbef22b69fe7f91fdd18808677717935874 Mon Sep 17 00:00:00 2001
From: quenousimporte <quenousimporte@riseup.net>
Date: Thu, 21 Sep 2023 21:45:09 +0200
Subject: [PATCH] refactor: use async func to decrypt

---
 main.js | 62 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/main.js b/main.js
index c92d711..6f11ece 100644
--- a/main.js
+++ b/main.js
@@ -421,6 +421,11 @@ function encryptstring(str)
 
 function decryptstring(str)
 {
+	if (!str.startsWith("-----BEGIN PGP MESSAGE-----"))
+	{
+		console.log("string is not encrypted");
+		return Promise.resolve(str);
+	}
 	console.log("decrypting...");
 	var key = localStorage.getItem("pgpkeys").split("-----END PGP PUBLIC KEY BLOCK-----")[1];
 	var privateKey = null;
@@ -1499,7 +1504,7 @@ function checkevents()
 	.catch(remotecallfailed);
 }
 
-async function queryremote(params)
+function queryremote(params)
 {
 	return new Promise( (apply, failed) => {
 
@@ -1526,7 +1531,7 @@ async function queryremote(params)
 			failed("XMLHttpRequest error");
 		}
 
-		xhr.onload = async function()
+		xhr.onload = function()
 		{
 			if (xhr.status !== 200)
 			{
@@ -1537,45 +1542,34 @@ async function queryremote(params)
 				var data = {};
 				try
 				{
-					var response = xhr.responseText;
-					if (localStorage.getItem("pgpkeys") && response.startsWith("-----BEGIN PGP MESSAGE-----"))
+					return decryptstring(xhr.responseText)
+					.then(decrypted =>
 					{
-						console.log("decrypting...");
-						var key = localStorage.getItem("pgpkeys").split("-----END PGP PUBLIC KEY BLOCK-----")[1];
-						var privateKey = await openpgp.readKey({ armoredKey: key });
-						var decrypted = await openpgp.decrypt({
-							message: await openpgp.readMessage({ armoredMessage: response }),
-							decryptionKeys: privateKey });
-					    const chunks = [];
-					    for await (const chunk of decrypted.data) {
-					        chunks.push(chunk);
-					    }
-					    response = chunks.join('');
-					}
-					data = JSON.parse(response);
+						data = JSON.parse(decrypted);
 
-					if (data.error)
-					{
-						if (data.error == "authent")
+						if (data.error)
 						{
-							failed();
-							togglepassword();
+							if (data.error == "authent")
+							{
+								failed();
+								togglepassword();
+							}
+							else
+							{
+								failed("Remote handler returned an error: " + data.error);
+							}
+						}
+						else if (data.warning)
+						{
+							console.warn("Remote warning: " + data.warning);
 						}
 						else
 						{
-							failed("Remote handler returned an error: " + data.error);
+							authentpage.hidden = true;
+							notepage.style.display = "table";
+							apply(data);
 						}
-					}
-					else if (data.warning)
-					{
-						console.warn("Remote warning: " + data.warning);
-					}
-					else
-					{
-						authentpage.hidden = true;
-						notepage.style.display = "table";
-						apply(data);
-					}
+					});
 				}
 				catch(error)
 				{