Make ContextMenus permanent permission to fix issues with menu items …

…being non-responding
IsThereAnyDeal · Sep 15, 2024 · 007a63b · 007a63b
1 parent 0e91fe2
commit 007a63b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 43 deletions.
diff --git a/scripts/tools/manifest.mjs b/scripts/tools/manifest.mjs
@@ -14,7 +14,8 @@ export default {
         open_in_tab: true
     },
     permissions: [
-        "storage"
+        "storage",
+        "contextMenus"
     ],
     host_permissions: [
         "*://*.steampowered.com/*",

diff --git a/scripts/tools/manifestBuilder.mjs b/scripts/tools/manifestBuilder.mjs
@@ -44,7 +44,6 @@ export default class ManifestBuilder {
 
         if (browser === "chrome" || browser === "edge") {
             this._manifest.permissions.push("offscreen");
-            this._manifest.optional_permissions.push("contextMenus");
             this._manifest.background.service_worker = "js/background.js";
         }
 
@@ -56,7 +55,6 @@ export default class ManifestBuilder {
                 }
             };
 
-            this._manifest.permissions.push("contextMenus");
             this._manifest.background.scripts = ["js/background.js"];
         }
 

diff --git a/src/js/Background/Modules/ContextMenu/ContextMenu.ts b/src/js/Background/Modules/ContextMenu/ContextMenu.ts
@@ -10,7 +10,6 @@ import {
 import Localization, {L} from "@Core/Localization/Localization";
 import Settings, {SettingsStore} from "@Options/Data/Settings";
 import browser, {type Menus} from "webextension-polyfill";
-import Permissions from "@Core/Permissions";
 
 export default class ContextMenu {
 
@@ -45,28 +44,23 @@ export default class ContextMenu {
         ]
     };
 
-    static register(): Promise<void> {
+    static register(): void {
         browser.runtime.onStartup.addListener(ContextMenu.update);
         browser.runtime.onInstalled.addListener(ContextMenu.update);
 
-        // @ts-ignore
-        return Permissions.when("contextMenus", () => {
+        if (!browser.contextMenus.onClicked.hasListener(ContextMenu.onClick)) {
             browser.contextMenus.onClicked.addListener(ContextMenu.onClick);
-        }, async () => {
-            browser.contextMenus.onClicked.removeListener(ContextMenu.onClick);
-            await browser.contextMenus.removeAll();
-        });
-
+        }
     }
 
     private static onClick(info: Menus.OnClickData): void {
 
-        // @ts-ignore
-        const url: string|undefined = ContextMenu.queryLinks[info.menuItemId][1];
-        if (!url) {
+        const menuItem = ContextMenu.queryLinks[info.menuItemId];
+        if (!menuItem) {
             return;
         }
 
+        const url: string = menuItem[1];
         let query = info.selectionText!.trim();
 
         if (info.menuItemId === "context_steam_keys") {
@@ -101,27 +95,16 @@ export default class ContextMenu {
 
             /*
              * TODO don't recreate the context menu entries on each change, only update
-             * the affected entry (which should also prevent this error)
-             * Error when you create an entry with duplicate id
+             *  the affected entry (which should also prevent this error)
+             *  Error when you create an entry with duplicate id
              */
             () => browser.runtime.lastError);
         }
     }
 
     public static async update(): Promise<void> {
         await SettingsStore.init();
-        if (!await Permissions.contains(["contextMenus"])) {
-            Settings.context_steam_store = false;
-            Settings.context_steam_market = false
-            Settings.context_itad = false
-            Settings.context_bartervg = false
-            Settings.context_steamdb = false
-            Settings.context_steamdb_instant = false
-            Settings.context_steam_keys = false
-            return;
-        }
-
         await browser.contextMenus.removeAll();
-        return ContextMenu.build();
+        return this.build();
     }
 }
diff --git a/src/js/Core/Permissions.ts b/src/js/Core/Permissions.ts
@@ -11,10 +11,6 @@ export default class Permissions {
     }
 
     static async remove(permissions: Manifest.OptionalPermission[]): Promise<boolean> {
-        // @ts-ignore
-        if (permissions.includes("contextMenus")) {
-            await browser.contextMenus.removeAll();
-        }
         return browser.permissions.remove({permissions});
     }
 

diff --git a/src/js/Options/Modules/Options/Settings/ContextMenuOptions.svelte b/src/js/Options/Modules/Options/Settings/ContextMenuOptions.svelte
@@ -14,7 +14,6 @@
     } from "@Strings/_strings";
     import {L} from "@Core/Localization/Localization";
     import Toggle from "../Components/Toggle.svelte";
-    import Permissions from "@Core/Permissions";
     import ContextMenu from "@Background/Modules/ContextMenu/ContextMenu";
 
     type ContextMenuKeys = keyof SettingsSchema & (
@@ -30,15 +29,6 @@
     export let settings: Writable<SettingsSchema>;
 
     async function handleChange(key: ContextMenuKeys, value: boolean): Promise<void> {
-        if (value) {
-            const permissions = ["contextMenus"];
-            const hasPermissions = await Permissions.contains(permissions);
-            if (!hasPermissions) {
-                // @ts-expect-error
-                value = await Permissions.request(permissions);
-            }
-        }
-
         $settings[key] = value;
         ContextMenu.update();
     }