From bc807dc22ffeb197cbac10a83a794de5ec193cc0 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 15 Jan 2025 17:25:07 +0100 Subject: [PATCH] Prevent follow up NPE --- app/src/main/java/eu/faircode/email/MessageHelper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index dd42830484..f4e6684c8e 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -4532,6 +4532,11 @@ public class MessageHelper { subsequence = decodeTNEF(context, epart.attachment, subsequence); } catch (Throwable ex) { + Log.w(ex); + + if (epart.attachment.id == null) + continue; + db.attachment().setError(epart.attachment.id, Log.formatThrowable(ex)); db.attachment().setAvailable(epart.attachment.id, true); // unrecoverable }