diff --git a/chromium/background.js b/chromium/background.js index 648da2cd6fde..4553669cdc12 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -683,32 +683,27 @@ chrome.runtime.sendMessage("import-legacy-data", import_settings); * Import extension settings (custom rulesets, ruleset toggles, globals) from an object * @param settings the settings object */ -async function import_settings(settings){ - if(settings.changed){ - // Load custom rulesets and add to storage - await new Promise(resolve => { - storage.set({"legacy_custom_rulesets": settings.custom_rulesets}, resolve); - }); - +async function import_settings(settings) { + if (settings.changed) { // Load all the ruleset toggles into memory and store - let rule_toggle_promises = []; - for(let ruleset_name in settings.rule_toggle){ + for (const ruleset_name in settings.rule_toggle) { localStorage[ruleset_name] = settings.rule_toggle[ruleset_name]; } all_rules = new RuleSets(localStorage); all_rules.addFromXml(loadExtensionFile('rules/default.rulesets', 'xml')); + + // Load custom rulesets load_legacy_custom_rulesets(settings.custom_rulesets); - // Set/store globals - await new Promise(resolve => { - storage.set({'httpNowhere': settings.prefs.http_nowhere_enabled}, resolve); - }); - await new Promise(resolve => { - storage.set({'showCounter': settings.prefs.show_counter}, resolve); - }); + // Save settings await new Promise(resolve => { - storage.set({'globalEnabled': settings.prefs.global_enabled}, resolve); + storage.set({ + legacy_custom_rulesets: settings.custom_rulesets, + httpNowhere: settings.prefs.http_nowhere_enabled, + showCounter: settings.prefs.show_counter, + globalEnabled: settings.prefs.global_enabled + }, resolve); }); } }