Do not do community learning in incognito windows

Author: bcyphers

src/js/background.js

@@ -938,15 +938,26 @@ Badger.prototype = {
     );
   },
 
+  /**
+   * Is community learning generally enabled,
+   * and is tab_id in a regular (not incognito) window?
+   */
+  isCommunityLearningEnabled(tab_id) {
+    return (
+      this.getSettings().getItem("shareLearning") &&
+      !incognito.isIncognito(tab_id)
+    );
+  },
+
   /**
    * Is any kind of learning (local or community) enabled on this tab?
    *
    * TODO: should community learning happen in incognito tabs?
    */
   isLearningEnabled(tab_id) {
     return (
-      this.getSettings().getItem("shareLearning") ||
-      this.isLocalLearningEnabled(tab_id)
+      this.isLocalLearningEnabled(tab_id) ||
+      this.isCommunityLearningEnabled(tab_id)
     );
   },
 

src/js/heuristicblocking.js

@@ -328,7 +328,7 @@ HeuristicBlocker.prototype = {
     }
 
     // If community learning is enabled, queue up a request to the EFF server
-    if (badger.getSettings().getItem("shareLearning")) {
+    if (badger.isCommunityLearningEnabled(tab_id)) {
       let page_fqdn = (new URI(this.tabUrls[tab_id])).host;
       this.shareTrackerInfo(page_fqdn, tracker_fqdn, tracker_type);
     }

src/js/incognito.js

@@ -25,23 +25,30 @@ function startListeners() {
   chrome.tabs.onRemoved.addListener(onRemovedListener);
 }
 
+function isIncognito(tab_id) {
+  // if we don't have incognito data for whatever reason,
+  // default to "true"
+  if (!tabs.hasOwnProperty(tab_id)) {
+    return true;
+  }
+  // else, do not learn in incognito tabs
+  return tabs[tab_id];
+}
+
 function learningEnabled(tab_id) {
   if (badger.getSettings().getItem("learnInIncognito")) {
     // treat all pages as if they're not incognito
     return true;
   }
-  // if we don't have incognito data for whatever reason,
-  // default to disabled
-  if (!tabs.hasOwnProperty(tab_id)) {
-    return false;
-  }
-  // else, do not learn in incognito tabs
-  return !tabs[tab_id];
+
+  // otherwise, return true if this tab is _not_ incognito
+  return !isIncognito(tab_id);
 }
 
 /************************************** exports */
 let exports = {
   learningEnabled,
+  isIncognito,
   startListeners,
 };
 return exports;