diff options
Diffstat (limited to 'toolkit/mozapps/extensions/AddonManager.sys.mjs')
-rw-r--r-- | toolkit/mozapps/extensions/AddonManager.sys.mjs | 88 |
1 files changed, 2 insertions, 86 deletions
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs index a07a651895..9890e15bf4 100644 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs @@ -26,7 +26,6 @@ const MOZ_COMPATIBILITY_NIGHTLY = ![ const INTL_LOCALES_CHANGED = "intl:app-locales-changed"; -const PREF_AMO_ABUSEREPORT = "extensions.abuseReport.amWebAPI.enabled"; const PREF_BLOCKLIST_PINGCOUNTVERSION = "extensions.blocklist.pingCountVersion"; const PREF_EM_UPDATE_ENABLED = "extensions.update.enabled"; const PREF_EM_LAST_APP_VERSION = "extensions.lastAppVersion"; @@ -81,7 +80,6 @@ var AsyncShutdown = realAsyncShutdown; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - AbuseReporter: "resource://gre/modules/AbuseReporter.sys.mjs", AddonRepository: "resource://gre/modules/addons/AddonRepository.sys.mjs", Extension: "resource://gre/modules/Extension.sys.mjs", RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", @@ -3280,7 +3278,7 @@ var AddonManagerInternal = { // the customConfirmationUI preference and responding to the // "addon-install-confirmation" notification. If the application // does not implement its own prompt, use the built-in xul dialog. - if (info.addon.userPermissions) { + if (info.addon.installPermissions) { let subject = { wrappedJSObject: { target: browser, @@ -3288,7 +3286,7 @@ var AddonManagerInternal = { }, }; subject.wrappedJSObject.info.permissions = - info.addon.userPermissions; + info.addon.installPermissions; Services.obs.notifyObservers( subject, "webextension-permission-prompt" @@ -3628,54 +3626,6 @@ var AddonManagerInternal = { } } }, - - async addonReportAbuse(target, id) { - if (!Services.prefs.getBoolPref(PREF_AMO_ABUSEREPORT, false)) { - return Promise.reject({ - message: "amWebAPI reportAbuse not supported", - }); - } - - let existingDialog = lazy.AbuseReporter.getOpenDialog(); - if (existingDialog) { - existingDialog.close(); - } - - const dialog = await lazy.AbuseReporter.openDialog( - id, - "amo", - target - ).catch(err => { - Cu.reportError(err); - return Promise.reject({ - message: "Error creating abuse report", - }); - }); - - return dialog.promiseReport.then( - async report => { - if (!report) { - return false; - } - - await report.submit().catch(err => { - Cu.reportError(err); - return Promise.reject({ - message: "Error submitting abuse report", - }); - }); - - return true; - }, - err => { - Cu.reportError(err); - dialog.close(); - return Promise.reject({ - message: "Error creating abuse report", - }); - } - ); - }, }, }; @@ -5251,40 +5201,6 @@ AMTelemetry = { }, /** - * Record an event on abuse report submissions. - * - * @params {object} opts - * @params {string} opts.addonId - * The id of the addon being reported. - * @params {string} [opts.addonType] - * The type of the addon being reported (only present for an existing - * addonId). - * @params {string} [opts.errorType] - * The AbuseReport errorType for a submission failure. - * @params {string} opts.reportEntryPoint - * The entry point of the abuse report. - */ - recordReportEvent({ addonId, addonType, errorType, reportEntryPoint }) { - this.recordEvent({ - method: "report", - object: reportEntryPoint, - value: addonId, - extra: this.formatExtraVars({ - addon_type: addonType, - error_type: errorType, - }), - }); - Glean.addonsManager.report.record( - this.formatExtraVars({ - addon_id: addonId, - addon_type: addonType, - entry_point: reportEntryPoint, - error_type: errorType, - }) - ); - }, - - /** * @params {object} opts * @params {nsIURI} opts.displayURI */ |