Add local tracker unblock trigger for Metrics broken page watcher.

src/background.js

@@ -1096,11 +1096,16 @@ function initializeDispatcher() {
 		// can't simply compare num_selected and size(db.apps) since apps get removed sometimes
 		db.allSelected = (!!num_selected && every(db.apps, (app, app_id) => appIds.hasOwnProperty(app_id)));
 	});
+	dispatcher.on('conf.save.site_specific_unblocks', () => {
+		// if user has unblock a tracker on this page, suspect a broken page
+		metrics.handleBrokenPageTrigger(globals.BROKEN_PAGE_LOCAL_TRACKER_UNBLOCK);
+	})
 	dispatcher.on('conf.save.site_whitelist', () => {
 		// TODO debounce with below
 		button.update();
 		utils.flushChromeMemoryCache();
 		cliqz.modules.core.action('refreshAppState');
+		// if user has whitelisted site, suspect broken page
 		metrics.handleBrokenPageTrigger(globals.BROKEN_PAGE_WHITELIST);
 	});
 	dispatcher.on('conf.save.enable_human_web', (enableHumanWeb) => {
@@ -1156,8 +1161,9 @@ function initializeDispatcher() {
 	}, 200));
 
 	dispatcher.on('globals.save.paused_blocking', () => {
-		// update content script state when blocking is paused/unpaused
+		// if user has paused Ghostery, suspect broken page
 		if (globals.SESSION.paused_blocking) { metrics.handleBrokenPageTrigger(globals.BROKEN_PAGE_PAUSE); }
+		// update content script state when blocking is paused/unpaused
 		cliqz.modules.core.action('refreshAppState');
 	});
 }

src/classes/Globals.js

@@ -74,6 +74,7 @@ class Globals {
 		this.BROKEN_PAGE_REFRESH = 1;
 		this.BROKEN_PAGE_WHITELIST = 2;
 		this.BROKEN_PAGE_PAUSE = 3;
+		this.BROKEN_PAGE_LOCAL_TRACKER_UNBLOCK = 4;
 
 		// data stores
 		this.REDIRECT_MAP = new Map();

src/classes/Metrics.js

@@ -115,48 +115,31 @@ class Metrics {
 	}
 
 	handleBrokenPageTrigger(triggerId) {
-		switch (triggerId) {
-			case globals.BROKEN_PAGE_REFRESH:
-				if (this._brokenPageWatcher.flag) {
-					this.ping('broken-page');
-					this._unplugBrokenPageWatcher();
-				} else {
-					this._rebootBrokenPageWatcher(triggerId);
-				}
-				break;
-			case globals.BROKEN_PAGE_WHITELIST:
-				if (this._brokenPageWatcher.flag) {
-					this.ping('broken-page');
-					this._unplugBrokenPageWatcher();
-				}
-				break;
-			case globals.BROKEN_PAGE_PAUSE:
-				if (this._brokenPageWatcher.flag) {
-					this.ping('broken-page');
-					this._unplugBrokenPageWatcher();
-				}
-				break;
-			default:
-				break;
+		if (this._brokenPageWatcher.on && triggerId === globals.BROKEN_PAGE_REFRESH) {
+			this.ping('broken-page');
+			this._unplugBrokenPageWatcher();
+			return;
 		}
+
+		this._resetBrokenPageWatcher(triggerId);
 	}
 
 	_unplugBrokenPageWatcher() {
 		this._clearBrokenPageWatcherTimeout();
 
 		this._brokenPageWatcher = Object.assign({},{
-			flag: false,
+			on: false,
 			triggerId: '',
 			triggerTime: '',
 			timeoutId: null,
 		});
 	}
 
-	_rebootBrokenPageWatcher(triggerId) {
+	_resetBrokenPageWatcher(triggerId) {
 		this._clearBrokenPageWatcherTimeout();
 
 		this._brokenPageWatcher = Object.assign({}, {
-			flag: true,
+			on: true,
 			triggerId,
 			triggerTime: Date.now(),
 			timeoutId: setTimeout(this._clearBrokenPageWatcher, BROKEN_PAGE_WATCH_THRESHOLD),