Bug 1677088 - remove EnigmailAttachment. r=PatrickBrunschwig

Only use in uncommented code...

Differential Revision: https://phabricator.services.mozilla.com/D132485

--HG--
extra : rebase_source : 686ea7bebdf7eea71929d0ce80116fcecd6563fb
This commit is contained in:
Magnus Melin 2021-11-30 15:49:32 +02:00
Родитель 214d2d15ca
Коммит fed63c4c84
3 изменённых файлов: 2 добавлений и 27 удалений

Просмотреть файл

@ -1,20 +0,0 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
"use strict";
var EXPORTED_SYMBOLS = ["EnigmailAttachment"];
const { EnigmailCryptoAPI } = ChromeUtils.import(
"chrome://openpgp/content/modules/cryptoAPI.jsm"
);
var EnigmailAttachment = {
getFileName(parent, byteData) {
const cApi = EnigmailCryptoAPI();
return cApi.sync(cApi.getFileName(parent, byteData));
},
};

Просмотреть файл

@ -194,11 +194,6 @@
### noPassphrase=Error - no passphrase supplied
# Strings used in enigmailAttachmentDialog.js
### pgpMimeNote=NOTE: PGP/MIME is not supported by all email clients. If you are unsure, select the %S option.
### first=first
### second=second
# Strings used in enigmailSingleRcptSettings.js
### noEncryption=You have activated encryption, but you did not select a key. In order to encrypt emails sent to %1$S, you need to specify one or several valid key(s) from your key list. Do you want to disable encryption for %2$S?
### noKeyToUse=(none - no encryption)

Просмотреть файл

@ -31,7 +31,6 @@ var { XPCOMUtils } = ChromeUtils.import(
XPCOMUtils.defineLazyModuleGetters(this, {
BondOpenPGP: "chrome://openpgp/content/BondOpenPGP.jsm",
EnigmailArmor: "chrome://openpgp/content/modules/armor.jsm",
EnigmailAttachment: "chrome://openpgp/content/modules/attachment.jsm",
EnigmailAutocrypt: "chrome://openpgp/content/modules/autocrypt.jsm",
EnigmailConstants: "chrome://openpgp/content/modules/constants.jsm",
EnigmailCore: "chrome://openpgp/content/modules/core.jsm",
@ -2618,7 +2617,8 @@ Enigmail.msg = {
// from an encrypted data block.
/*
if (callbackArg.actionType != "importKey") {
origFilename = EnigmailAttachment.getFileName(window, callbackArg.data);
let cApi = EnigmailCryptoAPI();
let origFilename = await cApi.getFileName(window, callbackArg.data);
if (origFilename && origFilename.length > rawFileName.length) {
rawFileName = origFilename;
}