Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Be prepared to deal with failure to read user settings 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/507
This commit is contained in:
Raymond Hill 2019-04-03 13:18:47 -03:00
parent 48ac4b21c6
commit 1a7a3298e2
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/start.js
View File

@ -296,6 +296,13 @@ const onSystemSettingsReady = function(fetched) {
const onFirstFetchReady = function(fetched) {
log.info(`First fetch ready ${Date.now()-vAPI.T0} ms after launch`);
// https://github.com/uBlockOrigin/uBlock-issues/issues/507
// Firefox-specific: somehow `fetched` is undefined under certain
// circumstances even though we asked to load with default values.
if ( fetched instanceof Object === false ) {
fetched = createDefaultProps();
}
// https://github.com/gorhill/uBlock/issues/747
µb.firstInstall = fetched.version === '0.0.0.0';
@ -331,11 +338,7 @@ const fromFetch = function(to, fetched) {
}
};
/******************************************************************************/
const onSelectedFilterListsReady = function() {
log.info(`List selection ready ${Date.now()-vAPI.T0} ms after launch`);
const createDefaultProps = function() {
const fetchableProps = {
'commandShortcuts': [],
'compiledMagic': 0,
@ -361,12 +364,10 @@ const onSelectedFilterListsReady = function() {
'selfieMagic': 0,
'version': '0.0.0.0'
};
toFetch(µb.localSettings, fetchableProps);
toFetch(µb.userSettings, fetchableProps);
toFetch(µb.restoreBackupSettings, fetchableProps);
vAPI.storage.get(fetchableProps, onFirstFetchReady);
return fetchableProps;
};
/******************************************************************************/
@ -395,9 +396,10 @@ const onAdminSettingsRestored = function() {
onHiddenSettingsReady()
),
µb.loadSelectedFilterLists(),
]).then(( ) =>
onSelectedFilterListsReady()
);
]).then(( ) => {
log.info(`List selection ready ${Date.now()-vAPI.T0} ms after launch`);
vAPI.storage.get(createDefaultProps(), onFirstFetchReady);
});
};
/******************************************************************************/