diff options
| author | Hygna <hygna@proton.me> | 2022-10-02 15:10:36 +0100 |
|---|---|---|
| committer | Hygna <hygna@proton.me> | 2022-10-02 15:10:36 +0100 |
| commit | e8a67e91729e9ade89bb7f6f9e1c8bf2f4d64ea2 (patch) | |
| tree | 7072e7544cafd55821f8b8685958129705f96ae3 /src/pages/background | |
| parent | Unify Localstorage (diff) | |
| download | libredirect-e8a67e91729e9ade89bb7f6f9e1c8bf2f4d64ea2.zip | |
Squashed a few bugs
Diffstat (limited to 'src/pages/background')
| -rw-r--r-- | src/pages/background/background.js | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 5e164d58..eba436cb 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -3,11 +3,23 @@ import generalHelper from "../../assets/javascripts/general.js"
import utils from "../../assets/javascripts/utils.js"
import servicesHelper from "../../assets/javascripts/services.js"
-import initHelper from "../../assets/javascripts/init.js"
window.browser = window.browser || window.chrome
-browser.runtime.onInstalled.addListener(async details => {
+function initDefaults() {
+ browser.storage.local.clear(() => {
+ fetch("/instances/blacklist.json")
+ .then(response => response.text())
+ .then(async data => {
+ browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => {
+ await generalHelper.initDefaults()
+ await servicesHelper.initDefaults()
+ })
+ })
+ })
+}
+
+browser.runtime.onInstalled.addListener(details => {
// if (details.reason == 'install' || (details.reason == "update" && details.previousVersion != browser.runtime.getManifest().version)) {
// if (details.reason == "update")
// browser.storage.local.get(null, r => {
@@ -24,27 +36,22 @@ browser.runtime.onInstalled.addListener(async details => { initDefaults()
break
case "update":
- switch (details.previousVersion) {
- case "2.2.1":
- initDefaults()
- break
- }
+ fetch("/instances/blacklist.json")
+ .then(response => response.text())
+ .then(async data => {
+ browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => {
+ switch (details.previousVersion) {
+ case "2.2.1":
+ await generalHelper.initDefaults()
+ await servicesHelper.initDefaults()
+ await servicesHelper.upgradeOptions()
+ break
+ }
+ })
+ })
}
})
-function initDefaults() {
- browser.storage.local.clear(() => {
- fetch("/instances/blacklist.json")
- .then(response => response.text())
- .then(async data => {
- browser.storage.local.set({ blacklists: JSON.parse(data) }, async () => {
- await generalHelper.initDefaults()
- await initHelper.initDefaults()
- })
- })
- })
-}
-
let BYPASSTABs = []
browser.webRequest.onBeforeRequest.addListener(
details => {
|