wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-03 05:47:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove the hard blocker on unmodified jetpack extensions from TychoAM

Browse source 
Be sure to remove the now unused string from Pale Moon
This commit is contained in:
NTD 2018-03-12 16:22:40 -04:00 • committed by Roy Tam
commit 66e00ae185
3 changed files with 3 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
toolkit/mozapps/extensions/content/extensions.xml
View file

@ -1307,14 +1307,6 @@
this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link"); this._errorLink.value = gStrings.ext.GetStringFromName("notification.blocked.link");
this._errorLink.href = this.mAddon.blocklistURL; this._errorLink.href = this.mAddon.blocklistURL;
this._errorLink.hidden = false; this._errorLink.hidden = false;
} else if (this.mAddon.jetsdk) {
this.setAttribute("notification", "warning");
this._warning.textContent = gStrings.ext.formatStringFromName(
"notification.jetsdk",
[gStrings.brandShortName, gStrings.appVersion], 2
);
this._warningLink.hidden = true;
this._warningBtn.hidden = true;
} else if ((!isUpgrade && !this.mAddon.isCompatible) && (AddonManager.checkCompatibility } else if ((!isUpgrade && !this.mAddon.isCompatible) && (AddonManager.checkCompatibility
|| (this.mAddon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) { || (this.mAddon.blocklistState != Ci.nsIBlocklistService.STATE_SOFTBLOCKED))) {
this.setAttribute("notification", "warning"); this.setAttribute("notification", "warning");

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

@ -635,9 +635,6 @@ function isUsableAddon(aAddon) {
if (aAddon.type == "theme" && aAddon.internalName == XPIProvider.defaultSkin) if (aAddon.type == "theme" && aAddon.internalName == XPIProvider.defaultSkin)
return true; return true;
if (aAddon.jetsdk)
return false;
if (aAddon.blocklistState == Blocklist.STATE_BLOCKED) if (aAddon.blocklistState == Blocklist.STATE_BLOCKED)
return false; return false;
@ -1117,22 +1114,6 @@ function loadManifestFromZipReader(aZipReader) {
addon.hasBinaryComponents = false; addon.hasBinaryComponents = false;
} }
// Set a boolean value whether the .xpi archive contains file related to old
// Mozilla Add-on SDK or contains file related to PMkit (or new Mozilla SDK),
// but extension is not directly targeting Pale Moon
if (aZipReader.hasEntry("harness-options.json")) {
addon.jetsdk = true;
} else if (aZipReader.hasEntry("package.json")) {
let app = addon.matchingTargetApplication;
if (app && app.id == Services.appinfo.ID) {
addon.jetsdk = false;
} else {
addon.jetsdk = true;
}
} else {
addon.jetsdk = false;
}
addon.appDisabled = !isUsableAddon(addon); addon.appDisabled = !isUsableAddon(addon);
return addon; return addon;
} }
@ -6731,7 +6712,7 @@ function AddonWrapper(aAddon) {
"providesUpdatesSecurely", "blocklistState", "blocklistURL", "appDisabled", "providesUpdatesSecurely", "blocklistState", "blocklistURL", "appDisabled",
"softDisabled", "skinnable", "size", "foreignInstall", "hasBinaryComponents", "softDisabled", "skinnable", "size", "foreignInstall", "hasBinaryComponents",
"strictCompatibility", "compatibilityOverrides", "updateURL", "strictCompatibility", "compatibilityOverrides", "updateURL",
"getDataDirectory", "multiprocessCompatible", "jetsdk", "native"].forEach(function(aProp) { "getDataDirectory", "multiprocessCompatible", "native"].forEach(function(aProp) {
this.__defineGetter__(aProp, function AddonWrapper_propertyGetter() aAddon[aProp]); this.__defineGetter__(aProp, function AddonWrapper_propertyGetter() aAddon[aProp]);
}, this); }, this);

2
toolkit/mozapps/extensions/internal/XPIProviderUtils.js
View file

@ -70,7 +70,7 @@ const PROP_JSON_FIELDS = ["id", "syncGUID", "location", "version", "type",
"skinnable", "size", "sourceURI", "releaseNotesURI", "skinnable", "size", "sourceURI", "releaseNotesURI",
"softDisabled", "foreignInstall", "hasBinaryComponents", "softDisabled", "foreignInstall", "hasBinaryComponents",
"strictCompatibility", "locales", "targetApplications", "strictCompatibility", "locales", "targetApplications",
"targetPlatforms", "multiprocessCompatible", "jetsdk", "native"]; "targetPlatforms", "multiprocessCompatible", "native"];
// Time to wait before async save of XPI JSON database, in milliseconds // Time to wait before async save of XPI JSON database, in milliseconds
const ASYNC_SAVE_DELAY_MS = 20; const ASYNC_SAVE_DELAY_MS = 20;