Catch exceptions on get CID

5 years ago · a86a92d7b7
parent e586370fb8
commit a86a92d7b7
1 changed files with 8 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -989,7 +989,14 @@ public class MessageHelper {
                        Log.w(ex);
                        ct = new ContentType("application/octet-stream");
                    }
-                    String[] cid = apart.part.getHeader("Content-ID");
+
+                    String[] cid = null;
+                    try {
+                        cid = apart.part.getHeader("Content-ID");
+                    } catch (MessagingException ex) {
+                        Log.w(ex);
+                        parts.warnings.add(Helper.formatThrowable(ex));
+                    }

                    apart.attachment = new EntityAttachment();
                    apart.attachment.name = apart.filename;