Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-06 02:42:33 +01:00
Code Issues Releases Wiki Activity

[mv3] Set Optimal as default if extension broad permission at install time

Browse Source 
This is to prepare uBOL to be ready to set Optimal mode as default
if ever Chromium-based browsers support a way to pre-grant broad host
permissions in a policy.

Related issue:
https://github.com/uBlockOrigin/uBOL-home/discussions/232
https://github.com/uBlockOrigin/uBOL-home/discussions/135
This commit is contained in:
Raymond Hill 2024-10-17 12:32:28 -04:00
parent 89c353640e
commit 27f3612fdf
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/mv3/extension/js/background.js
View File

@ -38,6 +38,8 @@ import {
} from './ruleset-manager.js'; } from './ruleset-manager.js';
import { import {
MODE_BASIC,
MODE_OPTIMAL,
getDefaultFilteringMode, getDefaultFilteringMode,
getFilteringMode, getFilteringMode,
getTrustedSites, getTrustedSites,
@ -136,7 +138,7 @@ async function onPermissionsRemoved() {
const modified = await syncWithBrowserPermissions(); const modified = await syncWithBrowserPermissions();
if ( modified === false ) { return false; } if ( modified === false ) { return false; }
const afterMode = await getDefaultFilteringMode(); const afterMode = await getDefaultFilteringMode();
if ( beforeMode > 1 && afterMode <= 1 ) { if ( beforeMode > MODE_BASIC && afterMode <= MODE_BASIC ) {
updateDynamicRules(); updateDynamicRules();
} }
registerInjectables(); registerInjectables();
@ -420,9 +422,19 @@ async function start() {
); );
if ( firstRun ) { if ( firstRun ) {
const enableOptimal = await hasOmnipotence();
if ( enableOptimal ) {
const afterLevel = await setDefaultFilteringMode(MODE_OPTIMAL);
if ( afterLevel === MODE_OPTIMAL ) {
updateDynamicRules();
registerInjectables();
}
}
const disableFirstRunPage = await adminRead('disableFirstRunPage'); const disableFirstRunPage = await adminRead('disableFirstRunPage');
if ( disableFirstRunPage !== true ) { if ( disableFirstRunPage !== true ) {
runtime.openOptionsPage(); runtime.openOptionsPage();
} else {
firstRun = false;
} }
} }
} }

4
platform/mv3/extension/js/settings.js
View File

@ -316,7 +316,7 @@ dom.on('#showBlockedCount input[type="checkbox"]', 'change', ev => {
function renderTrustedSites() { function renderTrustedSites() {
const textarea = qs$('#trustedSites'); const textarea = qs$('#trustedSites');
const hostnames = cachedRulesetData.trustedSites; const hostnames = cachedRulesetData.trustedSites || [];
textarea.value = hostnames.map(hn => punycode.toUnicode(hn)).join('\n'); textarea.value = hostnames.map(hn => punycode.toUnicode(hn)).join('\n');
if ( textarea.value !== '' ) { if ( textarea.value !== '' ) {
textarea.value += '\n'; textarea.value += '\n';
@ -325,7 +325,7 @@ function renderTrustedSites() {
function changeTrustedSites() { function changeTrustedSites() {
const hostnames = getStagedTrustedSites(); const hostnames = getStagedTrustedSites();
const hash = hashFromIterable(cachedRulesetData.trustedSites); const hash = hashFromIterable(cachedRulesetData.trustedSites || []);
if ( hashFromIterable(hostnames) === hash ) { return; } if ( hashFromIterable(hostnames) === hash ) { return; }
sendMessage({ sendMessage({
what: 'setTrustedSites', what: 'setTrustedSites',