Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-05 15:37:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

#89 solve edit/reply encrypted message/draft

Browse source
This commit is contained in:
the-djmaze 2022-02-04 09:54:59 +01:00
parent 686138ae15
commit 96de0be977
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/Model/Message.js
View file

@ -614,7 +614,8 @@ export class MessageModel extends AbstractModel {
* @returns {string} * @returns {string}
*/ */
bodyAsHTML() { bodyAsHTML() {
if (this.body) { // if (this.body && !this.body.querySelector('iframe[src*=decrypt]')) {
if (this.body && !this.body.querySelector('iframe')) {
let clone = this.body.cloneNode(true), let clone = this.body.cloneNode(true),
attr = 'data-html-editor-font-wrapper'; attr = 'data-html-editor-font-wrapper';
clone.querySelectorAll('blockquote.rl-bq-switcher').forEach( clone.querySelectorAll('blockquote.rl-bq-switcher').forEach(
@ -628,6 +629,9 @@ export class MessageModel extends AbstractModel {
); );
return clone.innerHTML; return clone.innerHTML;
} }
if (this.isPgpEncrypted()) {
return this.html() || plainToHtml(this.plain());
}
return ''; return '';
} }

12
dev/View/User/MailBox/MessageView.js
View file

@ -62,7 +62,7 @@ const
mimeToMessage = (data, message) => { mimeToMessage = (data, message) => {
// TODO: Check multipart/signed application/pgp-signature application/pgp-keys // TODO: Check multipart/signed application/pgp-signature application/pgp-keys
const headers = data.split(/\r?\n\r?\n/)[0]; const headers = data.split(/\r?\n\r?\n/)[0];
if (/Content-Type:[\s\S]*?/.test(headers)) { if (/Content-Type:/i.test(headers)) {
// https://github.com/postalsys/postal-mime // https://github.com/postalsys/postal-mime
(new PostalMime).parse(data).then(result => { (new PostalMime).parse(data).then(result => {
// TODO: multipart/signed // TODO: multipart/signed
@ -284,7 +284,9 @@ export class MailMessageView extends AbstractViewRight {
} }
messageEditCommand() { messageEditCommand() {
this.editMessage(); if (currentMessage()) {
showMessageComposer([ComposeType.Draft, currentMessage()]);
}
} }
goUpCommand() { goUpCommand() {
@ -556,12 +558,6 @@ export class MailMessageView extends AbstractViewRight {
showMessageComposer(); showMessageComposer();
} }
editMessage() {
if (currentMessage()) {
showMessageComposer([ComposeType.Draft, currentMessage()]);
}
}
scrollMessageToTop() { scrollMessageToTop() {
oMessageScrollerDom().scrollTop = (50 < oMessageScrollerDom().scrollTop) ? 50 : 0; oMessageScrollerDom().scrollTop = (50 < oMessageScrollerDom().scrollTop) ? 50 : 0;
} }