From b673256c250df6df0f58b3a4de91a63e7afe2a60 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 23 Jan 2024 12:42:09 +0100 Subject: [PATCH] Handle POP3 body errors --- app/src/main/java/eu/faircode/email/Core.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 0a07195616..c39c7978c8 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3568,7 +3568,14 @@ class Core { boolean needsHeaders = EntityRule.needsHeaders(message, rules); List
headers = (needsHeaders ? helper.getAllHeaders() : null); - String body = parts.getHtml(context, download_plain); + String body; + try { + body = parts.getHtml(context, download_plain); + } catch (Throwable ex) { + Log.w(ex); + message.error = Log.formatThrowable(ex, false); + body = null; + } try { db.beginTransaction(); @@ -3602,7 +3609,7 @@ class Core { message.preview = HtmlHelper.getPreview(text); message.language = HtmlHelper.getLanguage(context, message.subject, text); db.message().setMessageContent(message.id, - true, + body != null, message.language, parts.isPlainOnly(download_plain), message.preview,