Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revamp MailSo\Mime\Message for sending proper multipart/encrypted

Browse source
This commit is contained in:
the-djmaze 2022-02-03 21:41:59 +01:00
parent 5514264914
commit fb1c0dd606
6 changed files with 174 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/View/Popup/Compose.js
View file

@ -454,8 +454,8 @@ class ComposePopupView extends AbstractViewPopup {
if (this.mailvelope && 'mailvelope' === this.viewArea()) {
this.mailvelope.encrypt(this.allRecipients()).then(armored => {
params.Html = '';
params.Text = armored;
params.Text = params.Html = '';
params.Encrypted = armored;
send();
});
} else if (encrypt) {
@ -474,7 +474,7 @@ class ComposePopupView extends AbstractViewPopup {
send();
} else {
this.sendError(true);
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Signing failed' }));
this.sendErrorDesc(i18n('PGP_NOTIFICATIONS/PGP_ERROR', { ERROR: 'Encryption failed' }));
this.sending(false);
}
});
@ -489,8 +489,8 @@ class ComposePopupView extends AbstractViewPopup {
if (detached) {
// Append headers
params.Text = [
'Content-Transfer-Encoding: base64',
'Content-Type: text/plain; charset="utf-8"; protected-headers="v1"',
'Content-Transfer-Encoding: base64',
// 'From: Demo <demo@snappymail.eu>',
// 'To: Demo <demo@snappymail.eu>',
// 'Subject: text detached signed'