From 58cdd01c1902ae72e80c638fedfcf942224628bd Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Sat, 5 Oct 2024 16:51:54 +0200
Subject: [PATCH] improved the dynamic menu prompts loading

---
 mzta-background.js  | 20 +++++++++++---------
 popup/mzta-popup.js |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/mzta-background.js b/mzta-background.js
index 99dc515a..2373ef07 100644
--- a/mzta-background.js
+++ b/mzta-background.js
@@ -103,22 +103,24 @@ async function handleShortcut(tab) {
     }    
 }
 
-async function preparePopupMenu(tab) {
-    await taStore.setSessionData("lastShortcutTabId", tab.id);
-    await taStore.setSessionData("lastShortcutTabType", tab.type);
-    await taStore.setSessionData("lastShortcutPromptsData", menus.shortcutMenu);
-    //console.log(">>>>>>>> menus.shortcutMenu: " + JSON.stringify(menus.shortcutMenu));
+function preparePopupMenu(tab) {
+    let output = {};
+    output.lastShortcutTabId = tab.id;
+    output.lastShortcutTabType = tab.type;
+    output.lastShortcutPromptsData = menus.shortcutMenu;
+    output.lastShortcutFiltering = 0;
     switch (tab.type) {
         case "mail":
         case "messageDisplay":
-            taStore.setSessionData("lastShortcutFiltering", 1);
+            output.lastShortcutFiltering = 1;
             break;
         case "messageCompose":
-            taStore.setSessionData("lastShortcutFiltering", 2);
+            output.lastShortcutFiltering = 2;
             break;
         default:
             break;
     }
+    return output;
 }
 
 messenger.runtime.onMessage.addListener((message, sender, sendResponse) => {
@@ -224,8 +226,8 @@ messenger.runtime.onMessage.addListener((message, sender, sendResponse) => {
                     if(tabs.length == 0){
                         return false;
                     }
-                    await preparePopupMenu(tabs[0]);
-                    return true;
+                    return preparePopupMenu(tabs[0]);
+                    //return true;
                 }
                 return _popup_menu_ready();
                 break;
diff --git a/popup/mzta-popup.js b/popup/mzta-popup.js
index 8372c74a..f2758671 100644
--- a/popup/mzta-popup.js
+++ b/popup/mzta-popup.js
@@ -27,10 +27,10 @@ document.addEventListener('DOMContentLoaded', async () => {
     taLog = new taLogger("mzta-popup",prefs.do_debug);
     let reponse = await browser.runtime.sendMessage({command: "popup_menu_ready"});
     taLog.log("Preparing data to load the popup menu: " + JSON.stringify(reponse));
-    let tabId = await taStore.getSessionData("lastShortcutTabId");
-    let tabType = await taStore.getSessionData("lastShortcutTabType");
-    let filtering = await taStore.getSessionData("lastShortcutFiltering");
-    let _prompts_data = await taStore.getSessionData("lastShortcutPromptsData");
+    let tabId = reponse.lastShortcutTabId;
+    let tabType = reponse.lastShortcutTabType;
+    let filtering = reponse.lastShortcutFiltering;
+    let _prompts_data = reponse.lastShortcutPromptsData;
     taLog.log("_prompts_data: " + JSON.stringify(_prompts_data));
     let active_prompts = filterPromptsForTab(_prompts_data, filtering);
     taLog.log("active_prompts: " + JSON.stringify(active_prompts));