Stop sending events when in incognito. (#3900)

mozilla-services · Jan 12, 2018 · de5e6a0 · de5e6a0
1 parent 99bf171
commit de5e6a0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/addon/webextension/background/analytics.js b/addon/webextension/background/analytics.js
@@ -94,6 +94,15 @@ this.analytics = (function() {
       label = undefined;
     }
     options = options || {};
+
+    // Don't send events if in private browsing.
+    if (options.incognito) {
+      return Promise.resolve();
+    }
+
+    // Don't include in event data.
+    delete options.incognito;
+
     let di = deviceInfo();
     options.applicationName = di.appName;
     options.applicationVersion = di.addonVersion;

diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -80,7 +80,7 @@ this.main = (function() {
       return selectorLoader.testIfLoaded(tab.id);
     }).then((isLoaded) => {
       if (!isLoaded) {
-        sendEvent("start-shot", "site-request");
+        sendEvent("start-shot", "site-request", {incognito: tab.incognito});
         setIconActive(true, tab.id);
         selectorLoader.toggle(tab.id, false);
       }
@@ -96,13 +96,13 @@ this.main = (function() {
     if (shouldOpenMyShots(tab.url)) {
       if (!hasSeenOnboarding) {
         catcher.watchPromise(analytics.refreshTelemetryPref().then(() => {
-          sendEvent("goto-onboarding", "selection-button");
+          sendEvent("goto-onboarding", "selection-button", {incognito: tab.incognito});
           return forceOnboarding();
         }));
         return;
       }
       catcher.watchPromise(analytics.refreshTelemetryPref().then(() => {
-        sendEvent("goto-myshots", "about-newtab");
+        sendEvent("goto-myshots", "about-newtab", {incognito: tab.incognito});
       }));
       catcher.watchPromise(
         auth.authHeaders()
@@ -112,10 +112,10 @@ this.main = (function() {
         toggleSelector(tab)
           .then(active => {
             const event = active ? "start-shot" : "cancel-shot";
-            sendEvent(event, "toolbar-button");
+            sendEvent(event, "toolbar-button", {incognito: tab.incognito});
           }, (error) => {
             if ((!hasSeenOnboarding) && error.popupMessage == "UNSHOOTABLE_PAGE") {
-              sendEvent("goto-onboarding", "selection-button");
+              sendEvent("goto-onboarding", "selection-button", {incognito: tab.incognito});
               return forceOnboarding();
             }
             throw error;
@@ -140,7 +140,7 @@ this.main = (function() {
     }
     catcher.watchPromise(
       toggleSelector(tab)
-        .then(() => sendEvent("start-shot", "context-menu")));
+        .then(() => sendEvent("start-shot", "context-menu", {incognito: tab.incognito})));
   });
 
   function urlEnabled(url) {
@@ -279,18 +279,7 @@ this.main = (function() {
     });
   });
 
-  communication.register("abortFrameset", () => {
-    sendEvent("abort-start-shot", "frame-page");
-    // Note, we only show the error but don't report it, as we know that we can't
-    // take shots of these pages:
-    senderror.showError({
-      popupMessage: "UNSHOOTABLE_PAGE"
-    });
-  });
-
-  communication.register("abortNoDocumentBody", (sender, tagName) => {
-    tagName = String(tagName || "").replace(/[^a-z0-9]/ig, "");
-    sendEvent("abort-start-shot", `document-is-${tagName}`);
+  communication.register("abortStartShot", () => {
     // Note, we only show the error but don't report it, as we know that we can't
     // take shots of these pages:
     senderror.showError({

diff --git a/addon/webextension/selector/shooter.js b/addon/webextension/selector/shooter.js
@@ -221,6 +221,14 @@ this.shooter = (function() { // eslint-disable-line no-unused-vars
   };
 
   exports.sendEvent = function(...args) {
+    let maybeOptions = args[args.length - 1];
+
+    if (typeof maybeOptions === "object") {
+      maybeOptions.incognito = browser.extension.inIncognitoContext;
+    } else {
+      args.push({incognito: browser.extension.inIncognitoContext});
+    }
+
     callBackground("sendEvent", ...args);
   };
 

diff --git a/addon/webextension/selector/uicontrol.js b/addon/webextension/selector/uicontrol.js
@@ -879,12 +879,15 @@ this.uicontrol = (function() {
 
   exports.activate = function() {
     if (!document.body) {
-      callBackground("abortNoDocumentBody", document.documentElement.tagName);
+      callBackground("abortStartShot");
+      let tagName = String(document.documentElement.tagName || "").replace(/[^a-z0-9]/ig, "");
+      sendEvent("abort-start-shot", `document-is-${tagName}`);
       selectorLoader.unloadModules();
       return;
     }
     if (isFrameset()) {
-      callBackground("abortFrameset");
+      callBackground("abortStartShot");
+      sendEvent("abort-start-shot", "frame-page");
       selectorLoader.unloadModules();
       return;
     }