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

Remove NUL characters from received messages

This commit is contained in:
M66B 2019-06-22 15:22:13 +02:00
parent 087a98359c
commit 4929bf2429
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -776,12 +776,17 @@ public class MessageHelper {
}
String result;
boolean text = false;
Part part = (html == null ? plain : html);
try {
Object content = part.getContent();
Log.i("Content class=" + (content == null ? null : content.getClass().getName()));
if (content == null) {
warnings.add(context.getString(R.string.title_no_body));
return null;
}
if (content instanceof String)
result = (String) content;
else if (content instanceof InputStream)
@ -818,7 +823,9 @@ public class MessageHelper {
warnings.add(Helper.formatThrowable(ex));
}
if (part.isMimeType("text/plain") || text) {
result = result.replace("\0", "");
if (part.isMimeType("text/plain")) {
result = TextUtils.htmlEncode(result);
result = result.replaceAll("\\r?\\n", "<br />");
result = "<span>" + result + "</span>";