diff --git a/app/dawn-hub/Views/OnboardingView/OnboardingViewContainer.jsx b/app/dawn-hub/Views/OnboardingView/OnboardingViewContainer.jsx index 045de387e..7ba050bf3 100644 --- a/app/dawn-hub/Views/OnboardingView/OnboardingViewContainer.jsx +++ b/app/dawn-hub/Views/OnboardingView/OnboardingViewContainer.jsx @@ -78,9 +78,9 @@ class OnboardingViewContainer extends Component { origin: ONBOARDING }); actions.setBlockingPolicy({ blockingPolicy: BLOCKING_POLICY_RECOMMENDED }); - actions.setAntiTracking({ enable_anti_tracking: true }); // covered - actions.setAdBlock({ enable_ad_block: true }); // covered - actions.setSmartBlocking({ enable_smart_block: true }); // covered + actions.setAntiTracking({ enable_anti_tracking: true }); + actions.setAdBlock({ enable_ad_block: false }); // GH-2283 + actions.setSmartBlocking({ enable_smart_block: true }); } } @@ -156,7 +156,7 @@ OnboardingViewContainer.defaultProps = { setup: { blockingPolicy: BLOCKING_POLICY_RECOMMENDED, enable_anti_tracking: true, - enable_ad_block: true, + enable_ad_block: false, enable_smart_block: true, }, }; diff --git a/manifest.json b/manifest.json index edef02a03..4700eb994 100644 --- a/manifest.json +++ b/manifest.json @@ -94,4 +94,4 @@ "web_accessible_resources": [ "app/images/*" ] -} \ No newline at end of file +} diff --git a/src/background.js b/src/background.js index 4df14fa92..a801af5a8 100644 --- a/src/background.js +++ b/src/background.js @@ -1538,6 +1538,8 @@ function initializeGhosteryModules() { conf.enable_anti_tracking = !antitracking.isDisabled; conf.enable_human_web = !humanweb.isDisabled; + cliqz.prefs.set('modules.adblocker.enabled', conf.enable_ad_block); // GH-2283 + if (!antitracking.isDisabled) { antitracking.action('setConfigOption', 'networkFetchEnabled', !!conf.enable_autoupdate); } diff --git a/src/classes/Cliqz.js b/src/classes/Cliqz.js index 3a6f95d47..084a14694 100644 --- a/src/classes/Cliqz.js +++ b/src/classes/Cliqz.js @@ -22,6 +22,7 @@ export const HPN_MODULE = IS_ANDROID ? 'hpn-lite' : 'hpnv2'; // Override the default prefs based on the platform CLIQZ.config.default_prefs = { ...CLIQZ.config.default_prefs, + 'modules.adblocker.enabled': false, // GH-2283 // the following are enabled by default on non-android platforms 'modules.human-web.enabled': !IS_ANDROID, 'modules.hpnv2.enabled': !IS_ANDROID, diff --git a/src/classes/ConfData.js b/src/classes/ConfData.js index c12bc6bd7..ab99d7c6b 100644 --- a/src/classes/ConfData.js +++ b/src/classes/ConfData.js @@ -97,6 +97,7 @@ class ConfData { (async() => { await globals.BROWSER_INFO_READY; _initProperty('enable_metrics', BROWSER_INFO.name === 'ghostery_desktop'); + _initProperty('enable_ad_block', !IS_CLIQZ && BROWSER_INFO.name !== 'ghostery_desktop'); // GH-2283 })(); // simple props @@ -111,7 +112,6 @@ class ConfData { _initProperty('cliqz_import_state', 0); _initProperty('cmp_version', 0); _initProperty('current_theme', 'default'); - _initProperty('enable_ad_block', !IS_CLIQZ); _initProperty('enable_anti_tracking', !IS_CLIQZ); _initProperty('enable_autoupdate', true); _initProperty('enable_click2play', true); diff --git a/src/classes/EventHandlers.js b/src/classes/EventHandlers.js index e873bc561..720e24cf1 100644 --- a/src/classes/EventHandlers.js +++ b/src/classes/EventHandlers.js @@ -346,6 +346,11 @@ class EventHandlers { } const app_id = bugDb.db.bugs[bug_id].aid; + + if (app_id === 67) { // GH-2283 + return { cancel: false }; + } + const cat_id = bugDb.db.apps[app_id].cat; const incognito = tabInfo.getTabInfo(tab_id, 'incognito'); const tab_host = tabInfo.getTabInfo(tab_id, 'host');