From de7a40692093721f31de11e793788c3612b0ba67 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sat, 19 Apr 2025 17:52:28 -0400 Subject: [PATCH] [mv3] Minor code review --- platform/mv3/extension/js/background.js | 3 ++- platform/mv3/extension/js/config.js | 14 ++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/platform/mv3/extension/js/background.js b/platform/mv3/extension/js/background.js index bc2ba932b..b01e72861 100644 --- a/platform/mv3/extension/js/background.js +++ b/platform/mv3/extension/js/background.js @@ -464,7 +464,8 @@ async function start() { } // Permissions may have been removed while the extension was disabled - const permissionsChanged = await onPermissionsRemoved(); + const permissionsChanged = process.wakeupRun === false && + await onPermissionsRemoved(); // Unsure whether the browser remembers correctly registered css/scripts // after we quit the browser. For now uBOL will check unconditionally at diff --git a/platform/mv3/extension/js/config.js b/platform/mv3/extension/js/config.js index 64e2f3e9b..0986f7339 100644 --- a/platform/mv3/extension/js/config.js +++ b/platform/mv3/extension/js/config.js @@ -46,23 +46,13 @@ export const process = { export async function loadRulesetConfig() { const sessionData = await sessionRead('rulesetConfig'); if ( sessionData ) { - rulesetConfig.version = sessionData.version; - rulesetConfig.enabledRulesets = sessionData.enabledRulesets; - rulesetConfig.autoReload = sessionData.autoReload ?? true; - rulesetConfig.showBlockedCount = sessionData.showBlockedCount ?? true; - rulesetConfig.strictBlockMode = sessionData.strictBlockMode ?? true; - rulesetConfig.developerMode = sessionData.developerMode ?? false; + Object.assign(rulesetConfig, sessionData) process.wakeupRun = true; return; } const localData = await localRead('rulesetConfig'); if ( localData ) { - rulesetConfig.version = localData.version; - rulesetConfig.enabledRulesets = localData.enabledRulesets; - rulesetConfig.autoReload = localData.autoReload ?? true; - rulesetConfig.showBlockedCount = localData.showBlockedCount ?? true; - rulesetConfig.strictBlockMode = localData.strictBlockMode ?? true; - rulesetConfig.developerMode = localData.developerMode ?? false; + Object.assign(rulesetConfig, localData) sessionWrite('rulesetConfig', rulesetConfig); return; }