commit 38a95ca591ad56749fa24b574b5c876131f8afc3
author Yu Ping Hu <yph@google.com> Tue Mar 18 01:00:32 2014 +0000
committer Yu Ping Hu <yph@google.com> Tue Mar 18 01:00:32 2014 +0000
tree ea6fe675f7304a7b2d17bb297c7b65d2fe301f9b
parent 00249573d7bbbd901e7185915c31bbacb342a4ce

Revert "Email addresses should be decoded as they arrive from Exchange"

This reverts commit 00249573d7bbbd901e7185915c31bbacb342a4ce.

Decision was made to defer this fix until after MR2.

Change-Id: If71eb9cf254ea84a83026647f87ddb46b61ee45d

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 bee33a2..26e56ff 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.toString(Address.parse(getValue()));
+                        msg.mTo = Address.pack(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.toString(froms);
+                        msg.mFrom = Address.pack(froms);
                         break;
                     case Tags.EMAIL_CC:
-                        msg.mCc = Address.toString(Address.parse(getValue()));
+                        msg.mCc = Address.pack(Address.parse(getValue()));
                         break;
                     case Tags.EMAIL_REPLY_TO:
-                        msg.mReplyTo = Address.toString(Address.parse(getValue()));
+                        msg.mReplyTo = Address.pack(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 e780903..2d5272b 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.toString(Address.parse(getValue()));
+                    msg.mTo = Address.pack(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.toString(froms);
+                    msg.mFrom = Address.pack(froms);
                     break;
                 case Tags.EMAIL_CC:
-                    msg.mCc = Address.toString(Address.parse(getValue()));
+                    msg.mCc = Address.pack(Address.parse(getValue()));
                     break;
                 case Tags.EMAIL_REPLY_TO:
-                    msg.mReplyTo = Address.toString(Address.parse(getValue()));
+                    msg.mReplyTo = Address.pack(Address.parse(getValue()));
                     break;
                 case Tags.EMAIL_DATE_RECEIVED:
                     msg.mTimeStamp = Utility.parseEmailDateTimeToMillis(getValue());