wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-26 02:17:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

[AllAM] Revert Bug 956990 - PREF_CHECKCOMAT_THEMEOVERRIDE

Browse source
This commit is contained in:
NTD 2018-06-25 11:01:43 -04:00 • committed by Roy Tam
commit c5f22288ca
3 changed files with 2 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/basilisk/app/profile/firefox.js
View file

@ -33,9 +33,6 @@ pref("extensions.strictCompatibility", false);
// Specifies a minimum maxVersion an addon needs to say it's compatible with // Specifies a minimum maxVersion an addon needs to say it's compatible with
// for it to be compatible by default. // for it to be compatible by default.
pref("extensions.minCompatibleAppVersion", "4.0"); pref("extensions.minCompatibleAppVersion", "4.0");
// Temporary preference to forcibly make themes more safe with Australis even if
// extensions.checkCompatibility=false has been set.
pref("extensions.checkCompatibility.temporaryThemeOverride_minAppVersion", "29.0a1");
pref("xpinstall.customConfirmationUI", true); pref("xpinstall.customConfirmationUI", true);

18
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View file

@ -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_APP_VERSION = "extensions.minCompatibleAppVersion";
const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion"; 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_SELECT_DIALOG = "chrome://mozapps/content/extensions/selectAddons.xul";
const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.xul"; const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.xul";
const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties"; const URI_EXTENSION_STRINGS = "chrome://mozapps/locale/extensions/extensions.properties";
@ -662,22 +660,8 @@ function isUsableAddon(aAddon) {
return false; return false;
} }
else { else {
let app = aAddon.matchingTargetApplication; if (!aAddon.matchingTargetApplication)
if (!app)
return false; 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; return true;

19
toolkit/mozapps/webextensions/internal/XPIProvider.jsm
View file

@ -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_APP_VERSION = "extensions.minCompatibleAppVersion";
const PREF_EM_MIN_COMPAT_PLATFORM_VERSION = "extensions.minCompatiblePlatformVersion"; 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_HOTFIX_ID = "extensions.hotfix.id";
const PREF_EM_CERT_CHECKATTRIBUTES = "extensions.hotfix.cert.checkAttributes"; const PREF_EM_CERT_CHECKATTRIBUTES = "extensions.hotfix.cert.checkAttributes";
const PREF_EM_HOTFIX_CERTS = "extensions.hotfix.certs."; const PREF_EM_HOTFIX_CERTS = "extensions.hotfix.certs.";
@ -794,25 +792,10 @@ function isUsableAddon(aAddon) {
} }
} }
else { else {
let app = aAddon.matchingTargetApplication; if (!aAddon.matchingTargetApplication) {
if (!app) {
logger.warn(`Add-on ${aAddon.id} is not compatible with target application.`); logger.warn(`Add-on ${aAddon.id} is not compatible with target application.`);
return false; 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; return true;