From 6486e306a8fec3a70a9dcb0d9aa1c276ef388ebf Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 May 2019 12:10:23 +0200
Subject: [PATCH] Fixed parsing non essential addresses

---
 .../java/eu/faircode/email/MessageHelper.java | 69 +++++++++++--------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index b7288488d7..403e42902c 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -20,7 +20,6 @@ package eu.faircode.email;
 */
 
 import android.content.Context;
-import android.text.Html;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 
@@ -483,25 +482,30 @@ public class MessageHelper {
     }
 
     Address[] getReceiptTo() throws MessagingException {
-        String to = imessage.getHeader("Disposition-Notification-To", null);
-        if (to == null)
-            return null;
+        try {
+            String to = imessage.getHeader("Disposition-Notification-To", null);
+            if (to == null)
+                return null;
 
-        to = MimeUtility.unfold(to);
+            to = MimeUtility.unfold(to);
 
-        InternetAddress[] address = null;
-        try {
-            address = InternetAddress.parse(to);
-        } catch (AddressException ex) {
-            Log.w(ex);
-        }
+            InternetAddress[] address = null;
+            try {
+                address = InternetAddress.parse(to);
+            } catch (AddressException ex) {
+                Log.w(ex);
+            }
 
-        if (address == null || address.length == 0)
-            return null;
+            if (address == null || address.length == 0)
+                return null;
 
-        fix(address[0]);
+            fix(address[0]);
 
-        return new Address[]{address[0]};
+            return new Address[]{address[0]};
+        } catch (AddressException ex) {
+            Log.w(ex);
+            return null;
+        }
     }
 
     String getAuthentication() throws MessagingException {
@@ -560,26 +564,31 @@ public class MessageHelper {
     }
 
     Address[] getListPost() throws MessagingException {
-        // https://www.ietf.org/rfc/rfc2369.txt
-        String list = imessage.getHeader("List-Post", null);
-        if (list == null || "NO".equals(list))
-            return null;
+        try {
+            // https://www.ietf.org/rfc/rfc2369.txt
+            String list = imessage.getHeader("List-Post", null);
+            if (list == null || "NO".equals(list))
+                return null;
 
-        list = MimeUtility.unfold(list);
+            list = MimeUtility.unfold(list);
 
-        InternetAddress[] address = null;
-        try {
-            address = InternetAddress.parse(list);
-        } catch (AddressException ex) {
-            Log.w(ex);
-        }
+            InternetAddress[] address = null;
+            try {
+                address = InternetAddress.parse(list);
+            } catch (AddressException ex) {
+                Log.w(ex);
+            }
 
-        if (address == null || address.length == 0)
-            return null;
+            if (address == null || address.length == 0)
+                return null;
 
-        fix(address[0]);
+            fix(address[0]);
 
-        return new Address[]{address[0]};
+            return new Address[]{address[0]};
+        } catch (AddressException ex) {
+            Log.w(ex);
+            return null;
+        }
     }
 
     private static Address[] fix(Address[] addresses) {