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

Improved DSN decoding

This commit is contained in:
M66B 2021-02-03 22:02:25 +01:00
parent 57f6edcb41
commit 1530322087
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1920,23 +1920,28 @@ public class MessageHelper {
} else if (h.isDSN()) {
StringBuilder report = new StringBuilder();
report.append("<hr><div style=\"font-family: monospace; font-size: small;\">");
for (String line : result.split("\\r?\\n")) {
if (line.length() > 0)
if (Character.isWhitespace(line.charAt(0)))
report.append(line).append("<br />");
for (String line : result.split("\\r?\\n"))
if (line.length() == 0)
report.append("<br>");
else if (Character.isWhitespace(line.charAt(0)))
report.append(line).append("<br>");
else {
int colon = line.indexOf(':');
if (colon < 0)
report.append(line);
else {
int colon = line.indexOf(':');
if (colon < 0)
report.append(line);
else
report
.append("<strong>")
.append(line.substring(0, colon))
.append("</strong>")
.append(line.substring(colon))
.append("<br />");
String name = line.substring(0, colon).trim();
String value = line.substring(colon + 1).trim();
value = decodeMime(value);
report
.append("<strong>")
.append(TextUtils.htmlEncode(name))
.append("</strong>")
.append(": ")
.append(TextUtils.htmlEncode(value))
.append("<br>");
}
}
}
report.append("</div>");
result = report.toString();
} else