GH-1792: Updated HumanWeb default settings

CHANGELOG.md

@@ -1,3 +1,16 @@
+### GHOSTERY 8.4.1 (UNRELEASED)
+
++ Add new Data Points tracker category in detail view with anti-tracking whitelist (#417)
++ Fixes error `Uncaught TypeError: c.querySelectorAll` (#406)
++ Show ad-blocking icons in detail view tracker list (#411)
++ Add new terms and conditions acknowledgment to account creation(#414)
++ Implement new Cliqz url parser (#410)
++ Fix donut tooltip (#409)
++ Fix bug in collapsed Summary view on un-scanned pages (#404)
++ Improved broken page metrics (#418)
++ Update all project dependencies to satisfy security alerts (#405)
++ Updated translations (#402)
+
 ### GHOSTERY 8.4.0 (June 26, 2019)
 
 + Add new counter for Requests Modified by Anti-Tracking (#392)

app/hub/Views/SetupView/SetupViewContainer.jsx

@@ -18,6 +18,7 @@ import PropTypes from 'prop-types';
 import SetupView from './SetupView';
 import { Modal, ToggleCheckbox } from '../../../shared-components';
 import { BLOCKING_POLICY_RECOMMENDED } from './SetupViewConstants';
+import globals from '../../../../src/classes/Globals';
 
 // Component Views
 import SetupBlockingView from '../SetupViews/SetupBlockingView';
@@ -26,6 +27,9 @@ import SetupAntiSuiteView from '../SetupViews/SetupAntiSuiteView';
 import SetupHumanWebView from '../SetupViews/SetupHumanWebView';
 import SetupDoneView from '../SetupViews/SetupDoneView';
 
+const { BROWSER_INFO } = globals;
+const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
+
 /**
  * @class Implement the Setup View for the Ghostery Hub
  * @extends Component
@@ -101,7 +105,7 @@ class SetupViewContainer extends Component {
 		this.props.actions.setAdBlock({ enable_ad_block: true });
 		this.props.actions.setSmartBlocking({ enable_smart_block: true });
 		this.props.actions.setGhosteryRewards({ enable_ghostery_rewards: true });
-		this.props.actions.setHumanWeb({ enable_human_web: true });
+		this.props.actions.setHumanWeb({ enable_human_web: !IS_FIREFOX });
 	}
 
 	/**

src/background.js

@@ -791,7 +791,7 @@ function onMessageHandler(request, sender, callback) {
 
 	// HANDLE UNIVERSAL EVENTS HERE (NO ORIGIN LISTED ABOVE)
 	// The 'getPanelData' message is never sent by the panel, which uses ports only since 8.3.2
-	// The  message is still sent by panel-android and by the hub as of 8.4.0
+	// The message is still sent by panel-android and by the setup hub as of 8.4.0
 	if (name === 'getPanelData') {
 		if (!message.tabId) {
 			utils.getActiveTab((tab) => {
@@ -1767,7 +1767,7 @@ function initializeGhosteryModules() {
 					// Otherwise we respect browser-core default settings
 					conf.enable_ad_block = !adblocker.isDisabled;
 					conf.enable_anti_tracking = !antitracking.isDisabled;
-					conf.enable_human_web = !humanweb.isDisabled;
+					conf.enable_human_web = !humanweb.isDisabled && !(IS_FIREFOX && globals.JUST_INSTALLED);
 					conf.enable_offers = !offers.isDisabled;
 				}
 			}
@@ -1845,7 +1845,6 @@ function init() {
 		initializePopup();
 		initializeEventListeners();
 		initializeVersioning();
-
 		return metrics.init(globals.JUST_INSTALLED).then(() => initializeGhosteryModules().then(() => {
 			account.migrate()
 				.then(() => {

src/classes/ConfData.js

@@ -21,7 +21,8 @@
 import globals from './Globals';
 import { prefsGet } from '../utils/common';
 
-const { IS_CLIQZ } = globals;
+const { IS_CLIQZ, BROWSER_INFO } = globals;
+const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
 /**
  * Class for handling user configuration properties synchronously.
  *
@@ -104,7 +105,7 @@ class ConfData {
 			_initProperty('enable_autoupdate', true);
 			_initProperty('enable_click2play', true);
 			_initProperty('enable_click2play_social', true);
-			_initProperty('enable_human_web', !IS_CLIQZ);
+			_initProperty('enable_human_web', !IS_CLIQZ && !IS_FIREFOX);
 			_initProperty('enable_metrics', false);
 			_initProperty('enable_offers', !IS_CLIQZ);
 			_initProperty('enable_smart_block', true);