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

Preserve plain text spaces

This commit is contained in:
M66B 2019-09-01 11:10:00 +02:00
parent d03969d23f
commit d11684c5aa
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -145,9 +145,14 @@ public class HtmlHelper {
}
// Pre formatted text
for (Element code : document.select("pre")) {
code.html(code.html().replaceAll("\\r?\\n", "<br>"));
code.tagName("div");
for (Element pre : document.select("pre")) {
String[] lines = pre.html().split("\\r?\\n");
for (int i = 0; i < lines.length; i++) {
if (!"-- ".equals(lines[i]))
lines[i] = lines[i].replace(" ", "&nbsp;");
}
pre.html(TextUtils.join("<br>", lines));
pre.tagName("div");
}
// Code

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

@ -862,11 +862,8 @@ public class MessageHelper {
// Prevent Jsoup throwing an exception
result = result.replace("\0", "");
if (part.isMimeType("text/plain")) {
result = TextUtils.htmlEncode(result);
result = result.replaceAll("\\r?\\n", "<br>");
result = "<span>" + result + "</span>";
}
if (part.isMimeType("text/plain"))
result = "<pre>" + TextUtils.htmlEncode(result) + "</pre>";
return result;
}