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

Simplied message html

This commit is contained in:
M66B 2019-08-22 16:11:49 +02:00
parent 885ac1b2b0
commit d38d319f2b
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,9 @@ import android.webkit.MimeTypeMap;
import com.sun.mail.util.FolderClosedIOException; import com.sun.mail.util.FolderClosedIOException;
import com.sun.mail.util.MessageRemovedIOException; import com.sun.mail.util.MessageRemovedIOException;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -234,23 +237,28 @@ public class MessageHelper {
return; return;
} }
// Build html body
StringBuilder body = new StringBuilder(); StringBuilder body = new StringBuilder();
body.append(Helper.readText(message.getFile(context))); body.append("<html><body>");
Document mdoc = Jsoup.parse(Helper.readText(message.getFile(context)));
if (mdoc.body() != null)
body.append(mdoc.body().html());
// When sending message // When sending message
if (identity != null) { if (identity != null) {
if (!TextUtils.isEmpty(identity.signature)) if (!TextUtils.isEmpty(identity.signature)) {
body.append(identity.signature); Document sdoc = Jsoup.parse(identity.signature);
if (sdoc.body() != null)
body.append(sdoc.body().html());
}
File refFile = message.getRefFile(context); File refFile = message.getRefFile(context);
if (refFile.exists()) if (refFile.exists())
body.append(Helper.readText(refFile)); body.append(Helper.readText(refFile));
} }
String plainContent = HtmlHelper.getText(body.toString()); body.append("</body></html>");
StringBuilder htmlContent = new StringBuilder();
htmlContent.append(body.toString()).append("\n");
// multipart/mixed // multipart/mixed
// multipart/related // multipart/related
@ -260,11 +268,14 @@ public class MessageHelper {
// inlines // inlines
// attachments // attachments
String htmlContent = body.toString();
String plainContent = HtmlHelper.getText(htmlContent);
BodyPart plainPart = new MimeBodyPart(); BodyPart plainPart = new MimeBodyPart();
plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name()); plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name());
BodyPart htmlPart = new MimeBodyPart(); BodyPart htmlPart = new MimeBodyPart();
htmlPart.setContent(htmlContent.toString(), "text/html; charset=" + Charset.defaultCharset().name()); htmlPart.setContent(htmlContent, "text/html; charset=" + Charset.defaultCharset().name());
Multipart altMultiPart = new MimeMultipart("alternative"); Multipart altMultiPart = new MimeMultipart("alternative");
altMultiPart.addBodyPart(plainPart); altMultiPart.addBodyPart(plainPart);