From a213ca2fb7f1ba4ae7496dc7f76ff610cb65ec35 Mon Sep 17 00:00:00 2001
From: cketti <cketti@googlemail.com>
Date: Fri, 28 Jan 2011 06:01:10 +0000
Subject: [PATCH] Correctly parse email addresses (from contacts). Could be of
 the form "User name <user@example.com>".

Fixes issue 2920
---
 src/com/fsck/k9/mail/Address.java | 75 +++++++++++++++++++------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java
index dafc052d2..aed568ff0 100644
--- a/src/com/fsck/k9/mail/Address.java
+++ b/src/com/fsck/k9/mail/Address.java
@@ -47,21 +47,49 @@ public class Address
 
     public Address(String address, String personal)
     {
-        this.mAddress = address;
-        if ("".equals(personal))
-        {
-            personal = null;
-        }
-        if (personal!=null)
-        {
-            personal = personal.trim();
-        }
-        this.mPersonal = personal;
+        this(address, personal, true);
     }
 
     public Address(String address)
     {
-        this.mAddress = address;
+        this(address, null);
+    }
+
+    private Address(String address, String personal, boolean parse)
+    {
+        if (parse)
+        {
+            Rfc822Token[] tokens =  Rfc822Tokenizer.tokenize(address);
+            if (tokens.length > 0)
+            {
+                Rfc822Token token = tokens[0];
+                mAddress = token.getAddress();
+                String name = token.getName();
+                if ((name != null) && !("".equals(name)))
+                {
+                    /*
+                     * Don't use the "personal" argument if "address" is of the form:
+                     * James Bond <james.bond@mi6.uk>
+                     *
+                     * See issue 2920
+                     */
+                    mPersonal = name;
+                }
+                else
+                {
+                    mPersonal = (personal == null) ? null : personal.trim();
+                }
+            }
+            else
+            {
+                // This should be an error
+            }
+        }
+        else
+        {
+            mAddress = address;
+            mPersonal = personal;
+        }
     }
 
     public String getAddress()
@@ -85,7 +113,7 @@ public class Address
         {
             personal = null;
         }
-        if (personal!=null)
+        if (personal != null)
         {
             personal = personal.trim();
         }
@@ -102,17 +130,15 @@ public class Address
     public static Address[] parseUnencoded(String addressList)
     {
         List<Address> addresses = new ArrayList<Address>();
-        if (addressList!=null
-                && !"".equals(addressList))
+        if ((addressList != null) && !("".equals(addressList)))
         {
-            Rfc822Token[] tokens =  Rfc822Tokenizer.tokenize(addressList);
+            Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList);
             for (Rfc822Token token : tokens)
             {
                 String address = token.getAddress();
-                if (address!=null
-                        && !"".equals(address))
+                if ((address != null) && !("".equals(address)))
                 {
-                    addresses.add(new Address(token.getAddress(), token.getName()));
+                    addresses.add(new Address(token.getAddress(), token.getName(), false));
                 }
             }
         }
@@ -129,7 +155,7 @@ public class Address
     public static Address[] parse(String addressList)
     {
         ArrayList<Address> addresses = new ArrayList<Address>();
-        if (addressList == null && !"".equals(addressList))
+        if ((addressList == null) && !("".equals(addressList)))
         {
             return EMPTY_ADDRESS_ARRAY;
         }
@@ -142,25 +168,18 @@ public class Address
                 if (address instanceof Mailbox)
                 {
                     Mailbox mailbox = (Mailbox)address;
-                    if (mailbox.getName() != null )
-                    {
-                        addresses.add(new Address(mailbox.getLocalPart() + "@" + mailbox.getDomain(), mailbox.getName()));
-                    }
-                    else
-                    {
-                        addresses.add(new Address(mailbox.getLocalPart() + "@" + mailbox.getDomain()));
-                    }
+                    addresses.add(new Address(mailbox.getLocalPart() + "@" + mailbox.getDomain(), mailbox.getName(), false));
                 }
                 else
                 {
                     Log.e(K9.LOG_TAG, "Unknown address type from Mime4J: "
                           + address.getClass().toString());
                 }
-
             }
         }
         catch (MimeException pe)
         {
+            Log.e(K9.LOG_TAG, "MimeException in Address.parse()", pe);
         }
         return addresses.toArray(EMPTY_ADDRESS_ARRAY);
     }