commit 00249573d7bbbd901e7185915c31bbacb342a4ce
author James Lemieux <jplemieux@google.com> Mon Mar 17 14:47:17 2014 -0700
committer James Lemieux <jplemieux@google.com> Mon Mar 17 14:47:17 2014 -0700
tree 97f5d420d5031e147e51082cd08317c2d208a9c1
parent 51ce7c7fe90d559131645f931926f1b08540b108

Email addresses should be decoded as they arrive from Exchange

b/13511054

Email addresses are now *always* decoded as they arrive off
the wire from exchange and then written to the DB in decoded
form. This simplifies the cases the client must later handle
when constructing views that use the email address.

Change-Id: I6ad84aa5f19793c8d8546f3ab7768857e2e98779

src/com/android/exchange/adapter/EmailSyncAdapter.java

diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index 26e56ff..bee33a2 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -523,20 +523,20 @@
                         attachmentsParser(atts, msg);
                         break;
                     case Tags.EMAIL_TO:
-                        msg.mTo = Address.pack(Address.parse(getValue()));
+                        msg.mTo = Address.toString(Address.parse(getValue()));
                         break;
                     case Tags.EMAIL_FROM:
                         Address[] froms = Address.parse(getValue());
                         if (froms != null && froms.length > 0) {
                             msg.mDisplayName = froms[0].toFriendly();
                         }
-                        msg.mFrom = Address.pack(froms);
+                        msg.mFrom = Address.toString(froms);
                         break;
                     case Tags.EMAIL_CC:
-                        msg.mCc = Address.pack(Address.parse(getValue()));
+                        msg.mCc = Address.toString(Address.parse(getValue()));
                         break;
                     case Tags.EMAIL_REPLY_TO:
-                        msg.mReplyTo = Address.pack(Address.parse(getValue()));
+                        msg.mReplyTo = Address.toString(Address.parse(getValue()));
                         break;
                     case Tags.EMAIL_DATE_RECEIVED:
                         msg.mTimeStamp = Utility.parseEmailDateTimeToMillis(getValue());

src/com/android/exchange/adapter/EmailSyncParser.java

diff --git a/src/com/android/exchange/adapter/EmailSyncParser.java b/src/com/android/exchange/adapter/EmailSyncParser.java
index 2d5272b..e780903 100644
--- a/src/com/android/exchange/adapter/EmailSyncParser.java
+++ b/src/com/android/exchange/adapter/EmailSyncParser.java
@@ -138,20 +138,20 @@
                     attachmentsParser(atts, msg);
                     break;
                 case Tags.EMAIL_TO:
-                    msg.mTo = Address.pack(Address.parse(getValue()));
+                    msg.mTo = Address.toString(Address.parse(getValue()));
                     break;
                 case Tags.EMAIL_FROM:
                     Address[] froms = Address.parse(getValue());
                     if (froms != null && froms.length > 0) {
                         msg.mDisplayName = froms[0].toFriendly();
                     }
-                    msg.mFrom = Address.pack(froms);
+                    msg.mFrom = Address.toString(froms);
                     break;
                 case Tags.EMAIL_CC:
-                    msg.mCc = Address.pack(Address.parse(getValue()));
+                    msg.mCc = Address.toString(Address.parse(getValue()));
                     break;
                 case Tags.EMAIL_REPLY_TO:
-                    msg.mReplyTo = Address.pack(Address.parse(getValue()));
+                    msg.mReplyTo = Address.toString(Address.parse(getValue()));
                     break;
                 case Tags.EMAIL_DATE_RECEIVED:
                     msg.mTimeStamp = Utility.parseEmailDateTimeToMillis(getValue());