Eliminate redundant methods in Address class

THIS DOES NOT CHANGE ANY EXISTING FUNCTIONALITY.

Address.pack() has been removed and all calls replaced with its synonym Address.toHeader().
Address.unpack() has been renamed to Address.fromHeader() to follow the new naming convention.

In days of yore, pack() and toHeader() used to do different things. Now they are identical and
thus one is superfluous. We have standardized on toHeader() and fromHeader().

Change-Id: Iac91c966eb6c1477f8dba0dd2ae01c84b359e539

2 files changed, 12 insertions, 12 deletions

diff --git a/tests/src/com/android/email/LegacyConversionsTests.java b/tests/src/com/android/email/LegacyConversionsTests.java
index dcf49a53a..89e04a5b9 100644
--- a/tests/src/com/android/email/LegacyConversionsTests.java
+++ b/tests/src/com/android/email/LegacyConversionsTests.java
@@ -504,11 +504,11 @@ public class LegacyConversionsTests extends ProviderTestCase2<EmailProvider> {
             throws MessagingException {
         assertEquals(tag, expect.getUid(), actual.mServerId);
         assertEquals(tag, expect.getSubject(), actual.mSubject);
-        assertEquals(tag, Address.pack(expect.getFrom()), actual.mFrom);
+        assertEquals(tag, Address.toHeader(expect.getFrom()), actual.mFrom);
         assertEquals(tag, expect.getSentDate().getTime(), actual.mTimeStamp);
-        assertEquals(tag, Address.pack(expect.getRecipients(RecipientType.TO)), actual.mTo);
-        assertEquals(tag, Address.pack(expect.getRecipients(RecipientType.CC)), actual.mCc);
-        assertEquals(tag, ((MimeMessage)expect).getMessageId(), actual.mMessageId);
+        assertEquals(tag, Address.toHeader(expect.getRecipients(RecipientType.TO)), actual.mTo);
+        assertEquals(tag, Address.toHeader(expect.getRecipients(RecipientType.CC)), actual.mCc);
+        assertEquals(tag, expect.getMessageId(), actual.mMessageId);
         assertEquals(tag, expect.isSet(Flag.SEEN), actual.mFlagRead);
         assertEquals(tag, expect.isSet(Flag.FLAGGED), actual.mFlagFavorite);
     }
@@ -521,13 +521,13 @@ public class LegacyConversionsTests extends ProviderTestCase2<EmailProvider> {
         assertEquals(tag, expect.mServerId, actual.getUid());
         assertEquals(tag, expect.mServerTimeStamp, actual.getInternalDate().getTime());
         assertEquals(tag, expect.mSubject, actual.getSubject());
-        assertEquals(tag, expect.mFrom, Address.pack(actual.getFrom()));
+        assertEquals(tag, expect.mFrom, Address.toHeader(actual.getFrom()));
         assertEquals(tag, expect.mTimeStamp, actual.getSentDate().getTime());
-        assertEquals(tag, expect.mTo, Address.pack(actual.getRecipients(RecipientType.TO)));
-        assertEquals(tag, expect.mCc, Address.pack(actual.getRecipients(RecipientType.CC)));
-        assertEquals(tag, expect.mBcc, Address.pack(actual.getRecipients(RecipientType.BCC)));
-        assertEquals(tag, expect.mReplyTo, Address.pack(actual.getReplyTo()));
-        assertEquals(tag, expect.mMessageId, ((MimeMessage)actual).getMessageId());
+        assertEquals(tag, expect.mTo, Address.toHeader(actual.getRecipients(RecipientType.TO)));
+        assertEquals(tag, expect.mCc, Address.toHeader(actual.getRecipients(RecipientType.CC)));
+        assertEquals(tag, expect.mBcc, Address.toHeader(actual.getRecipients(RecipientType.BCC)));
+        assertEquals(tag, expect.mReplyTo, Address.toHeader(actual.getReplyTo()));
+        assertEquals(tag, expect.mMessageId, actual.getMessageId());
         // check flags
         assertEquals(tag, expect.mFlagRead, actual.isSet(Flag.SEEN));
         assertEquals(tag, expect.mFlagFavorite, actual.isSet(Flag.FLAGGED));
diff --git a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
index 8f9a450cf..5c397f70a 100644
--- a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
+++ b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
@@ -166,8 +166,8 @@ public class SmtpSenderUnitTests extends AndroidTestCase {
     private Message setupSimpleMessage() {
         Message message = new Message();
         message.mTimeStamp = System.currentTimeMillis();
-        message.mFrom = Address.parseAndPack("Jones@Registry.Org");
-        message.mTo = Address.parseAndPack("Smith@Registry.Org");
+        message.mFrom = Address.parseToHeader("Jones@Registry.Org");
+        message.mTo = Address.parseToHeader("Smith@Registry.Org");
         message.mMessageId = "1234567890";
         return message;
     }