Merge pull request #133 from bakulf/pb

Addon enabled when PB is by default
2017-02-01 23:18:24 +01:00
parent 3e078e7ca6 890eeab257
commit 6f0f9c73f9
2 changed files with 31 additions and 10 deletions
@@ -1,14 +1,23 @@
-browser.tabs.onCreated.addListener(tab => {
-  if (tab.incognito) {
-    disableAddon(tab.id);
-  }
-});
+browser.runtime.sendMessage({
+  method: "getPreference",
+  pref: "browser.privatebrowsing.autostart"
+}).then(pbAutoStart => {

-browser.tabs.query({}).then(tabs => {
-  for (let tab of tabs) { // eslint-disable-line prefer-const
-    if (tab.incognito) {
-      disableAddon(tab.id);
-    }
+  // We don't want to disable the addon if we are in auto private-browsing.
+  if (!pbAutoStart) {
+    browser.tabs.onCreated.addListener(tab => {
+      if (tab.incognito) {
+        disableAddon(tab.id);
+      }
+    });
+
+    browser.tabs.query({}).then(tabs => {
+      for (let tab of tabs) { // eslint-disable-line prefer-const
+        if (tab.incognito) {
+          disableAddon(tab.id);
+        }
+      }
+    }).catch(() => {});
  }
 }).catch(() => {});