commit 821e578a71c7015646522e729600618f0ec16fc0
author Tony Mantler <nicoya@google.com> Mon Jan 06 15:33:43 2014 -0800
committer Tony Mantler <nicoya@google.com> Wed Jan 08 11:16:07 2014 -0800
tree 746f1782889b4fb07b53de8345267c3fa1e8a585
parent 55820dbe438d6c6a8ac1efaf23e3af20a6dd5020

Deduplicate Address class

Change-Id: I4f6df51f5641475ffaf96b0189ccc00748880cc0

src/com/android/mail/compose/ComposeActivity.java

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 0b714a5..c507161 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -72,6 +72,7 @@
 
 import com.android.common.Rfc822Validator;
 import com.android.common.contacts.DataUsageStatUpdater;
+import com.android.emailcommon.mail.Address;
 import com.android.ex.chips.RecipientEditTextView;
 import com.android.mail.MailIntentService;
 import com.android.mail.R;
@@ -82,7 +83,6 @@
 import com.android.mail.compose.FromAddressSpinner.OnAccountChangedListener;
 import com.android.mail.compose.QuotedTextView.RespondInlineListener;
 import com.android.mail.providers.Account;
-import com.android.mail.providers.Address;
 import com.android.mail.providers.Attachment;
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.MailAppProvider;
@@ -950,7 +950,7 @@
                 : mAccount != null ? mAccount.getEmailAddress() : null;
         final String senderName = selectedReplyFromAccount != null ? selectedReplyFromAccount.name
                 : mAccount != null ? mAccount.getSenderName() : null;
-        final Address address = new Address(senderName, email);
+        final Address address = new Address(email, senderName);
         message.setFrom(address.toHeader());
         message.draftType = getDraftType(mode);
         return message;