From b2d44f314bb8decbf65658ddeb8da3b91093bdf3 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Tue, 7 Jun 2022 19:40:03 +0300
Subject: Fixed a bug in export settings after reset warning popup

---
 src/pages/background/background.js    | 32 +++++++++++++++-----------------
 src/pages/background/reset_warning.js |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'src/pages/background')

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 88daa6cd..a77dd327 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -21,26 +21,13 @@ import lbryHelper from "../../assets/javascripts/lbry.js";
 
 window.browser = window.browser || window.chrome;
 
-function openResetWarning() {
-  return new Promise(resolve => {
-    browser.storage.local.get(null, r => {
-      if (r.theme) {
-        const old = encodeURIComponent(JSON.stringify(r))
-        browser.tabs.create({ url: browser.runtime.getURL(`/pages/background/reset_warning.html?data=${old}`) });
-      }
-      resolve();
-    })
-  })
-}
-
 browser.runtime.onInstalled.addListener(
-  async details => {
-    // if (details.reason == 'install') {
-    if (details.reason == 'install' || (details.reason == "update" && details.previousVersion != browser.runtime.getManifest().version)) {
-      if (details.reason == "update") await openResetWarning();
+  details => {
+    function initDefaults() {
       fetch('/instances/blacklist.json').then(response => response.text()).then(async data => {
         browser.storage.local.clear(
           () => {
+
             browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare },
               () => {
                 browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate },
@@ -64,8 +51,19 @@ browser.runtime.onInstalled.addListener(
                   })
               })
           });
-
       })
+    };
+    // if (details.reason == 'install') {
+    if (details.reason == 'install' || (details.reason == "update" && details.previousVersion != browser.runtime.getManifest().version)) {
+      if (details.reason == "update")
+        browser.storage.local.get(null, r => {
+          if (r.theme) {
+            const old = encodeURIComponent(JSON.stringify(r))
+            browser.tabs.create({ url: browser.runtime.getURL(`/pages/background/reset_warning.html?data=${old}`) });
+          }
+          initDefaults();
+        })
+      else initDefaults();
     }
   }
 )
diff --git a/src/pages/background/reset_warning.js b/src/pages/background/reset_warning.js
index 9c9e9800..15e3a594 100644
--- a/src/pages/background/reset_warning.js
+++ b/src/pages/background/reset_warning.js
@@ -1,7 +1,7 @@
 let params = new URLSearchParams(location.search);
 
 const resultString = JSON.stringify(
-    JSON.parse(decodeURIComponent(params.get('data'))),
+    JSON.parse(params.get('data')),
     null,
     '  '
 );
-- 
cgit 1.4.1