mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Send alternative text/html

This commit is contained in:
M66B 2018-09-26 12:22:10 +00:00
parent 608ce13423
commit 359a65d818
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -25,6 +25,8 @@ import android.util.Base64;
import android.util.Log;
import android.webkit.MimeTypeMap;
import org.jsoup.Jsoup;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -181,14 +183,26 @@ public class MessageHelper {
// TODO: plain message?
if (attachments.size() == 0)
imessage.setText(message.read(context), Charset.defaultCharset().name(), "html");
else {
Multipart multipart = new MimeMultipart();
String body = message.read(context);
BodyPart bpMessage = new MimeBodyPart();
bpMessage.setContent(message.read(context), "text/html; charset=" + Charset.defaultCharset().name());
multipart.addBodyPart(bpMessage);
BodyPart plain = new MimeBodyPart();
plain.setContent(Jsoup.parse(body).text(), "text/plain; charset=" + Charset.defaultCharset().name());
BodyPart html = new MimeBodyPart();
html.setContent(body, "text/html; charset=" + Charset.defaultCharset().name());
Multipart alternative = new MimeMultipart("alternative");
alternative.addBodyPart(plain);
alternative.addBodyPart(html);
if (attachments.size() == 0) {
imessage.setContent(alternative);
} else {
Multipart multipart = new MimeMultipart("mixed");
BodyPart bp = new MimeBodyPart();
bp.setContent(alternative);
multipart.addBodyPart(bp);
for (final EntityAttachment attachment : attachments)
if (attachment.available) {