From 8eceb0d2980114ea58e36dfe3a5808ed399ef207 Mon Sep 17 00:00:00 2001 From: Roman Rodriguez Date: Thu, 3 Oct 2019 12:39:56 -0500 Subject: [PATCH] Fix #930 - Disable extension in incognito mode --- package.json | 4 ++-- src/js/background/assignManager.js | 5 +---- src/js/background/badge.js | 15 +++++--------- src/js/background/messageHandler.js | 3 --- src/manifest.json | 32 ++++++++++++++--------------- 5 files changed, 24 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 172a4f5..b72d3d5 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ }, "dependencies": {}, "devDependencies": { - "ajv": "^6.6.2", "addons-linter": "^1.3.2", + "ajv": "^6.6.2", "chai": "^4.1.2", "eslint": "^3.17.1", "eslint-plugin-no-unsanitized": "^2.0.0", @@ -25,7 +25,7 @@ "stylelint": "^7.9.0", "stylelint-config-standard": "^16.0.0", "stylelint-order": "^0.3.0", - "web-ext": "^2.2.2" + "web-ext": "^2.9.3" }, "homepage": "https://github.com/mozilla/multi-account-containers#readme", "license": "MPL-2.0", diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js index dc9e991..83acd4b 100644 --- a/src/js/background/assignManager.js +++ b/src/js/background/assignManager.js @@ -143,7 +143,6 @@ const assignManager = { const userContextId = this.getUserContextIdFromCookieStore(tab); if (!siteSettings || userContextId === siteSettings.userContextId - || tab.incognito || this.storageArea.isExempted(options.url, tab.id)) { return {}; } @@ -289,11 +288,9 @@ const assignManager = { isTabPermittedAssign(tab) { // Ensure we are not an important about url - // Ensure we are not in incognito mode const url = new URL(tab.url); if (url.protocol === "about:" - || url.protocol === "moz-extension:" - || tab.incognito) { + || url.protocol === "moz-extension:") { return false; } return true; diff --git a/src/js/background/badge.js b/src/js/background/badge.js index 78cd9f1..7d532ac 100644 --- a/src/js/background/badge.js +++ b/src/js/background/badge.js @@ -2,22 +2,17 @@ const MAJOR_VERSIONS = ["2.3.0", "2.4.0"]; const badge = { async init() { const currentWindow = await browser.windows.getCurrent(); - this.displayBrowserActionBadge(currentWindow.incognito); - }, - - disableAddon(tabId) { - browser.browserAction.disable(tabId); - browser.browserAction.setTitle({ tabId, title: "Containers disabled in Private Browsing Mode" }); + this.displayBrowserActionBadge(currentWindow); }, async displayBrowserActionBadge() { const extensionInfo = await backgroundLogic.getExtensionInfo(); - const storage = await browser.storage.local.get({browserActionBadgesClicked: []}); + const storage = await browser.storage.local.get({ browserActionBadgesClicked: [] }); if (MAJOR_VERSIONS.indexOf(extensionInfo.version) > -1 && - storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) { - browser.browserAction.setBadgeBackgroundColor({color: "rgba(0,217,0,255)"}); - browser.browserAction.setBadgeText({text: "NEW"}); + storage.browserActionBadgesClicked.indexOf(extensionInfo.version) < 0) { + browser.browserAction.setBadgeBackgroundColor({ color: "rgba(0,217,0,255)" }); + browser.browserAction.setBadgeText({ text: "NEW" }); } } }; diff --git a/src/js/background/messageHandler.js b/src/js/background/messageHandler.js index 9fbe88e..046d163 100644 --- a/src/js/background/messageHandler.js +++ b/src/js/background/messageHandler.js @@ -141,9 +141,6 @@ const messageHandler = { }, {urls: [""], types: ["main_frame"]}); browser.tabs.onCreated.addListener((tab) => { - if (tab.incognito) { - badge.disableAddon(tab.id); - } // lets remember the last tab created so we can close it if it looks like a redirect this.lastCreatedTab = tab; if (tab.cookieStoreId) { diff --git a/src/manifest.json b/src/manifest.json index bab033b..26d2dd8 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,22 +2,19 @@ "manifest_version": 2, "name": "Firefox Multi-Account Containers", "version": "6.1.1", - + "incognito": "not_allowed", "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", "icons": { "48": "img/container-site-d-48.png", "96": "img/container-site-d-96.png" }, - "applications": { "gecko": { "id": "@testpilot-containers", - "strict_min_version": "57.0" + "strict_min_version": "67.0" } }, - "homepage_url": "https://github.com/mozilla/multi-account-containers#readme", - "permissions": [ "", "activeTab", @@ -32,7 +29,6 @@ "webRequestBlocking", "webRequest" ], - "commands": { "_execute_browser_action": { "suggested_key": { @@ -42,33 +38,37 @@ "description": "Open containers panel" } }, - "browser_action": { "browser_style": true, "default_icon": "img/container-site.svg", "default_title": "Multi-Account Containers", "default_popup": "popup.html", - "theme_icons": [{ + "theme_icons": [ + { "light": "img/container-site-light.svg", "dark": "img/container-site.svg", "size": 32 - }] + } + ] }, - "background": { "page": "js/background/index.html" }, - "content_scripts": [ { - "matches": [""], - "js": ["js/content-script.js"], - "css": ["css/content.css"], + "matches": [ + "" + ], + "js": [ + "js/content-script.js" + ], + "css": [ + "css/content.css" + ], "run_at": "document_start" } ], - "web_accessible_resources": [ "/img/container-site-d-24.png" ] -} +} \ No newline at end of file