From 08c37785adb6bb85072f5a5a0c0812b21e604298 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 21 Jun 2019 08:12:35 +0200 Subject: [PATCH] Fix NUL characters in decrypted messages --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 78f69326d1..6ac738812e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3507,7 +3507,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. // Write decrypted body EntityMessage m = db.message().getMessage(id); - Helper.writeText(m.getFile(context), decrypted.toString().replace("\0", "")); + Helper.writeText(m.getFile(context), + decrypted.toString().replace("\0", "")); db.message().setMessageStored(id, new Date().getTime()); @@ -3530,7 +3531,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. // Write decrypted body EntityMessage m = db.message().getMessage(id); - Helper.writeText(m.getFile(context), parts.getHtml(context)); + String html = parts.getHtml(context); + if (html != null) + html = html.replace("\0", ""); + Helper.writeText(m.getFile(context), html); // Remove previously decrypted attachments for (EntityAttachment local : attachments)