From 04005f5cf1cd7f1293b522116e3e8d8e48246f5b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 25 Jun 2018 11:01:43 -0400 Subject: [AllAM] Revert Bug 956990 - PREF_CHECKCOMAT_THEMEOVERRIDE --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 18 +----------------- .../mozapps/webextensions/internal/XPIProvider.jsm | 19 +------------------ 2 files changed, 2 insertions(+), 35 deletions(-) (limited to 'toolkit/mozapps') diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index b522bd3ae..9ea876f6c 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -96,8 +96,6 @@ const PREF_INTERPOSITION_ENABLED = "extensions.interposition.enabled"; const PREF_EM_MIN_COMPAT_APP_VERSION = "extensions.minCompatibleAppVersion"; const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion"; -const PREF_CHECKCOMAT_THEMEOVERRIDE = "extensions.checkCompatibility.temporaryThemeOverride_minAppVersion"; - const URI_EXTENSION_SELECT_DIALOG = "chrome://mozapps/content/extensions/selectAddons.xul"; const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.xul"; const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties"; @@ -662,22 +660,8 @@ function isUsableAddon(aAddon) { return false; } else { - let app = aAddon.matchingTargetApplication; - if (!app) + if (!aAddon.matchingTargetApplication) return false; - - // XXX Temporary solution to let applications opt-in to make themes safer - // following significant UI changes even if checkCompatibility=false has - // been set, until we get bug 962001. - if (aAddon.type == "theme" && app.id == Services.appinfo.ID) { - try { - let minCompatVersion = Services.prefs.getCharPref(PREF_CHECKCOMAT_THEMEOVERRIDE); - if (minCompatVersion && - Services.vc.compare(minCompatVersion, app.maxVersion) > 0) { - return false; - } - } catch (e) {} - } } return true; diff --git a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm index 7c3cb6763..3fad0340f 100644 --- a/toolkit/mozapps/webextensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/webextensions/internal/XPIProvider.jsm @@ -131,8 +131,6 @@ const PREF_E10S_HAS_NONEXEMPT_ADDON = "extensions.e10s.rollout.hasAddon"; const PREF_EM_MIN_COMPAT_APP_VERSION = "extensions.minCompatibleAppVersion"; const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion"; -const PREF_CHECKCOMAT_THEMEOVERRIDE = "extensions.checkCompatibility.temporaryThemeOverride_minAppVersion"; - const PREF_EM_HOTFIX_ID = "extensions.hotfix.id"; const PREF_EM_CERT_CHECKATTRIBUTES = "extensions.hotfix.cert.checkAttributes"; const PREF_EM_HOTFIX_CERTS = "extensions.hotfix.certs."; @@ -794,25 +792,10 @@ function isUsableAddon(aAddon) { } } else { - let app = aAddon.matchingTargetApplication; - if (!app) { + if (!aAddon.matchingTargetApplication) { logger.warn(`Add-on ${aAddon.id} is not compatible with target application.`); return false; } - - // XXX Temporary solution to let applications opt-in to make themes safer - // following significant UI changes even if checkCompatibility=false has - // been set, until we get bug 962001. - if (aAddon.type == "theme" && app.id == Services.appinfo.ID) { - try { - let minCompatVersion = Services.prefs.getCharPref(PREF_CHECKCOMAT_THEMEOVERRIDE); - if (minCompatVersion && - Services.vc.compare(minCompatVersion, app.maxVersion) > 0) { - logger.warn(`Theme ${aAddon.id} is not compatible with application version.`); - return false; - } - } catch (e) {} - } } return true; -- cgit v1.2.3