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

Add a 'reason code' for when there isn't a reason string for a "corrupt extension"

Browse source
This commit is contained in:
ownedbywuigi 2026-04-01 13:52:00 +01:00
commit f2d3eb036b
4 changed files with 80 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4926,6 +4926,17 @@ AddonInstall.prototype = {
logger.warn("Invalid XPI", e);
this.error = AddonManager.ERROR_CORRUPT_FILE;
}
if (e !== undefined && e !== null) {
if (typeof e == "string") {
this.errorDetail = e;
} else if (e && typeof e.message == "string" && e.message) {
this.errorDetail = e.message;
} else {
this.errorDetail = String(e);
}
} else {
this.errorDetail = null;
}
aCallback(this);
return;
}
@ -4981,6 +4992,7 @@ AddonInstall.prototype = {
this.removeTemporaryFile();
this.state = AddonManager.STATE_AVAILABLE;
this.error = 0;
this.errorDetail = null;
this.progress = 0;
this.maxProgress = -1;
this.hash = this.originalHash;
@ -5870,6 +5882,17 @@ AddonInstall.prototype = {
recursiveRemove(stagedAddon);
this.state = AddonManager.STATE_INSTALL_FAILED;
this.error = AddonManager.ERROR_FILE_ACCESS;
if (e !== undefined && e !== null) {
if (typeof e == "string") {
this.errorDetail = e;
} else if (e && typeof e.message == "string" && e.message) {
this.errorDetail = e.message;
} else {
this.errorDetail = String(e);
}
} else {
this.errorDetail = null;
}
XPIProvider.removeActiveInstall(this);
AddonManagerPrivate.callAddonListeners("onOperationCancelled",
createWrapper(this.addon));

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

@ -5735,6 +5735,17 @@ class AddonInstall {
recursiveRemove(stagedAddon);
this.state = AddonManager.STATE_INSTALL_FAILED;
this.error = AddonManager.ERROR_FILE_ACCESS;
if (e !== undefined && e !== null) {
if (typeof e == "string") {
this.errorDetail = e;
} else if (e && typeof e.message == "string" && e.message) {
this.errorDetail = e.message;
} else {
this.errorDetail = String(e);
}
} else {
this.errorDetail = null;
}
XPIProvider.removeActiveInstall(this);
AddonManagerPrivate.callAddonListeners("onOperationCancelled",
this.addon.wrapper);
@ -5919,6 +5930,17 @@ class LocalAddonInstall extends AddonInstall {
logger.warn("Invalid XPI", message);
this.state = AddonManager.STATE_DOWNLOAD_FAILED;
this.error = error;
if (message !== undefined && message !== null) {
if (typeof message == "string") {
this.errorDetail = message;
} else if (message && typeof message.message == "string" && message.message) {
this.errorDetail = message.message;
} else {
this.errorDetail = String(message);
}
} else {
this.errorDetail = null;
}
XPIProvider.removeActiveInstall(this);
AddonManagerPrivate.callInstallListeners("onNewInstall",
this.listeners,
@ -6031,6 +6053,7 @@ class DownloadAddonInstall extends AddonInstall {
this.removeTemporaryFile();
this.state = AddonManager.STATE_AVAILABLE;
this.error = 0;
this.errorDetail = null;
this.progress = 0;
this.maxProgress = -1;
this.hash = this.originalHash;
@ -6102,6 +6125,17 @@ class DownloadAddonInstall extends AddonInstall {
logger.warn("Failed to start download for addon " + this.sourceURI.spec, e);
this.state = AddonManager.STATE_DOWNLOAD_FAILED;
this.error = AddonManager.ERROR_FILE_ACCESS;
if (e !== undefined && e !== null) {
if (typeof e == "string") {
this.errorDetail = e;
} else if (e && typeof e.message == "string" && e.message) {
this.errorDetail = e.message;
} else {
this.errorDetail = String(e);
}
} else {
this.errorDetail = null;
}
XPIProvider.removeActiveInstall(this);
AddonManagerPrivate.callInstallListeners("onDownloadFailed",
this.listeners, this.wrapper);