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

Force restart at first install for Chromium-based browsers

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1547

The approach used to fix the issue was confirmed working
in the following related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1608#issuecomment-856282345
This commit is contained in:
Raymond Hill 2021-06-12 09:18:56 -04:00
parent 3160bc8ccd
commit 32bd47f053
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/start.js
View File

@ -106,16 +106,18 @@ const initializeTabs = async function() {
const onVersionReady = function(lastVersion) { const onVersionReady = function(lastVersion) {
if ( lastVersion === vAPI.app.version ) { return; } if ( lastVersion === vAPI.app.version ) { return; }
vAPI.storage.set({ version: vAPI.app.version });
const lastVersionInt = vAPI.app.intFromVersion(lastVersion);
if ( lastVersionInt === 0 ) { return; }
// Since built-in resources may have changed since last version, we // Since built-in resources may have changed since last version, we
// force a reload of all resources. // force a reload of all resources.
µb.redirectEngine.invalidateResourcesSelfie(); µb.redirectEngine.invalidateResourcesSelfie();
const lastVersionInt = vAPI.app.intFromVersion(lastVersion);
// https://github.com/LiCybora/NanoDefenderFirefox/issues/196 // https://github.com/LiCybora/NanoDefenderFirefox/issues/196
// Toggle on the blocking of CSP reports by default for Firefox. // Toggle on the blocking of CSP reports by default for Firefox.
if ( if (
lastVersionInt !== 0 &&
lastVersionInt <= 1031003011 && lastVersionInt <= 1031003011 &&
vAPI.webextFlavor.soup.has('firefox') vAPI.webextFlavor.soup.has('firefox')
) { ) {
@ -123,8 +125,6 @@ const onVersionReady = function(lastVersion) {
µb.permanentSwitches.toggle('no-csp-reports', '*', 1); µb.permanentSwitches.toggle('no-csp-reports', '*', 1);
µb.saveHostnameSwitches(); µb.saveHostnameSwitches();
} }
vAPI.storage.set({ version: vAPI.app.version });
}; };
/******************************************************************************/ /******************************************************************************/
@ -332,7 +332,7 @@ try {
// https://github.com/uBlockOrigin/uBlock-issues/issues/1365 // https://github.com/uBlockOrigin/uBlock-issues/issues/1365
// Wait for onCacheSettingsReady() to be fully ready. // Wait for onCacheSettingsReady() to be fully ready.
await Promise.all([ const [ , , lastVersion ] = await Promise.all([
µb.loadSelectedFilterLists().then(( ) => { µb.loadSelectedFilterLists().then(( ) => {
log.info(`List selection ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`List selection ready ${Date.now()-vAPI.T0} ms after launch`);
}), }),
@ -345,6 +345,7 @@ try {
vAPI.storage.get(createDefaultProps()).then(fetched => { vAPI.storage.get(createDefaultProps()).then(fetched => {
log.info(`First fetch ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`First fetch ready ${Date.now()-vAPI.T0} ms after launch`);
onFirstFetchReady(fetched, adminExtra); onFirstFetchReady(fetched, adminExtra);
return fetched.version;
}), }),
µb.loadUserSettings().then(fetched => { µb.loadUserSettings().then(fetched => {
log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`);
@ -354,6 +355,12 @@ try {
log.info(`PSL ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`PSL ready ${Date.now()-vAPI.T0} ms after launch`);
}), }),
]); ]);
// https://github.com/uBlockOrigin/uBlock-issues/issues/1547
if ( lastVersion === '0.0.0.0' && vAPI.webextFlavor.soup.has('chromium') ) {
vAPI.app.restart();
return;
}
} catch (ex) { } catch (ex) {
console.trace(ex); console.trace(ex);
} }