Merge pull request #784 from mozilla/783-email-warning

Fix #783 - Scope email tracking prompts only to sites where Facebook has been blocked

package.json

@@ -1,6 +1,6 @@
 {
   "name": "contain-facebook",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Facebook Container isolates your Facebook activity from the rest of your web activity in order to prevent Facebook from tracking you outside of the Facebook website via third party cookies. ",
   "main": "background.js",
   "scripts": {

src/background.js

@@ -647,6 +647,15 @@ function setupWindowsAndTabsListeners() {
   browser.windows.onFocusChanged.addListener(windowFocusChangedListener);
 }
 
+async function checkIfTrackersAreDetected(sender) {
+  const activeTab = await getActiveTab();
+  const tabState = tabStates[activeTab.id];
+  const trackersDetected = (tabState && tabState.trackersDetected);
+  const onActiveTab = (activeTab.id === sender.tab.id);
+  // Check if trackers were blocked,scoped to the active tab.
+  return (onActiveTab && trackersDetected);  
+}
+
 (async function init () {
   await setupMACAddonListeners();
   macAddonEnabled = await isMACAddonEnabled();
@@ -686,6 +695,8 @@ function setupWindowsAndTabsListeners() {
       break;
     case "check-settings":
       return checkSettings();
+    case "are-trackers-detected":
+      return await checkIfTrackersAreDetected(sender);
     default:
       throw new Error("Unexpected message!");
     }

src/content_script.js

@@ -646,9 +646,13 @@ async function detectFacebookOnPage () {
   patternDetection(SHARE_PATTERN_DETECTION_SELECTORS, "share");
   patternDetection(LOGIN_PATTERN_DETECTION_SELECTORS, "login");
   const relayAddonEnabled = await getRelayAddonEnabledFromBackground();
+
+  // Check if any FB trackers were blocked, scoped to only the active tab
+  const trackersDetectedOnCurrentPage = await checkIfTrackersAreDetectedOnCurrentPage();
+
   // Check if user dismissed the Relay prompt
   const relayAddonPromptDismissed = await getLocalStorageSettingFromBackground("hideRelayEmailBadges");
-  if (!relayAddonEnabled && !relayAddonPromptDismissed.hideRelayEmailBadges) {
+  if (!relayAddonEnabled && !relayAddonPromptDismissed.hideRelayEmailBadges && trackersDetectedOnCurrentPage) {
     patternDetection(EMAIL_PATTERN_DETECTION_SELECTORS, "email");
     updateSettings();
   }
@@ -762,6 +766,13 @@ async function getRelayAddonEnabledFromBackground() {
   return relayAddonEnabled;
 }
 
+async function checkIfTrackersAreDetectedOnCurrentPage() {
+  const trackersDetected = await browser.runtime.sendMessage({
+    message: "are-trackers-detected"
+  });
+  return trackersDetected;
+}
+
 async function getRootDomainFromBackground(url) {
   // Send request to background to parse URL via PSL
   const backgroundResp = await browser.runtime.sendMessage({

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Facebook Container",
-    "version": "2.3.0",
+    "version": "2.3.1",
 
     "incognito": "not_allowed",