Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions chromium/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
}