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

harden chrome.privacy calls: one threw for unknown reasons (can't repro so far)

This commit is contained in:
gorhill 2015-08-13 19:42:30 -04:00
parent 118a7792cc
commit 7a38cd756d
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
platform/chromium/vapi-background.js
View File

@ -66,6 +66,13 @@ vAPI.storage = chrome.storage.local;
// https://github.com/gorhill/uMatrix/issues/234
// https://developer.chrome.com/extensions/privacy#property-network
// 2015-08-12: Wrapped Chrome API in try-catch statements. I had a fluke
// event in which it appeared the Chrome 46 decided to restart uBlock (for
// unknown reasons) and again for unknown reasons the browser acted as if
// uBlock did not declare the `privacy` permission in its manifest, putting
// uBlock in a bad, non-fonctional state -- because call to `chrome.privacy`
// API threw an exception.
vAPI.browserSettings = {
set: function(details) {
for ( var setting in details ) {
@ -74,25 +81,37 @@ vAPI.browserSettings = {
}
switch ( setting ) {
case 'prefetching':
chrome.privacy.network.networkPredictionEnabled.set({
value: !!details[setting],
scope: 'regular'
});
try {
chrome.privacy.network.networkPredictionEnabled.set({
value: !!details[setting],
scope: 'regular'
});
} catch(ex) {
console.error(ex);
}
break;
case 'hyperlinkAuditing':
chrome.privacy.websites.hyperlinkAuditingEnabled.set({
value: !!details[setting],
scope: 'regular'
});
try {
chrome.privacy.websites.hyperlinkAuditingEnabled.set({
value: !!details[setting],
scope: 'regular'
});
} catch(ex) {
console.error(ex);
}
break;
case 'webrtcIPAddress':
if ( typeof chrome.privacy.network.webRTCMultipleRoutesEnabled === 'object' ) {
chrome.privacy.network.webRTCMultipleRoutesEnabled.set({
value: !!details[setting],
scope: 'regular'
});
try {
chrome.privacy.network.webRTCMultipleRoutesEnabled.set({
value: !!details[setting],
scope: 'regular'
});
} catch(ex) {
console.error(ex);
}
}
break;