From 6886cec32cd0d70cfc2736410b224022bf1361cd Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 17 Dec 2020 14:32:17 +0100 Subject: [PATCH 1/6] Sync antitracking networkFetchEnabled setting with enable_autoupdate. --- src/background.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/background.js b/src/background.js index 64c6fb206..a69f2b6ba 100644 --- a/src/background.js +++ b/src/background.js @@ -1104,6 +1104,11 @@ function initializeDispatcher() { setCliqzModuleEnabled(humanweb, false); } }); + dispatcher.on('conf.save.enable_autoupdate', (enableAutoUpdate) => { + if (!antitracking.isDisabled) { + antitracking.action('setConfigOption', 'networkFetchEnabled', !!conf.enable_autoupdate); + } + }); dispatcher.on('conf.save.enable_anti_tracking', (enableAntitracking) => { if (!IS_CLIQZ) { setCliqzModuleEnabled(antitracking, enableAntitracking).then(() => { @@ -1546,6 +1551,10 @@ function initializeGhosteryModules() { conf.enable_anti_tracking = !antitracking.isDisabled; conf.enable_human_web = !humanweb.isDisabled; + if (!antitracking.isDisabled) { + antitracking.action('setConfigOption', 'networkFetchEnabled', !!conf.enable_autoupdate); + } + // Make sure that getBrowserInfo() has resolved before we set these properties (async() => { await globals.BROWSER_INFO_READY; From a40732caad6ee573db1d2966ec842e8ad0108d46 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 17 Dec 2020 14:32:33 +0100 Subject: [PATCH 2/6] Disable hpnv2 when humanweb is disabled. --- src/background.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/background.js b/src/background.js index a69f2b6ba..f1fc9598d 100644 --- a/src/background.js +++ b/src/background.js @@ -1099,6 +1099,7 @@ function initializeDispatcher() { if (!IS_CLIQZ) { setCliqzModuleEnabled(humanweb, enableHumanWeb).then(() => { setCliqzAntitrackingConfig(conf.enable_anti_tracking); + setCliqzModuleEnabled(hpnv2, enableHumanWeb); }); } else { setCliqzModuleEnabled(humanweb, false); From e4a019888bc9e258d0b1ac8c061b12c5cd2e7d0c Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 17 Dec 2020 14:44:22 +0100 Subject: [PATCH 3/6] Disable anolysis on non-android devices --- src/classes/Cliqz.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/classes/Cliqz.js b/src/classes/Cliqz.js index fda61659c..3a6f95d47 100644 --- a/src/classes/Cliqz.js +++ b/src/classes/Cliqz.js @@ -28,6 +28,7 @@ CLIQZ.config.default_prefs = { // the following are enabled for android only 'modules.human-web-lite.enabled': IS_ANDROID, 'modules.hpn-lite.enabled': IS_ANDROID, + 'modules.anolysis.enabled': IS_ANDROID, }; if (IS_ANDROID) { CLIQZ.config.settings.HW_CHANNEL = 'android'; From 6a2962071f5b6896c95048c8c746fda494810bce Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 17 Dec 2020 14:57:49 +0100 Subject: [PATCH 4/6] Fix lint error --- src/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/background.js b/src/background.js index f1fc9598d..ed95e78dc 100644 --- a/src/background.js +++ b/src/background.js @@ -1107,7 +1107,7 @@ function initializeDispatcher() { }); dispatcher.on('conf.save.enable_autoupdate', (enableAutoUpdate) => { if (!antitracking.isDisabled) { - antitracking.action('setConfigOption', 'networkFetchEnabled', !!conf.enable_autoupdate); + antitracking.action('setConfigOption', 'networkFetchEnabled', enableAutoUpdate); } }); dispatcher.on('conf.save.enable_anti_tracking', (enableAntitracking) => { From cc2e41b5f741e985cdb9497f2849bd046032731d Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Thu, 17 Dec 2020 16:17:46 +0100 Subject: [PATCH 5/6] Sync adblocker fetch enabled state with enable_autoupdate --- src/background.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/background.js b/src/background.js index ed95e78dc..3b2448f16 100644 --- a/src/background.js +++ b/src/background.js @@ -1109,6 +1109,9 @@ function initializeDispatcher() { if (!antitracking.isDisabled) { antitracking.action('setConfigOption', 'networkFetchEnabled', enableAutoUpdate); } + if (!adblocker.isDisabled) { + adblocker.action('setNetworkFetchEnabled', enableAutoUpdate); + } }); dispatcher.on('conf.save.enable_anti_tracking', (enableAntitracking) => { if (!IS_CLIQZ) { @@ -1555,6 +1558,9 @@ function initializeGhosteryModules() { if (!antitracking.isDisabled) { antitracking.action('setConfigOption', 'networkFetchEnabled', !!conf.enable_autoupdate); } + if (!adblocker.isDisabled) { + adblocker.action('setNetworkFetchEnabled', !!conf.enable_autoupdate); + } // Make sure that getBrowserInfo() has resolved before we set these properties (async() => { From 527c21fdad528516ab27afb09b92091223cad330 Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Fri, 18 Dec 2020 10:00:33 +0100 Subject: [PATCH 6/6] Bump ghostery-common to 1.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a2b6bc43b..c75e4fc76 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "classnames": "^2.2.5", "d3": "^5.16.0", "foundation-sites": "^6.6.2", - "ghostery-common": "^1.0.1", + "ghostery-common": "^1.2.0", "history": "^4.10.1", "jquery": "3.5.0", "json-api-normalizer": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 01585d1bd..e68aee61c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4043,10 +4043,10 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -ghostery-common@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ghostery-common/-/ghostery-common-1.0.1.tgz#1512986b48de44b5948af190f74ea5320c3d4279" - integrity sha512-lrPTPB3tuQViyglzKPdUche9kxnm0hwZOFW7AuZF2RPiCD5oY90ZIUGFOyaN7rcJ7reVHnX3sgLf8unS0iDJVg== +ghostery-common@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ghostery-common/-/ghostery-common-1.2.0.tgz#84d7bbe7c29fbf488e4668853ffeef76d394fee1" + integrity sha512-J/cSrlgXjrCUTqToroMihWwsKuuKGXhWvLg+n9p5sFr1HHUvOoe7hNRaXfWLzcCfjPIawIvnEf3eJYGlKrleTg== dependencies: "@cliqz-oss/dexie" "^2.0.4" "@cliqz/adblocker-webextension" "^1.18.8"