From 5ca6836bd058faebdb4c2f442928b3f2baf77d92 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Mon, 11 Mar 2024 19:10:17 +0300
Subject: [PATCH] Fixed popup not working
 https://github.com/libredirect/browser_extension/issues/901

---
 src/manifest.json                    |  2 +-
 src/pages/options/widgets/general.js | 10 +++-------
 src/pages/popup/popup.js             | 16 +++++++++-------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 95c24bb..13908f0 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
 	"name": "__MSG_extensionName__",
 	"description": "__MSG_extensionDescription__",
-	"version": "2.8.2",
+	"version": "2.8.3",
 	"manifest_version": 2,
 	"browser_specific_settings": {
 		"gecko": {
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index 6f2852a..8322a37 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -112,13 +112,9 @@ redirectOnlyInIncognitoElement.addEventListener('change', event => {
 const bookmarksMenuElement = document.getElementById('bookmarksMenu')
 bookmarksMenuElement.addEventListener('change', async event => {
 	if (event.target.checked)
-		bookmarksMenuElement.checked = await browser.permissions.request({
-			permissions: ["bookmarks"]
-		})
+		browser.permissions.request({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r)
 	else
-		bookmarksMenuElement.checked = !await browser.permissions.remove({
-			permissions: ["bookmarks"]
-		})
+		browser.permissions.remove({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = !r)
 })
 
 let themeElement = document.getElementById("theme")
@@ -149,7 +145,7 @@ let options = await utils.getOptions()
 themeElement.value = options.theme
 fetchInstancesElement.value = options.fetchInstances
 redirectOnlyInIncognitoElement.checked = options.redirectOnlyInIncognito
-bookmarksMenuElement.checked = await browser.permissions.contains({ permissions: ["bookmarks"] })
+browser.permissions.contains({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r)
 for (const service in config.services) document.getElementById(service).checked = options.popupServices.includes(service)
 
 instanceTypeElement.addEventListener("change", event => {
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 0e5a3d4..777733f 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -7,15 +7,17 @@ import utils from "../../assets/javascripts/utils.js"
 document.getElementById("more-options").href = browser.runtime.getURL("pages/options/index.html")
 document.getElementById("more-options").setAttribute('target', '_blank')
 
-const os = (await browser.runtime.getPlatformInfo()).os
-
-switch (os) {
-	case "fuchsia":
-	case "ios":
-	case "android": {
-		document.getElementsByTagName("html")[0].classList.add("mobile")
+await browser.runtime.getPlatformInfo(r => {
+	switch (r.os) {
+		case "fuchsia":
+		case "ios":
+		case "android": {
+			document.getElementsByTagName("html")[0].classList.add("mobile")
+		}
 	}
 }
+)
+
 
 const allSites = document.getElementById("all_sites")
 const currSite = document.getElementById("current_site")