mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 08:23:24 +00:00
Code Issues Releases Wiki Activity

Fixed plain text attachments

Browse source
This commit is contained in:
M66B 2019-12-02 13:27:52 +01:00
parent d235ab4e19
commit 2c51257942
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -379,11 +379,6 @@ public class MessageHelper {
BodyPart plainPart = new MimeBodyPart();
plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name());
if (message.plain_only != null && message.plain_only) {
imessage.setContent(plainContent, plainPart.getContentType());
return;
}
BodyPart htmlPart = new MimeBodyPart();
htmlPart.setContent(htmlContent, "text/html; charset=" + Charset.defaultCharset().name());
@ -401,13 +396,21 @@ public class MessageHelper {
}
if (availableAttachments == 0)
if (message.plain_only != null && message.plain_only)
imessage.setContent(plainContent, plainPart.getContentType());
else
imessage.setContent(altMultiPart);
else {
Multipart mixedMultiPart = new MimeMultipart("mixed");
Multipart relatedMultiPart = new MimeMultipart("related");
BodyPart bodyPart = new MimeBodyPart();
BodyPart bodyPart;
if (message.plain_only != null && message.plain_only)
bodyPart = plainPart;
else {
bodyPart = new MimeBodyPart();
bodyPart.setContent(altMultiPart);
}
if (hasInline) {
relatedMultiPart.addBodyPart(bodyPart);