diff --git a/src/com/android/email/AttachmentInfo.java b/src/com/android/email/AttachmentInfo.java index b8d4efe03..ec41ddcaa 100644 --- a/src/com/android/email/AttachmentInfo.java +++ b/src/com/android/email/AttachmentInfo.java @@ -16,8 +16,8 @@ package com.android.email; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent.Attachment; +import com.android.emailcommon.internet.MimeUtility; import com.android.emailcommon.utility.AttachmentUtilities; import android.content.Context; diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java index f448c8679..eeb1e3cce 100644 --- a/src/com/android/email/Controller.java +++ b/src/com/android/email/Controller.java @@ -16,10 +16,7 @@ package com.android.email; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.MessagingException; import com.android.email.mail.Store; -import com.android.email.mail.Folder.MessageRetrievalListener; import com.android.email.mail.store.Pop3Store.Pop3Message; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; @@ -30,6 +27,9 @@ import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; import com.android.emailcommon.Api; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Folder.MessageRetrievalListener; import com.android.emailcommon.service.EmailServiceStatus; import com.android.emailcommon.service.IEmailService; import com.android.emailcommon.service.IEmailServiceCallback; @@ -1181,7 +1181,7 @@ public class Controller { } @Override - public void messageRetrieved(com.android.email.mail.Message message) { + public void messageRetrieved(com.android.emailcommon.mail.Message message) { } } diff --git a/src/com/android/email/ControllerResultUiThreadWrapper.java b/src/com/android/email/ControllerResultUiThreadWrapper.java index e196059a4..1f1bf25c6 100644 --- a/src/com/android/email/ControllerResultUiThreadWrapper.java +++ b/src/com/android/email/ControllerResultUiThreadWrapper.java @@ -17,7 +17,7 @@ package com.android.email; import com.android.email.Controller.Result; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.MessagingException; import android.os.Handler; diff --git a/src/com/android/email/EmailAddressValidator.java b/src/com/android/email/EmailAddressValidator.java index eca6faf28..a9f82bc21 100644 --- a/src/com/android/email/EmailAddressValidator.java +++ b/src/com/android/email/EmailAddressValidator.java @@ -16,7 +16,7 @@ package com.android.email; -import com.android.email.mail.Address; +import com.android.emailcommon.mail.Address; import android.widget.AutoCompleteTextView.Validator; diff --git a/src/com/android/email/GroupMessagingListener.java b/src/com/android/email/GroupMessagingListener.java index 53694a136..06d162147 100644 --- a/src/com/android/email/GroupMessagingListener.java +++ b/src/com/android/email/GroupMessagingListener.java @@ -16,7 +16,7 @@ package com.android.email; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; diff --git a/src/com/android/email/LegacyConversions.java b/src/com/android/email/LegacyConversions.java index f1a04e98b..0fa52e006 100644 --- a/src/com/android/email/LegacyConversions.java +++ b/src/com/android/email/LegacyConversions.java @@ -16,22 +16,22 @@ package com.android.email; -import com.android.email.mail.Address; -import com.android.email.mail.Flag; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.Message.RecipientType; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.mail.internet.MimeMultipart; -import com.android.email.mail.internet.MimeUtility; -import com.android.email.mail.internet.TextBody; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.AttachmentColumns; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeMultipart; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.internet.TextBody; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.Message.RecipientType; import com.android.emailcommon.utility.AttachmentUtilities; import org.apache.commons.io.IOUtils; diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java index edabd53a4..a147769d0 100644 --- a/src/com/android/email/MessagingController.java +++ b/src/com/android/email/MessagingController.java @@ -16,23 +16,9 @@ package com.android.email; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.FetchProfile; -import com.android.email.mail.Flag; -import com.android.email.mail.Folder; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; import com.android.email.mail.Sender; import com.android.email.mail.Store; import com.android.email.mail.StoreSynchronizer; -import com.android.email.mail.Folder.FolderType; -import com.android.email.mail.Folder.MessageRetrievalListener; -import com.android.email.mail.Folder.OpenMode; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeMultipart; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.AttachmentColumns; @@ -40,6 +26,20 @@ import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.SyncColumns; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMultipart; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.Folder.FolderType; +import com.android.emailcommon.mail.Folder.MessageRetrievalListener; +import com.android.emailcommon.mail.Folder.OpenMode; import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.ConversionUtilities; diff --git a/src/com/android/email/MessagingListener.java b/src/com/android/email/MessagingListener.java index 535c32dab..8b5573f7d 100644 --- a/src/com/android/email/MessagingListener.java +++ b/src/com/android/email/MessagingListener.java @@ -16,7 +16,7 @@ package com.android.email; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java index 5330a8978..3138d0350 100644 --- a/src/com/android/email/NotificationController.java +++ b/src/com/android/email/NotificationController.java @@ -19,11 +19,11 @@ package com.android.email; import com.android.email.activity.ContactStatusLoader; import com.android.email.activity.Welcome; import com.android.email.activity.setup.AccountSettingsXL; -import com.android.email.mail.Address; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.Address; import android.app.Notification; import android.app.Notification.Builder; diff --git a/src/com/android/email/RefreshManager.java b/src/com/android/email/RefreshManager.java index d272e67d4..1541c6392 100644 --- a/src/com/android/email/RefreshManager.java +++ b/src/com/android/email/RefreshManager.java @@ -16,7 +16,7 @@ package com.android.email; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.os.Handler; diff --git a/src/com/android/email/activity/AccountFolderList.java b/src/com/android/email/activity/AccountFolderList.java index d2139e20b..640db64df 100644 --- a/src/com/android/email/activity/AccountFolderList.java +++ b/src/com/android/email/activity/AccountFolderList.java @@ -23,10 +23,10 @@ import com.android.email.NotificationController; import com.android.email.R; import com.android.email.activity.setup.AccountSettingsXL; import com.android.email.activity.setup.AccountSetupBasics; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.mail.MessagingException; import android.app.Activity; import android.app.AlertDialog; diff --git a/src/com/android/email/activity/AccountFolderListFragment.java b/src/com/android/email/activity/AccountFolderListFragment.java index 3bcff732b..59a633a7b 100644 --- a/src/com/android/email/activity/AccountFolderListFragment.java +++ b/src/com/android/email/activity/AccountFolderListFragment.java @@ -20,13 +20,13 @@ import com.android.email.Controller; import com.android.email.ControllerResultUiThreadWrapper; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; +import com.android.emailcommon.mail.MessagingException; import android.app.Activity; import android.app.ListFragment; diff --git a/src/com/android/email/activity/MailboxFinder.java b/src/com/android/email/activity/MailboxFinder.java index 7c8c6ffad..b88ed7208 100644 --- a/src/com/android/email/activity/MailboxFinder.java +++ b/src/com/android/email/activity/MailboxFinder.java @@ -20,9 +20,9 @@ import com.android.email.Controller; import com.android.email.ControllerResultUiThreadWrapper; import com.android.email.Email; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.os.AsyncTask; diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java index 24293b55e..b85b2d453 100644 --- a/src/com/android/email/activity/MailboxList.java +++ b/src/com/android/email/activity/MailboxList.java @@ -22,9 +22,9 @@ import com.android.email.Email; import com.android.email.R; import com.android.email.Utility; import com.android.email.activity.setup.AccountSettingsXL; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; +import com.android.emailcommon.mail.MessagingException; import android.app.ActionBar; import android.app.Activity; diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java index 0dc009916..7f042dece 100644 --- a/src/com/android/email/activity/MessageCompose.java +++ b/src/com/android/email/activity/MessageCompose.java @@ -22,9 +22,7 @@ import com.android.email.EmailAddressAdapter; import com.android.email.EmailAddressValidator; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.Address; import com.android.email.mail.internet.EmailHtmlUtil; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Attachment; @@ -32,6 +30,8 @@ import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.BodyColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.Address; import android.app.ActionBar; import android.app.Activity; diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java index 59fafcca4..467d06053 100644 --- a/src/com/android/email/activity/MessageList.java +++ b/src/com/android/email/activity/MessageList.java @@ -23,12 +23,12 @@ import com.android.email.R; import com.android.email.Utility; import com.android.email.activity.setup.AccountSecurity; import com.android.email.activity.setup.AccountSettingsXL; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.MailboxColumns; +import com.android.emailcommon.mail.MessagingException; import android.app.Activity; import android.content.ContentResolver; diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java index 2c4a185c8..8fdb83150 100644 --- a/src/com/android/email/activity/MessageListXL.java +++ b/src/com/android/email/activity/MessageListXL.java @@ -26,9 +26,9 @@ import com.android.email.RefreshManager; import com.android.email.Utility; import com.android.email.activity.setup.AccountSecurity; import com.android.email.activity.setup.AccountSettingsXL; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.mail.MessagingException; import android.app.ActionBar; import android.app.Activity; diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java index 1dff7b38a..f79e98235 100644 --- a/src/com/android/email/activity/MessageViewFragment.java +++ b/src/com/android/email/activity/MessageViewFragment.java @@ -19,10 +19,10 @@ package com.android.email.activity; import com.android.email.Email; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.MeetingInfo; -import com.android.email.mail.PackedString; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.MeetingInfo; +import com.android.emailcommon.mail.PackedString; import com.android.emailcommon.service.EmailServiceConstants; import android.app.Activity; diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java index 567987a5d..f1591d078 100644 --- a/src/com/android/email/activity/MessageViewFragmentBase.java +++ b/src/com/android/email/activity/MessageViewFragmentBase.java @@ -24,14 +24,14 @@ import com.android.email.Preferences; import com.android.email.R; import com.android.email.Throttle; import com.android.email.Utility; -import com.android.email.mail.Address; -import com.android.email.mail.MessagingException; import com.android.email.mail.internet.EmailHtmlUtil; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Message; import com.android.email.service.AttachmentDownloadService; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.utility.AttachmentUtilities; import org.apache.commons.io.IOUtils; diff --git a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java index 84d115a10..f0cc6d180 100644 --- a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java +++ b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java @@ -19,11 +19,11 @@ package com.android.email.activity.setup; import com.android.email.Email; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.mail.Sender; import com.android.email.mail.Store; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.HostAuth; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.PolicySet; diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java index 8b55fdb01..846b99901 100644 --- a/src/com/android/email/activity/setup/AccountSettingsFragment.java +++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java @@ -19,12 +19,12 @@ package com.android.email.activity.setup; import com.android.email.Email; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.mail.Sender; import com.android.email.mail.Store; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.HostAuth; +import com.android.emailcommon.mail.MessagingException; import android.app.Activity; import android.app.AlertDialog; diff --git a/src/com/android/email/mail/NoSuchProviderException.java b/src/com/android/email/mail/NoSuchProviderException.java index a857f40c2..c0846cdc8 100644 --- a/src/com/android/email/mail/NoSuchProviderException.java +++ b/src/com/android/email/mail/NoSuchProviderException.java @@ -16,6 +16,8 @@ package com.android.email.mail; +import com.android.emailcommon.mail.MessagingException; + public class NoSuchProviderException extends MessagingException { public static final long serialVersionUID = -1; diff --git a/src/com/android/email/mail/Sender.java b/src/com/android/email/mail/Sender.java index 6af6b7bdf..96a430bf2 100644 --- a/src/com/android/email/mail/Sender.java +++ b/src/com/android/email/mail/Sender.java @@ -18,6 +18,7 @@ package com.android.email.mail; import com.android.email.Email; import com.android.email.R; +import com.android.emailcommon.mail.MessagingException; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/email/mail/Store.java b/src/com/android/email/mail/Store.java index 2e968e106..c6d4f04ec 100644 --- a/src/com/android/email/mail/Store.java +++ b/src/com/android/email/mail/Store.java @@ -18,6 +18,8 @@ package com.android.email.mail; import com.android.email.Email; import com.android.email.R; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.MessagingException; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/com/android/email/mail/StoreSynchronizer.java b/src/com/android/email/mail/StoreSynchronizer.java index b2f12def8..fce87f010 100644 --- a/src/com/android/email/mail/StoreSynchronizer.java +++ b/src/com/android/email/mail/StoreSynchronizer.java @@ -18,6 +18,7 @@ package com.android.email.mail; import com.android.email.MessagingListener; import com.android.email.provider.EmailContent; +import com.android.emailcommon.mail.MessagingException; import com.android.email.GroupMessagingListener; import android.content.Context; diff --git a/src/com/android/email/mail/Transport.java b/src/com/android/email/mail/Transport.java index 37b485473..45ed3f4e7 100644 --- a/src/com/android/email/mail/Transport.java +++ b/src/com/android/email/mail/Transport.java @@ -16,6 +16,9 @@ package com.android.email.mail; +import com.android.emailcommon.mail.CertificateValidationException; +import com.android.emailcommon.mail.MessagingException; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/com/android/email/mail/store/ExchangeStore.java b/src/com/android/email/mail/store/ExchangeStore.java index ace052bba..df5747b28 100644 --- a/src/com/android/email/mail/store/ExchangeStore.java +++ b/src/com/android/email/mail/store/ExchangeStore.java @@ -17,10 +17,10 @@ package com.android.email.mail.store; import com.android.email.ExchangeUtils; -import com.android.email.mail.Folder; -import com.android.email.mail.MessagingException; import com.android.email.mail.Store; import com.android.email.mail.StoreSynchronizer; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.IEmailService; diff --git a/src/com/android/email/mail/store/ImapStore.java b/src/com/android/email/mail/store/ImapStore.java index ebe1d3ec0..55768550b 100644 --- a/src/com/android/email/mail/store/ImapStore.java +++ b/src/com/android/email/mail/store/ImapStore.java @@ -20,23 +20,8 @@ import com.android.email.Email; import com.android.email.Preferences; import com.android.email.Utility; import com.android.email.VendorPolicyLoader; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.Body; -import com.android.email.mail.CertificateValidationException; -import com.android.email.mail.FetchProfile; -import com.android.email.mail.Flag; -import com.android.email.mail.Folder; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; import com.android.email.mail.Store; import com.android.email.mail.Transport; -import com.android.email.mail.internet.BinaryTempFileBody; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.mail.internet.MimeMultipart; -import com.android.email.mail.internet.MimeUtility; import com.android.email.mail.store.imap.ImapConstants; import com.android.email.mail.store.imap.ImapElement; import com.android.email.mail.store.imap.ImapList; @@ -47,6 +32,21 @@ import com.android.email.mail.transport.CountingOutputStream; import com.android.email.mail.transport.DiscourseLogger; import com.android.email.mail.transport.EOLConvertingOutputStream; import com.android.email.mail.transport.MailTransport; +import com.android.emailcommon.internet.BinaryTempFileBody; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeMultipart; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.CertificateValidationException; +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; import com.android.emailcommon.service.EmailServiceProxy; import com.beetstra.jutf7.CharsetProvider; diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java index 3bd7145f5..9edcbdf57 100644 --- a/src/com/android/email/mail/store/Pop3Store.java +++ b/src/com/android/email/mail/store/Pop3Store.java @@ -18,18 +18,18 @@ package com.android.email.mail.store; import com.android.email.Email; import com.android.email.Utility; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.FetchProfile; -import com.android.email.mail.Flag; -import com.android.email.mail.Folder; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; import com.android.email.mail.Store; import com.android.email.mail.Transport; -import com.android.email.mail.Folder.OpenMode; -import com.android.email.mail.internet.MimeMessage; import com.android.email.mail.transport.LoggingInputStream; import com.android.email.mail.transport.MailTransport; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Folder.OpenMode; import com.android.emailcommon.service.EmailServiceProxy; import android.content.Context; diff --git a/src/com/android/email/mail/store/imap/ImapResponseParser.java b/src/com/android/email/mail/store/imap/ImapResponseParser.java index 1ae0ff24d..bbb3748b1 100644 --- a/src/com/android/email/mail/store/imap/ImapResponseParser.java +++ b/src/com/android/email/mail/store/imap/ImapResponseParser.java @@ -19,9 +19,9 @@ package com.android.email.mail.store.imap; import com.android.email.Email; import com.android.email.FixedLengthInputStream; import com.android.email.PeekableInputStream; -import com.android.email.mail.MessagingException; import com.android.email.mail.transport.DiscourseLogger; import com.android.email.mail.transport.LoggingInputStream; +import com.android.emailcommon.mail.MessagingException; import android.text.TextUtils; import android.util.Config; diff --git a/src/com/android/email/mail/transport/MailTransport.java b/src/com/android/email/mail/transport/MailTransport.java index 13241a544..da69715fe 100644 --- a/src/com/android/email/mail/transport/MailTransport.java +++ b/src/com/android/email/mail/transport/MailTransport.java @@ -17,9 +17,9 @@ package com.android.email.mail.transport; import com.android.email.Email; -import com.android.email.mail.CertificateValidationException; -import com.android.email.mail.MessagingException; import com.android.email.mail.Transport; +import com.android.emailcommon.mail.CertificateValidationException; +import com.android.emailcommon.mail.MessagingException; import android.util.Config; import android.util.Log; diff --git a/src/com/android/email/mail/transport/Rfc822Output.java b/src/com/android/email/mail/transport/Rfc822Output.java index 22974edd8..325aded38 100644 --- a/src/com/android/email/mail/transport/Rfc822Output.java +++ b/src/com/android/email/mail/transport/Rfc822Output.java @@ -16,12 +16,12 @@ package com.android.email.mail.transport; -import com.android.email.mail.Address; -import com.android.email.mail.MessagingException; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MessagingException; import org.apache.commons.io.IOUtils; diff --git a/src/com/android/email/mail/transport/SmtpSender.java b/src/com/android/email/mail/transport/SmtpSender.java index e030faffe..26feb5aea 100644 --- a/src/com/android/email/mail/transport/SmtpSender.java +++ b/src/com/android/email/mail/transport/SmtpSender.java @@ -17,13 +17,13 @@ package com.android.email.mail.transport; import com.android.email.Email; -import com.android.email.mail.Address; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.CertificateValidationException; -import com.android.email.mail.MessagingException; import com.android.email.mail.Sender; import com.android.email.mail.Transport; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.CertificateValidationException; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.util.Config; diff --git a/src/com/android/email/provider/AttachmentProvider.java b/src/com/android/email/provider/AttachmentProvider.java index e496755a0..2787f6470 100644 --- a/src/com/android/email/provider/AttachmentProvider.java +++ b/src/com/android/email/provider/AttachmentProvider.java @@ -17,9 +17,9 @@ package com.android.email.provider; import com.android.email.Email; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.AttachmentColumns; +import com.android.emailcommon.internet.MimeUtility; import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.AttachmentUtilities.Columns; diff --git a/src/com/android/email/provider/EmailContent.java b/src/com/android/email/provider/EmailContent.java index 2f75c1b8d..37104c1e2 100644 --- a/src/com/android/email/provider/EmailContent.java +++ b/src/com/android/email/provider/EmailContent.java @@ -16,8 +16,8 @@ package com.android.email.provider; -import com.android.email.Snippet; import com.android.email.Utility; +import com.android.emailcommon.mail.Snippet; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; diff --git a/src/com/android/email/service/MailService.java b/src/com/android/email/service/MailService.java index daf4a3bde..4a5a78408 100644 --- a/src/com/android/email/service/MailService.java +++ b/src/com/android/email/service/MailService.java @@ -24,13 +24,13 @@ import com.android.email.Preferences; import com.android.email.SecurityPolicy; import com.android.email.SingleRunningTask; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.utility.AccountReconciler; import android.accounts.AccountManager; diff --git a/src/com/android/email/mail/internet/BinaryTempFileBody.java b/src/com/android/emailcommon/internet/BinaryTempFileBody.java similarity index 95% rename from src/com/android/email/mail/internet/BinaryTempFileBody.java rename to src/com/android/emailcommon/internet/BinaryTempFileBody.java index ee065fd3b..8c2f0b64c 100644 --- a/src/com/android/email/mail/internet/BinaryTempFileBody.java +++ b/src/com/android/emailcommon/internet/BinaryTempFileBody.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; import com.android.email.Email; -import com.android.email.mail.Body; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.MessagingException; import org.apache.commons.io.IOUtils; diff --git a/src/com/android/email/mail/internet/MimeBodyPart.java b/src/com/android/emailcommon/internet/MimeBodyPart.java similarity index 93% rename from src/com/android/email/mail/internet/MimeBodyPart.java rename to src/com/android/emailcommon/internet/MimeBodyPart.java index 67c2077a7..01efd554f 100644 --- a/src/com/android/email/mail/internet/MimeBodyPart.java +++ b/src/com/android/emailcommon/internet/MimeBodyPart.java @@ -14,7 +14,11 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; + +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.MessagingException; import java.io.BufferedWriter; import java.io.IOException; @@ -22,10 +26,6 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.regex.Pattern; -import com.android.email.mail.Body; -import com.android.email.mail.BodyPart; -import com.android.email.mail.MessagingException; - /** * TODO this is a close approximation of Message, need to update along with * Message. @@ -82,8 +82,9 @@ public class MimeBodyPart extends BodyPart { public void setBody(Body body) throws MessagingException { this.mBody = body; - if (body instanceof com.android.email.mail.Multipart) { - com.android.email.mail.Multipart multipart = ((com.android.email.mail.Multipart)body); + if (body instanceof com.android.emailcommon.mail.Multipart) { + com.android.emailcommon.mail.Multipart multipart = + ((com.android.emailcommon.mail.Multipart)body); multipart.setParent(this); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); } diff --git a/src/com/android/email/mail/internet/MimeHeader.java b/src/com/android/emailcommon/internet/MimeHeader.java similarity index 98% rename from src/com/android/email/mail/internet/MimeHeader.java rename to src/com/android/emailcommon/internet/MimeHeader.java index e37dd2c9c..40c529db3 100644 --- a/src/com/android/email/mail/internet/MimeHeader.java +++ b/src/com/android/emailcommon/internet/MimeHeader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; import com.android.email.Utility; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.MessagingException; import java.io.BufferedWriter; import java.io.IOException; diff --git a/src/com/android/email/mail/internet/MimeMessage.java b/src/com/android/emailcommon/internet/MimeMessage.java similarity index 97% rename from src/com/android/email/mail/internet/MimeMessage.java rename to src/com/android/emailcommon/internet/MimeMessage.java index dfa55b6a5..412092da4 100644 --- a/src/com/android/email/mail/internet/MimeMessage.java +++ b/src/com/android/emailcommon/internet/MimeMessage.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; -import com.android.email.mail.Address; -import com.android.email.mail.Body; -import com.android.email.mail.BodyPart; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Multipart; +import com.android.emailcommon.mail.Part; import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.ContentHandler; @@ -367,8 +368,8 @@ public class MimeMessage extends Message { @Override public void setBody(Body body) throws MessagingException { this.mBody = body; - if (body instanceof com.android.email.mail.Multipart) { - com.android.email.mail.Multipart multipart = ((com.android.email.mail.Multipart)body); + if (body instanceof Multipart) { + Multipart multipart = ((Multipart)body); multipart.setParent(this); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); setHeader("MIME-Version", "1.0"); diff --git a/src/com/android/email/mail/internet/MimeMultipart.java b/src/com/android/emailcommon/internet/MimeMultipart.java similarity index 93% rename from src/com/android/email/mail/internet/MimeMultipart.java rename to src/com/android/emailcommon/internet/MimeMultipart.java index 3673e0978..e6977ee4f 100644 --- a/src/com/android/email/mail/internet/MimeMultipart.java +++ b/src/com/android/emailcommon/internet/MimeMultipart.java @@ -14,7 +14,11 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; + +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Multipart; import java.io.BufferedWriter; import java.io.IOException; @@ -22,10 +26,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; -import com.android.email.mail.BodyPart; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Multipart; - public class MimeMultipart extends Multipart { protected String mPreamble; @@ -90,7 +90,7 @@ public class MimeMultipart extends Multipart { } for (int i = 0, count = mParts.size(); i < count; i++) { - BodyPart bodyPart = (BodyPart)mParts.get(i); + BodyPart bodyPart = mParts.get(i); writer.write("--" + mBoundary + "\r\n"); writer.flush(); bodyPart.writeTo(out); diff --git a/src/com/android/email/mail/internet/MimeUtility.java b/src/com/android/emailcommon/internet/MimeUtility.java similarity index 98% rename from src/com/android/email/mail/internet/MimeUtility.java rename to src/com/android/emailcommon/internet/MimeUtility.java index 65bb3a798..23dc23ae1 100644 --- a/src/com/android/email/mail/internet/MimeUtility.java +++ b/src/com/android/emailcommon/internet/MimeUtility.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; import com.android.email.Email; -import com.android.email.mail.Body; -import com.android.email.mail.BodyPart; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Multipart; -import com.android.email.mail.Part; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Multipart; +import com.android.emailcommon.mail.Part; import org.apache.commons.io.IOUtils; import org.apache.james.mime4j.codec.EncoderUtil; diff --git a/src/com/android/email/mail/internet/TextBody.java b/src/com/android/emailcommon/internet/TextBody.java similarity index 92% rename from src/com/android/email/mail/internet/TextBody.java rename to src/com/android/emailcommon/internet/TextBody.java index bf6ea8160..09c265c8e 100644 --- a/src/com/android/email/mail/internet/TextBody.java +++ b/src/com/android/emailcommon/internet/TextBody.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; -import com.android.email.mail.Body; -import com.android.email.mail.MessagingException; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.MessagingException; import android.util.Base64; diff --git a/src/com/android/email/mail/Address.java b/src/com/android/emailcommon/mail/Address.java similarity index 99% rename from src/com/android/email/mail/Address.java rename to src/com/android/emailcommon/mail/Address.java index 7283a27f0..2d6654e3c 100644 --- a/src/com/android/email/mail/Address.java +++ b/src/com/android/emailcommon/mail/Address.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import com.android.email.Utility; diff --git a/src/com/android/email/mail/AuthenticationFailedException.java b/src/com/android/emailcommon/mail/AuthenticationFailedException.java similarity index 97% rename from src/com/android/email/mail/AuthenticationFailedException.java rename to src/com/android/emailcommon/mail/AuthenticationFailedException.java index 7a767657f..18a3b8f51 100644 --- a/src/com/android/email/mail/AuthenticationFailedException.java +++ b/src/com/android/emailcommon/mail/AuthenticationFailedException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import com.android.email.R; diff --git a/src/com/android/email/mail/Body.java b/src/com/android/emailcommon/mail/Body.java similarity index 95% rename from src/com/android/email/mail/Body.java rename to src/com/android/emailcommon/mail/Body.java index a8f27424e..841ab42a7 100644 --- a/src/com/android/email/mail/Body.java +++ b/src/com/android/emailcommon/mail/Body.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/android/email/mail/BodyPart.java b/src/com/android/emailcommon/mail/BodyPart.java similarity index 92% rename from src/com/android/email/mail/BodyPart.java rename to src/com/android/emailcommon/mail/BodyPart.java index c650c74ef..f698a139d 100644 --- a/src/com/android/email/mail/BodyPart.java +++ b/src/com/android/emailcommon/mail/BodyPart.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; public abstract class BodyPart implements Part { protected Multipart mParent; diff --git a/src/com/android/email/mail/CertificateValidationException.java b/src/com/android/emailcommon/mail/CertificateValidationException.java similarity index 96% rename from src/com/android/email/mail/CertificateValidationException.java rename to src/com/android/emailcommon/mail/CertificateValidationException.java index 6f8fa85fe..ac6811f7b 100644 --- a/src/com/android/email/mail/CertificateValidationException.java +++ b/src/com/android/emailcommon/mail/CertificateValidationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import com.android.email.R; diff --git a/src/com/android/email/mail/FetchProfile.java b/src/com/android/emailcommon/mail/FetchProfile.java similarity index 96% rename from src/com/android/email/mail/FetchProfile.java rename to src/com/android/emailcommon/mail/FetchProfile.java index c25604734..bfa48d30f 100644 --- a/src/com/android/email/mail/FetchProfile.java +++ b/src/com/android/emailcommon/mail/FetchProfile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.util.ArrayList; diff --git a/src/com/android/email/mail/Fetchable.java b/src/com/android/emailcommon/mail/Fetchable.java similarity index 95% rename from src/com/android/email/mail/Fetchable.java rename to src/com/android/emailcommon/mail/Fetchable.java index a3b5465a5..4314f93f5 100644 --- a/src/com/android/email/mail/Fetchable.java +++ b/src/com/android/emailcommon/mail/Fetchable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; /** * Interface for classes that can be added to {@link FetchProfile}. diff --git a/src/com/android/email/mail/Flag.java b/src/com/android/emailcommon/mail/Flag.java similarity index 98% rename from src/com/android/email/mail/Flag.java rename to src/com/android/emailcommon/mail/Flag.java index 4a46aa290..bcdcb8b7e 100644 --- a/src/com/android/email/mail/Flag.java +++ b/src/com/android/emailcommon/mail/Flag.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; /** * Flags that can be applied to Messages. diff --git a/src/com/android/email/mail/Folder.java b/src/com/android/emailcommon/mail/Folder.java similarity index 99% rename from src/com/android/email/mail/Folder.java rename to src/com/android/emailcommon/mail/Folder.java index 6081e10e7..ea7fc5984 100644 --- a/src/com/android/email/mail/Folder.java +++ b/src/com/android/emailcommon/mail/Folder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; public abstract class Folder { diff --git a/src/com/android/email/mail/MeetingInfo.java b/src/com/android/emailcommon/mail/MeetingInfo.java similarity index 96% rename from src/com/android/email/mail/MeetingInfo.java rename to src/com/android/emailcommon/mail/MeetingInfo.java index f7ae56372..1489a5597 100644 --- a/src/com/android/email/mail/MeetingInfo.java +++ b/src/com/android/emailcommon/mail/MeetingInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; public class MeetingInfo { // Predefined tags; others can be added diff --git a/src/com/android/email/mail/Message.java b/src/com/android/emailcommon/mail/Message.java similarity index 99% rename from src/com/android/email/mail/Message.java rename to src/com/android/emailcommon/mail/Message.java index 2c610c61e..09aef87d1 100644 --- a/src/com/android/email/mail/Message.java +++ b/src/com/android/emailcommon/mail/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.util.Date; import java.util.HashSet; diff --git a/src/com/android/email/mail/MessageDateComparator.java b/src/com/android/emailcommon/mail/MessageDateComparator.java similarity index 96% rename from src/com/android/email/mail/MessageDateComparator.java rename to src/com/android/emailcommon/mail/MessageDateComparator.java index df7d93bb6..0b1a55115 100644 --- a/src/com/android/email/mail/MessageDateComparator.java +++ b/src/com/android/emailcommon/mail/MessageDateComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.util.Comparator; diff --git a/src/com/android/email/mail/MessagingException.java b/src/com/android/emailcommon/mail/MessagingException.java similarity index 99% rename from src/com/android/email/mail/MessagingException.java rename to src/com/android/emailcommon/mail/MessagingException.java index cdf0cf0ff..c538801a5 100644 --- a/src/com/android/email/mail/MessagingException.java +++ b/src/com/android/emailcommon/mail/MessagingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import com.android.email.R; diff --git a/src/com/android/email/mail/Multipart.java b/src/com/android/emailcommon/mail/Multipart.java similarity index 94% rename from src/com/android/email/mail/Multipart.java rename to src/com/android/emailcommon/mail/Multipart.java index fa9a2c88d..4a1a06714 100644 --- a/src/com/android/email/mail/Multipart.java +++ b/src/com/android/emailcommon/mail/Multipart.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.util.ArrayList; diff --git a/src/com/android/email/mail/PackedString.java b/src/com/android/emailcommon/mail/PackedString.java similarity index 99% rename from src/com/android/email/mail/PackedString.java rename to src/com/android/emailcommon/mail/PackedString.java index c36182a7f..de5fe4692 100644 --- a/src/com/android/email/mail/PackedString.java +++ b/src/com/android/emailcommon/mail/PackedString.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/email/mail/Part.java b/src/com/android/emailcommon/mail/Part.java similarity index 97% rename from src/com/android/email/mail/Part.java rename to src/com/android/emailcommon/mail/Part.java index 683d79784..eeb233ca9 100644 --- a/src/com/android/email/mail/Part.java +++ b/src/com/android/emailcommon/mail/Part.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/android/email/Snippet.java b/src/com/android/emailcommon/mail/Snippet.java similarity index 99% rename from src/com/android/email/Snippet.java rename to src/com/android/emailcommon/mail/Snippet.java index 6d52b347f..38f982e5d 100644 --- a/src/com/android/email/Snippet.java +++ b/src/com/android/emailcommon/mail/Snippet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email; +package com.android.emailcommon.mail; import android.text.TextUtils; diff --git a/src/com/android/emailcommon/service/EmailServiceProxy.java b/src/com/android/emailcommon/service/EmailServiceProxy.java index af2ceff81..1235d7f51 100644 --- a/src/com/android/emailcommon/service/EmailServiceProxy.java +++ b/src/com/android/emailcommon/service/EmailServiceProxy.java @@ -16,9 +16,9 @@ package com.android.emailcommon.service; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.HostAuth; import com.android.emailcommon.Api; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.content.Intent; diff --git a/src/com/android/emailcommon/utility/ConversionUtilities.java b/src/com/android/emailcommon/utility/ConversionUtilities.java index 722175149..3da5b64b6 100644 --- a/src/com/android/emailcommon/utility/ConversionUtilities.java +++ b/src/com/android/emailcommon/utility/ConversionUtilities.java @@ -16,12 +16,12 @@ package com.android.emailcommon.utility; -import com.android.email.Snippet; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.Snippet; import android.text.TextUtils; diff --git a/src/com/android/exchange/AbstractSyncService.java b/src/com/android/exchange/AbstractSyncService.java index 586baf7b2..d834f8e68 100644 --- a/src/com/android/exchange/AbstractSyncService.java +++ b/src/com/android/exchange/AbstractSyncService.java @@ -17,9 +17,9 @@ package com.android.exchange; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; +import com.android.emailcommon.mail.MessagingException; import com.android.exchange.utility.FileLogger; import android.content.Context; diff --git a/src/com/android/exchange/EasOutboxService.java b/src/com/android/exchange/EasOutboxService.java index d0392b492..a63b7fa89 100644 --- a/src/com/android/exchange/EasOutboxService.java +++ b/src/com/android/exchange/EasOutboxService.java @@ -18,7 +18,6 @@ package com.android.exchange; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.mail.transport.Rfc822Output; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Body; @@ -28,6 +27,7 @@ import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.SyncColumns; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.service.EmailServiceStatus; import org.apache.http.HttpResponse; diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java index e1254a5e3..b22873565 100644 --- a/src/com/android/exchange/EasSyncService.java +++ b/src/com/android/exchange/EasSyncService.java @@ -18,10 +18,6 @@ package com.android.exchange; import com.android.email.Utility; -import com.android.email.mail.Address; -import com.android.email.mail.MeetingInfo; -import com.android.email.mail.MessagingException; -import com.android.email.mail.PackedString; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.Attachment; @@ -32,6 +28,10 @@ import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.SyncColumns; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MeetingInfo; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.PackedString; import com.android.emailcommon.service.EmailServiceConstants; import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.EmailServiceStatus; diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java index b9666c1a4..2fae34964 100644 --- a/src/com/android/exchange/adapter/EmailSyncAdapter.java +++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java @@ -18,13 +18,6 @@ package com.android.exchange.adapter; import com.android.email.Utility; -import com.android.email.mail.Address; -import com.android.email.mail.MeetingInfo; -import com.android.email.mail.MessagingException; -import com.android.email.mail.PackedString; -import com.android.email.mail.Part; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.mail.internet.MimeUtility; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailContent.Account; @@ -35,6 +28,13 @@ import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.SyncColumns; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MeetingInfo; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.PackedString; +import com.android.emailcommon.mail.Part; import com.android.emailcommon.service.AccountServiceProxy; import com.android.emailcommon.service.SyncWindow; import com.android.emailcommon.utility.AttachmentUtilities; diff --git a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java index f3616cc0c..6175f0df8 100644 --- a/src/com/android/exchange/provider/ExchangeDirectoryProvider.java +++ b/src/com/android/exchange/provider/ExchangeDirectoryProvider.java @@ -19,10 +19,10 @@ package com.android.exchange.provider; import com.android.email.R; import com.android.email.Utility; import com.android.email.VendorPolicyLoader; -import com.android.email.mail.PackedString; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; +import com.android.emailcommon.mail.PackedString; import com.android.exchange.EasSyncService; import com.android.exchange.provider.GalResult.GalData; diff --git a/src/com/android/exchange/provider/GalResult.java b/src/com/android/exchange/provider/GalResult.java index e7f247736..4d0d9087f 100644 --- a/src/com/android/exchange/provider/GalResult.java +++ b/src/com/android/exchange/provider/GalResult.java @@ -15,7 +15,7 @@ package com.android.exchange.provider; -import com.android.email.mail.PackedString; +import com.android.emailcommon.mail.PackedString; import java.util.ArrayList; diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java index 27452ebac..8585776e8 100644 --- a/src/com/android/exchange/utility/CalendarUtilities.java +++ b/src/com/android/exchange/utility/CalendarUtilities.java @@ -19,12 +19,12 @@ package com.android.exchange.utility; import com.android.email.Email; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.Address; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.Address; import com.android.emailcommon.service.AccountServiceProxy; import com.android.exchange.Eas; import com.android.exchange.EasSyncService; diff --git a/tests/src/com/android/email/LegacyConversionsTests.java b/tests/src/com/android/email/LegacyConversionsTests.java index edccb5b04..09f4817b9 100644 --- a/tests/src/com/android/email/LegacyConversionsTests.java +++ b/tests/src/com/android/email/LegacyConversionsTests.java @@ -16,25 +16,25 @@ package com.android.email; -import com.android.email.mail.Address; -import com.android.email.mail.BodyPart; -import com.android.email.mail.Flag; -import com.android.email.mail.Message; -import com.android.email.mail.MessageTestUtils; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.Message.RecipientType; -import com.android.email.mail.MessageTestUtils.MessageBuilder; -import com.android.email.mail.MessageTestUtils.MultipartBuilder; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.mail.internet.MimeUtility; -import com.android.email.mail.internet.TextBody; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailProvider; import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.EmailContent.Attachment; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.internet.TextBody; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessageTestUtils; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.Message.RecipientType; +import com.android.emailcommon.mail.MessageTestUtils.MessageBuilder; +import com.android.emailcommon.mail.MessageTestUtils.MultipartBuilder; import com.android.emailcommon.utility.ConversionUtilities; import android.content.ContentUris; diff --git a/tests/src/com/android/email/MessagingControllerUnitTests.java b/tests/src/com/android/email/MessagingControllerUnitTests.java index f35708d05..d55d07762 100644 --- a/tests/src/com/android/email/MessagingControllerUnitTests.java +++ b/tests/src/com/android/email/MessagingControllerUnitTests.java @@ -16,8 +16,8 @@ package com.android.email; -import com.android.email.mail.MockFolder; import com.android.email.provider.EmailContent; +import com.android.emailcommon.mail.MockFolder; import android.content.ContentUris; import android.net.Uri; diff --git a/tests/src/com/android/email/RefreshManagerTest.java b/tests/src/com/android/email/RefreshManagerTest.java index 1f6f81b1f..2dda31c89 100644 --- a/tests/src/com/android/email/RefreshManagerTest.java +++ b/tests/src/com/android/email/RefreshManagerTest.java @@ -16,9 +16,9 @@ package com.android.email; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.ProviderTestUtils; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.test.InstrumentationTestCase; diff --git a/tests/src/com/android/email/activity/MailboxFinderTest.java b/tests/src/com/android/email/activity/MailboxFinderTest.java index a83622d9b..bc43db30b 100644 --- a/tests/src/com/android/email/activity/MailboxFinderTest.java +++ b/tests/src/com/android/email/activity/MailboxFinderTest.java @@ -20,11 +20,11 @@ import com.android.email.Controller; import com.android.email.DBTestHelper; import com.android.email.Email; import com.android.email.TestUtils; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.ProviderTestUtils; +import com.android.emailcommon.mail.MessagingException; import android.content.Context; import android.test.InstrumentationTestCase; diff --git a/tests/src/com/android/email/activity/MessageComposeTests.java b/tests/src/com/android/email/activity/MessageComposeTests.java index 8bf685549..3149bb6d8 100644 --- a/tests/src/com/android/email/activity/MessageComposeTests.java +++ b/tests/src/com/android/email/activity/MessageComposeTests.java @@ -20,10 +20,10 @@ import com.android.email.Email; import com.android.email.EmailAddressValidator; import com.android.email.R; import com.android.email.TestUtils; -import com.android.email.mail.Address; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MessagingException; import android.content.ContentUris; import android.content.Context; diff --git a/tests/src/com/android/email/mail/StoreTests.java b/tests/src/com/android/email/mail/StoreTests.java index 8101d4f0d..edc35c641 100644 --- a/tests/src/com/android/email/mail/StoreTests.java +++ b/tests/src/com/android/email/mail/StoreTests.java @@ -17,6 +17,7 @@ package com.android.email.mail; import com.android.email.Email; +import com.android.emailcommon.mail.MessagingException; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; diff --git a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java index a4a01ceb5..3aa91ff96 100644 --- a/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java +++ b/tests/src/com/android/email/mail/store/ImapStoreUnitTests.java @@ -20,28 +20,28 @@ import com.android.email.Email; import com.android.email.MockVendorPolicy; import com.android.email.Utility; import com.android.email.VendorPolicyLoader; -import com.android.email.mail.Address; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.Body; -import com.android.email.mail.FetchProfile; -import com.android.email.mail.Flag; -import com.android.email.mail.Folder; -import com.android.email.mail.Folder.FolderType; -import com.android.email.mail.Folder.OpenMode; -import com.android.email.mail.Message; -import com.android.email.mail.Message.RecipientType; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; import com.android.email.mail.Transport; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeMultipart; -import com.android.email.mail.internet.MimeUtility; -import com.android.email.mail.internet.TextBody; import com.android.email.mail.store.ImapStore.ImapConnection; import com.android.email.mail.store.ImapStore.ImapMessage; import com.android.email.mail.store.imap.ImapResponse; import com.android.email.mail.store.imap.ImapTestUtils; import com.android.email.mail.transport.MockTransport; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeMultipart; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.internet.TextBody; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.AuthenticationFailedException; +import com.android.emailcommon.mail.Body; +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.Folder.FolderType; +import com.android.emailcommon.mail.Folder.OpenMode; +import com.android.emailcommon.mail.Message.RecipientType; import org.apache.commons.io.IOUtils; diff --git a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java index 75714f3d1..324c4b8e2 100644 --- a/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java +++ b/tests/src/com/android/email/mail/store/Pop3StoreUnitTests.java @@ -17,18 +17,18 @@ package com.android.email.mail.store; import com.android.email.Email; -import com.android.email.mail.Address; -import com.android.email.mail.FetchProfile; -import com.android.email.mail.Flag; -import com.android.email.mail.Folder; -import com.android.email.mail.Folder.FolderType; -import com.android.email.mail.Folder.OpenMode; -import com.android.email.mail.Message; -import com.android.email.mail.Message.RecipientType; -import com.android.email.mail.MessagingException; import com.android.email.mail.Transport; -import com.android.email.mail.internet.MimeMessage; import com.android.email.mail.transport.MockTransport; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Folder.FolderType; +import com.android.emailcommon.mail.Folder.OpenMode; +import com.android.emailcommon.mail.Message.RecipientType; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/store/imap/ImapResponseParserTest.java b/tests/src/com/android/email/mail/store/imap/ImapResponseParserTest.java index 3680e77cb..3ba42e4f6 100644 --- a/tests/src/com/android/email/mail/store/imap/ImapResponseParserTest.java +++ b/tests/src/com/android/email/mail/store/imap/ImapResponseParserTest.java @@ -23,7 +23,6 @@ import static com.android.email.mail.store.imap.ImapTestUtils.createFixedLengthI import com.android.email.Email; import com.android.email.Utility; -import com.android.email.mail.MessagingException; import com.android.email.mail.store.imap.ImapMemoryLiteral; import com.android.email.mail.store.imap.ImapResponse; import com.android.email.mail.store.imap.ImapResponseParser; @@ -32,6 +31,7 @@ import com.android.email.mail.store.imap.ImapString; import com.android.email.mail.store.imap.ImapTempFileLiteral; import com.android.email.mail.store.imap.ImapResponseParser.ByeException; import com.android.email.mail.transport.DiscourseLogger; +import com.android.emailcommon.mail.MessagingException; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/transport/Rfc822OutputTests.java b/tests/src/com/android/email/mail/transport/Rfc822OutputTests.java index 537bc4aad..ba20fe027 100644 --- a/tests/src/com/android/email/mail/transport/Rfc822OutputTests.java +++ b/tests/src/com/android/email/mail/transport/Rfc822OutputTests.java @@ -17,10 +17,10 @@ package com.android.email.mail.transport; import com.android.email.R; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.MessagingException; import org.apache.james.mime4j.field.Field; import org.apache.james.mime4j.message.Body; diff --git a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java index 7878cb88f..329b779f5 100644 --- a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java +++ b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java @@ -17,13 +17,13 @@ package com.android.email.mail.transport; import com.android.email.DBTestHelper; -import com.android.email.mail.Address; -import com.android.email.mail.MessagingException; import com.android.email.mail.Transport; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailProvider; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.MessagingException; import org.apache.commons.io.IOUtils; diff --git a/tests/src/com/android/email/provider/AttachmentProviderTests.java b/tests/src/com/android/email/provider/AttachmentProviderTests.java index a7794aa3f..9e840fea4 100644 --- a/tests/src/com/android/email/provider/AttachmentProviderTests.java +++ b/tests/src/com/android/email/provider/AttachmentProviderTests.java @@ -18,11 +18,11 @@ package com.android.email.provider; import com.android.email.AttachmentInfo; import com.android.email.R; -import com.android.email.mail.MessagingException; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.utility.AttachmentUtilities; import android.content.ContentResolver; diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java index e5953d024..f441f3838 100644 --- a/tests/src/com/android/email/provider/ProviderTests.java +++ b/tests/src/com/android/email/provider/ProviderTests.java @@ -16,7 +16,6 @@ package com.android.email.provider; -import com.android.email.Snippet; import com.android.email.Utility; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.AccountColumns; @@ -29,6 +28,7 @@ import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.MessageColumns; +import com.android.emailcommon.mail.Snippet; import android.content.ContentResolver; import android.content.ContentUris; diff --git a/tests/src/com/android/email/mail/internet/MimeBodyPartTest.java b/tests/src/com/android/emailcommon/internet/MimeBodyPartTest.java similarity index 88% rename from tests/src/com/android/email/mail/internet/MimeBodyPartTest.java rename to tests/src/com/android/emailcommon/internet/MimeBodyPartTest.java index d0ba8eacb..5e125942c 100644 --- a/tests/src/com/android/email/mail/internet/MimeBodyPartTest.java +++ b/tests/src/com/android/emailcommon/internet/MimeBodyPartTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; -import com.android.email.mail.MessagingException; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.mail.MessagingException; import junit.framework.TestCase; diff --git a/tests/src/com/android/email/mail/internet/MimeHeaderUnitTests.java b/tests/src/com/android/emailcommon/internet/MimeHeaderUnitTests.java similarity index 95% rename from tests/src/com/android/email/mail/internet/MimeHeaderUnitTests.java rename to tests/src/com/android/emailcommon/internet/MimeHeaderUnitTests.java index 5d126dac5..efd06bb31 100644 --- a/tests/src/com/android/email/mail/internet/MimeHeaderUnitTests.java +++ b/tests/src/com/android/emailcommon/internet/MimeHeaderUnitTests.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; + +import com.android.emailcommon.internet.MimeHeader; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/internet/MimeMessageTest.java b/tests/src/com/android/emailcommon/internet/MimeMessageTest.java similarity index 98% rename from tests/src/com/android/email/mail/internet/MimeMessageTest.java rename to tests/src/com/android/emailcommon/internet/MimeMessageTest.java index 5ddf6980d..4c999d3b5 100644 --- a/tests/src/com/android/email/mail/internet/MimeMessageTest.java +++ b/tests/src/com/android/emailcommon/internet/MimeMessageTest.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; import com.android.email.Email; -import com.android.email.mail.Address; -import com.android.email.mail.Flag; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Message.RecipientType; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.mail.Address; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Message.RecipientType; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/internet/MimeUtilityTest.java b/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java similarity index 97% rename from tests/src/com/android/email/mail/internet/MimeUtilityTest.java rename to tests/src/com/android/emailcommon/internet/MimeUtilityTest.java index 8052a62df..b49a211b7 100644 --- a/tests/src/com/android/email/mail/internet/MimeUtilityTest.java +++ b/tests/src/com/android/emailcommon/internet/MimeUtilityTest.java @@ -14,15 +14,19 @@ * limitations under the License. */ -package com.android.email.mail.internet; +package com.android.emailcommon.internet; -import com.android.email.mail.BodyPart; -import com.android.email.mail.MessageTestUtils; -import com.android.email.mail.Message; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.MessageTestUtils.MessageBuilder; -import com.android.email.mail.MessageTestUtils.MultipartBuilder; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeUtility; +import com.android.emailcommon.internet.TextBody; +import com.android.emailcommon.mail.BodyPart; +import com.android.emailcommon.mail.Message; +import com.android.emailcommon.mail.MessageTestUtils; +import com.android.emailcommon.mail.MessagingException; +import com.android.emailcommon.mail.Part; +import com.android.emailcommon.mail.MessageTestUtils.MessageBuilder; +import com.android.emailcommon.mail.MessageTestUtils.MultipartBuilder; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/AddressUnitTests.java b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java similarity index 99% rename from tests/src/com/android/email/mail/AddressUnitTests.java rename to tests/src/com/android/emailcommon/mail/AddressUnitTests.java index 0f18d12ae..276c61823 100644 --- a/tests/src/com/android/email/mail/AddressUnitTests.java +++ b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; + +import com.android.emailcommon.mail.Address; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/FlagTests.java b/tests/src/com/android/emailcommon/mail/FlagTests.java similarity index 93% rename from tests/src/com/android/email/mail/FlagTests.java rename to tests/src/com/android/emailcommon/mail/FlagTests.java index 286978638..62daa8c57 100644 --- a/tests/src/com/android/email/mail/FlagTests.java +++ b/tests/src/com/android/emailcommon/mail/FlagTests.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; + +import com.android.emailcommon.mail.Flag; import android.test.suitebuilder.annotation.SmallTest; diff --git a/tests/src/com/android/email/mail/MessageTestUtils.java b/tests/src/com/android/emailcommon/mail/MessageTestUtils.java similarity index 96% rename from tests/src/com/android/email/mail/MessageTestUtils.java rename to tests/src/com/android/emailcommon/mail/MessageTestUtils.java index c7185a8b1..3c12c7654 100644 --- a/tests/src/com/android/email/mail/MessageTestUtils.java +++ b/tests/src/com/android/emailcommon/mail/MessageTestUtils.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; -import com.android.email.mail.internet.MimeBodyPart; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.mail.internet.MimeMultipart; -import com.android.email.mail.internet.TextBody; import com.android.email.provider.EmailContent; +import com.android.emailcommon.internet.MimeBodyPart; +import com.android.emailcommon.internet.MimeHeader; +import com.android.emailcommon.internet.MimeMessage; +import com.android.emailcommon.internet.MimeMultipart; +import com.android.emailcommon.internet.TextBody; import com.android.emailcommon.utility.AttachmentUtilities; import android.net.Uri; diff --git a/tests/src/com/android/email/mail/MockFolder.java b/tests/src/com/android/emailcommon/mail/MockFolder.java similarity index 92% rename from tests/src/com/android/email/mail/MockFolder.java rename to tests/src/com/android/emailcommon/mail/MockFolder.java index f933c4381..56cac0b54 100644 --- a/tests/src/com/android/email/mail/MockFolder.java +++ b/tests/src/com/android/emailcommon/mail/MockFolder.java @@ -14,7 +14,12 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; + +import com.android.emailcommon.mail.FetchProfile; +import com.android.emailcommon.mail.Flag; +import com.android.emailcommon.mail.Folder; +import com.android.emailcommon.mail.Message; public class MockFolder extends Folder { diff --git a/tests/src/com/android/email/mail/PackedStringTests.java b/tests/src/com/android/emailcommon/mail/PackedStringTests.java similarity index 97% rename from tests/src/com/android/email/mail/PackedStringTests.java rename to tests/src/com/android/emailcommon/mail/PackedStringTests.java index c54acc503..c2028f3ae 100644 --- a/tests/src/com/android/email/mail/PackedStringTests.java +++ b/tests/src/com/android/emailcommon/mail/PackedStringTests.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package com.android.email.mail; +package com.android.emailcommon.mail; + +import com.android.emailcommon.mail.PackedString; import junit.framework.TestCase; diff --git a/tests/src/com/android/email/SnippetTests.java b/tests/src/com/android/emailcommon/mail/SnippetTests.java similarity index 98% rename from tests/src/com/android/email/SnippetTests.java rename to tests/src/com/android/emailcommon/mail/SnippetTests.java index 60625e57d..8cee45bd1 100644 --- a/tests/src/com/android/email/SnippetTests.java +++ b/tests/src/com/android/emailcommon/mail/SnippetTests.java @@ -20,7 +20,9 @@ * You can run this entire test case with: * runtest -c com.android.email.SnippetTests email */ -package com.android.email; +package com.android.emailcommon.mail; + +import com.android.emailcommon.mail.Snippet; import android.test.AndroidTestCase; diff --git a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java index fff1ec31e..9ba9a0889 100644 --- a/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java +++ b/tests/src/com/android/exchange/provider/ExchangeDirectoryProviderTests.java @@ -16,10 +16,10 @@ package com.android.exchange.provider; -import com.android.email.mail.PackedString; import com.android.email.provider.EmailProvider; import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.EmailContent.Account; +import com.android.emailcommon.mail.PackedString; import com.android.exchange.provider.GalResult.GalData; import android.content.Context; diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java index 9011a16bc..82846cea8 100644 --- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java +++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java @@ -18,10 +18,10 @@ package com.android.exchange.utility; import com.android.email.R; import com.android.email.Utility; -import com.android.email.mail.Address; import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Message; +import com.android.emailcommon.mail.Address; import com.android.exchange.adapter.CalendarSyncAdapter; import com.android.exchange.adapter.Parser; import com.android.exchange.adapter.Serializer;