From 0baaf7ed82e6a0ad0ffe9e4317a92ea0d9817e12 Mon Sep 17 00:00:00 2001 From: Hygna Date: Sun, 23 Oct 2022 13:23:05 +0100 Subject: Fixed settings upgrader --- src/assets/javascripts/services.js | 4 ++++ src/pages/background/background.js | 1 - src/pages/options/widgets/general.js | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index 360662cc..d02e03f6 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -727,6 +727,10 @@ function upgradeOptions() { if (r[frontend + utils.camelCase(protocol) + "RedirectsChecks"]) { options[frontend][network].enabled = r[frontend + utils.camelCase(protocol) + "RedirectsChecks"] options[frontend][network].custom = r[frontend + utils.camelCase(protocol) + "CustomRedirects"] + for (const instance of options[frontend][network].enabled) { + let i = r.redirects[frontend][network].indexOf(instance) + if (i < 0) options[frontend][network].enabled.splice(i, 1) + } } } } diff --git a/src/pages/background/background.js b/src/pages/background/background.js index bed0055d..71fff06c 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -31,7 +31,6 @@ browser.runtime.onInstalled.addListener(details => { await generalHelper.initDefaults() await servicesHelper.initDefaults() await servicesHelper.upgradeOptions() - await servicesHelper.processEnabledInstanceList() } }) break diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index bcc9afed..d55f8f0d 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -77,7 +77,6 @@ importSettingsElement.addEventListener("change", () => { await generalHelper.initDefaults() await servicesHelper.initDefaults() await servicesHelper.upgradeOptions() - await servicesHelper.processEnabledInstanceList() location.reload() }) }) @@ -87,7 +86,7 @@ importSettingsElement.addEventListener("change", () => { let options = data delete options.version browser.storage.local.set({ options: data }, async () => { - await servicesHelper.processEnabledInstanceList() + await servicesHelper.processUpdate() location.reload() }) } else { -- cgit 1.4.1