Email split, part quatre: Move along, nothing to see here

* No code was harmed, er, changed in the making of this CL
* All that's happened is that code that is needed by both Email and
  Exchange have been moved into emailcommon
* This required import changes to many files, which explains the
  length of the CL

Change-Id: I4e12455ba057a4a8054fdbd0b578c73afa411c8a
This commit is contained in:
Marc Blank 2011-02-09 18:47:43 -08:00
parent 8a57469460
commit 2193962ca2
94 changed files with 282 additions and 248 deletions

View File

@ -16,8 +16,8 @@
package com.android.email; package com.android.email;
import com.android.email.mail.internet.MimeUtility;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.emailcommon.internet.MimeUtility;
import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.AttachmentUtilities;
import android.content.Context; import android.content.Context;

View File

@ -16,10 +16,7 @@
package com.android.email; 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.Store;
import com.android.email.mail.Folder.MessageRetrievalListener;
import com.android.email.mail.store.Pop3Store.Pop3Message; import com.android.email.mail.store.Pop3Store.Pop3Message;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; 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.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.emailcommon.Api; 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.EmailServiceStatus;
import com.android.emailcommon.service.IEmailService; import com.android.emailcommon.service.IEmailService;
import com.android.emailcommon.service.IEmailServiceCallback; import com.android.emailcommon.service.IEmailServiceCallback;
@ -1181,7 +1181,7 @@ public class Controller {
} }
@Override @Override
public void messageRetrieved(com.android.email.mail.Message message) { public void messageRetrieved(com.android.emailcommon.mail.Message message) {
} }
} }

View File

@ -17,7 +17,7 @@
package com.android.email; package com.android.email;
import com.android.email.Controller.Result; import com.android.email.Controller.Result;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import android.os.Handler; import android.os.Handler;

View File

@ -16,7 +16,7 @@
package com.android.email; package com.android.email;
import com.android.email.mail.Address; import com.android.emailcommon.mail.Address;
import android.widget.AutoCompleteTextView.Validator; import android.widget.AutoCompleteTextView.Validator;

View File

@ -16,7 +16,7 @@
package com.android.email; package com.android.email;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;

View File

@ -16,22 +16,22 @@
package com.android.email; 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;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.AttachmentColumns; import com.android.email.provider.EmailContent.AttachmentColumns;
import com.android.email.provider.EmailContent.Mailbox; 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 com.android.emailcommon.utility.AttachmentUtilities;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;

View File

@ -16,23 +16,9 @@
package com.android.email; 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.Sender;
import com.android.email.mail.Store; import com.android.email.mail.Store;
import com.android.email.mail.StoreSynchronizer; 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;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.AttachmentColumns; 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.MailboxColumns;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.email.provider.EmailContent.SyncColumns; 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.AttachmentUtilities;
import com.android.emailcommon.utility.ConversionUtilities; import com.android.emailcommon.utility.ConversionUtilities;

View File

@ -16,7 +16,7 @@
package com.android.email; package com.android.email;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;

View File

@ -19,11 +19,11 @@ package com.android.email;
import com.android.email.activity.ContactStatusLoader; import com.android.email.activity.ContactStatusLoader;
import com.android.email.activity.Welcome; import com.android.email.activity.Welcome;
import com.android.email.activity.setup.AccountSettingsXL; 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;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.emailcommon.mail.Address;
import android.app.Notification; import android.app.Notification;
import android.app.Notification.Builder; import android.app.Notification.Builder;

View File

@ -16,7 +16,7 @@
package com.android.email; package com.android.email;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;

View File

@ -23,10 +23,10 @@ import com.android.email.NotificationController;
import com.android.email.R; import com.android.email.R;
import com.android.email.activity.setup.AccountSettingsXL; import com.android.email.activity.setup.AccountSettingsXL;
import com.android.email.activity.setup.AccountSetupBasics; 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;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.emailcommon.mail.MessagingException;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;

View File

@ -20,13 +20,13 @@ import com.android.email.Controller;
import com.android.email.ControllerResultUiThreadWrapper; import com.android.email.ControllerResultUiThreadWrapper;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.MailboxColumns;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.emailcommon.mail.MessagingException;
import android.app.Activity; import android.app.Activity;
import android.app.ListFragment; import android.app.ListFragment;

View File

@ -20,9 +20,9 @@ import com.android.email.Controller;
import com.android.email.ControllerResultUiThreadWrapper; import com.android.email.ControllerResultUiThreadWrapper;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;

View File

@ -22,9 +22,9 @@ import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.activity.setup.AccountSettingsXL; 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.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.emailcommon.mail.MessagingException;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;

View File

@ -22,9 +22,7 @@ import com.android.email.EmailAddressAdapter;
import com.android.email.EmailAddressValidator; import com.android.email.EmailAddressValidator;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.mail.internet.EmailHtmlUtil; 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;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Attachment; 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.BodyColumns;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.email.provider.EmailContent.MessageColumns; 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.ActionBar;
import android.app.Activity; import android.app.Activity;

View File

@ -23,12 +23,12 @@ import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.activity.setup.AccountSecurity; import com.android.email.activity.setup.AccountSecurity;
import com.android.email.activity.setup.AccountSettingsXL; 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;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.EmailContent.MailboxColumns; import com.android.email.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.mail.MessagingException;
import android.app.Activity; import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;

View File

@ -26,9 +26,9 @@ import com.android.email.RefreshManager;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.activity.setup.AccountSecurity; import com.android.email.activity.setup.AccountSecurity;
import com.android.email.activity.setup.AccountSettingsXL; 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.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.emailcommon.mail.MessagingException;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;

View File

@ -19,10 +19,10 @@ package com.android.email.activity;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; 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.Mailbox;
import com.android.email.provider.EmailContent.Message; 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 com.android.emailcommon.service.EmailServiceConstants;
import android.app.Activity; import android.app.Activity;

View File

@ -24,14 +24,14 @@ import com.android.email.Preferences;
import com.android.email.R; import com.android.email.R;
import com.android.email.Throttle; import com.android.email.Throttle;
import com.android.email.Utility; 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.mail.internet.EmailHtmlUtil;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Body;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.email.service.AttachmentDownloadService; 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 com.android.emailcommon.utility.AttachmentUtilities;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;

View File

@ -19,11 +19,11 @@ package com.android.email.activity.setup;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Sender; import com.android.email.mail.Sender;
import com.android.email.mail.Store; import com.android.email.mail.Store;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.HostAuth;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.EmailServiceProxy;
import com.android.emailcommon.service.PolicySet; import com.android.emailcommon.service.PolicySet;

View File

@ -19,12 +19,12 @@ package com.android.email.activity.setup;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Sender; import com.android.email.mail.Sender;
import com.android.email.mail.Store; import com.android.email.mail.Store;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.HostAuth;
import com.android.emailcommon.mail.MessagingException;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;

View File

@ -16,6 +16,8 @@
package com.android.email.mail; package com.android.email.mail;
import com.android.emailcommon.mail.MessagingException;
public class NoSuchProviderException extends MessagingException { public class NoSuchProviderException extends MessagingException {
public static final long serialVersionUID = -1; public static final long serialVersionUID = -1;

View File

@ -18,6 +18,7 @@ package com.android.email.mail;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.emailcommon.mail.MessagingException;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;

View File

@ -18,6 +18,8 @@ package com.android.email.mail;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.emailcommon.mail.Folder;
import com.android.emailcommon.mail.MessagingException;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;

View File

@ -18,6 +18,7 @@ package com.android.email.mail;
import com.android.email.MessagingListener; import com.android.email.MessagingListener;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.emailcommon.mail.MessagingException;
import com.android.email.GroupMessagingListener; import com.android.email.GroupMessagingListener;
import android.content.Context; import android.content.Context;

View File

@ -16,6 +16,9 @@
package com.android.email.mail; package com.android.email.mail;
import com.android.emailcommon.mail.CertificateValidationException;
import com.android.emailcommon.mail.MessagingException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;

View File

@ -17,10 +17,10 @@
package com.android.email.mail.store; package com.android.email.mail.store;
import com.android.email.ExchangeUtils; 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.Store;
import com.android.email.mail.StoreSynchronizer; 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.EmailServiceProxy;
import com.android.emailcommon.service.IEmailService; import com.android.emailcommon.service.IEmailService;

View File

@ -20,23 +20,8 @@ import com.android.email.Email;
import com.android.email.Preferences; import com.android.email.Preferences;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.VendorPolicyLoader; 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.Store;
import com.android.email.mail.Transport; 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.ImapConstants;
import com.android.email.mail.store.imap.ImapElement; import com.android.email.mail.store.imap.ImapElement;
import com.android.email.mail.store.imap.ImapList; 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.DiscourseLogger;
import com.android.email.mail.transport.EOLConvertingOutputStream; import com.android.email.mail.transport.EOLConvertingOutputStream;
import com.android.email.mail.transport.MailTransport; 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.android.emailcommon.service.EmailServiceProxy;
import com.beetstra.jutf7.CharsetProvider; import com.beetstra.jutf7.CharsetProvider;

View File

@ -18,18 +18,18 @@ package com.android.email.mail.store;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.Utility; 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.Store;
import com.android.email.mail.Transport; 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.LoggingInputStream;
import com.android.email.mail.transport.MailTransport; 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 com.android.emailcommon.service.EmailServiceProxy;
import android.content.Context; import android.content.Context;

View File

@ -19,9 +19,9 @@ package com.android.email.mail.store.imap;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.FixedLengthInputStream; import com.android.email.FixedLengthInputStream;
import com.android.email.PeekableInputStream; import com.android.email.PeekableInputStream;
import com.android.email.mail.MessagingException;
import com.android.email.mail.transport.DiscourseLogger; import com.android.email.mail.transport.DiscourseLogger;
import com.android.email.mail.transport.LoggingInputStream; import com.android.email.mail.transport.LoggingInputStream;
import com.android.emailcommon.mail.MessagingException;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Config; import android.util.Config;

View File

@ -17,9 +17,9 @@
package com.android.email.mail.transport; package com.android.email.mail.transport;
import com.android.email.Email; 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.email.mail.Transport;
import com.android.emailcommon.mail.CertificateValidationException;
import com.android.emailcommon.mail.MessagingException;
import android.util.Config; import android.util.Config;
import android.util.Log; import android.util.Log;

View File

@ -16,12 +16,12 @@
package com.android.email.mail.transport; 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.Attachment;
import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Body;
import com.android.email.provider.EmailContent.Message; 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; import org.apache.commons.io.IOUtils;

View File

@ -17,13 +17,13 @@
package com.android.email.mail.transport; package com.android.email.mail.transport;
import com.android.email.Email; 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.Sender;
import com.android.email.mail.Transport; import com.android.email.mail.Transport;
import com.android.email.provider.EmailContent.Message; 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.content.Context;
import android.util.Config; import android.util.Config;

View File

@ -17,9 +17,9 @@
package com.android.email.provider; package com.android.email.provider;
import com.android.email.Email; 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.Attachment;
import com.android.email.provider.EmailContent.AttachmentColumns; 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;
import com.android.emailcommon.utility.AttachmentUtilities.Columns; import com.android.emailcommon.utility.AttachmentUtilities.Columns;

View File

@ -16,8 +16,8 @@
package com.android.email.provider; package com.android.email.provider;
import com.android.email.Snippet;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.emailcommon.mail.Snippet;
import android.content.ContentProviderOperation; import android.content.ContentProviderOperation;
import android.content.ContentProviderResult; import android.content.ContentProviderResult;

View File

@ -24,13 +24,13 @@ import com.android.email.Preferences;
import com.android.email.SecurityPolicy; import com.android.email.SecurityPolicy;
import com.android.email.SingleRunningTask; import com.android.email.SingleRunningTask;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.HostAuth;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.utility.AccountReconciler; import com.android.emailcommon.utility.AccountReconciler;
import android.accounts.AccountManager; import android.accounts.AccountManager;

View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.mail.Body; import com.android.emailcommon.mail.Body;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;

View File

@ -14,7 +14,11 @@
* limitations under the License. * 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.BufferedWriter;
import java.io.IOException; import java.io.IOException;
@ -22,10 +26,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.util.regex.Pattern; 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 * TODO this is a close approximation of Message, need to update along with
* Message. * Message.
@ -82,8 +82,9 @@ public class MimeBodyPart extends BodyPart {
public void setBody(Body body) throws MessagingException { public void setBody(Body body) throws MessagingException {
this.mBody = body; this.mBody = body;
if (body instanceof com.android.email.mail.Multipart) { if (body instanceof com.android.emailcommon.mail.Multipart) {
com.android.email.mail.Multipart multipart = ((com.android.email.mail.Multipart)body); com.android.emailcommon.mail.Multipart multipart =
((com.android.emailcommon.mail.Multipart)body);
multipart.setParent(this); multipart.setParent(this);
setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType());
} }

View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;

View File

@ -14,14 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.mail.Address; import com.android.emailcommon.mail.Address;
import com.android.email.mail.Body; import com.android.emailcommon.mail.Body;
import com.android.email.mail.BodyPart; import com.android.emailcommon.mail.BodyPart;
import com.android.email.mail.Message; import com.android.emailcommon.mail.Message;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import com.android.email.mail.Part; import com.android.emailcommon.mail.Multipart;
import com.android.emailcommon.mail.Part;
import org.apache.james.mime4j.BodyDescriptor; import org.apache.james.mime4j.BodyDescriptor;
import org.apache.james.mime4j.ContentHandler; import org.apache.james.mime4j.ContentHandler;
@ -367,8 +368,8 @@ public class MimeMessage extends Message {
@Override @Override
public void setBody(Body body) throws MessagingException { public void setBody(Body body) throws MessagingException {
this.mBody = body; this.mBody = body;
if (body instanceof com.android.email.mail.Multipart) { if (body instanceof Multipart) {
com.android.email.mail.Multipart multipart = ((com.android.email.mail.Multipart)body); Multipart multipart = ((Multipart)body);
multipart.setParent(this); multipart.setParent(this);
setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType());
setHeader("MIME-Version", "1.0"); setHeader("MIME-Version", "1.0");

View File

@ -14,7 +14,11 @@
* limitations under the License. * 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.BufferedWriter;
import java.io.IOException; import java.io.IOException;
@ -22,10 +26,6 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; 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 { public class MimeMultipart extends Multipart {
protected String mPreamble; protected String mPreamble;
@ -90,7 +90,7 @@ public class MimeMultipart extends Multipart {
} }
for (int i = 0, count = mParts.size(); i < count; i++) { 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.write("--" + mBoundary + "\r\n");
writer.flush(); writer.flush();
bodyPart.writeTo(out); bodyPart.writeTo(out);

View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.mail.Body; import com.android.emailcommon.mail.Body;
import com.android.email.mail.BodyPart; import com.android.emailcommon.mail.BodyPart;
import com.android.email.mail.Message; import com.android.emailcommon.mail.Message;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import com.android.email.mail.Multipart; import com.android.emailcommon.mail.Multipart;
import com.android.email.mail.Part; import com.android.emailcommon.mail.Part;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.codec.EncoderUtil;

View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.mail.Body; import com.android.emailcommon.mail.Body;
import com.android.email.mail.MessagingException; import com.android.emailcommon.mail.MessagingException;
import android.util.Base64; import android.util.Base64;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import com.android.email.Utility; import com.android.email.Utility;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import com.android.email.R; import com.android.email.R;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
public abstract class BodyPart implements Part { public abstract class BodyPart implements Part {
protected Multipart mParent; protected Multipart mParent;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import com.android.email.R; import com.android.email.R;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
/** /**
* Interface for classes that can be added to {@link FetchProfile}. * Interface for classes that can be added to {@link FetchProfile}.

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
/** /**
* Flags that can be applied to Messages. * Flags that can be applied to Messages.

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
public abstract class Folder { public abstract class Folder {

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
public class MeetingInfo { public class MeetingInfo {
// Predefined tags; others can be added // Predefined tags; others can be added

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.util.Comparator; import java.util.Comparator;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import com.android.email.R; import com.android.email.R;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email; package com.android.emailcommon.mail;
import android.text.TextUtils; import android.text.TextUtils;

View File

@ -16,9 +16,9 @@
package com.android.emailcommon.service; package com.android.emailcommon.service;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent.HostAuth; import com.android.email.provider.EmailContent.HostAuth;
import com.android.emailcommon.Api; import com.android.emailcommon.Api;
import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;

View File

@ -16,12 +16,12 @@
package com.android.emailcommon.utility; 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.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; import android.text.TextUtils;

View File

@ -17,9 +17,9 @@
package com.android.exchange; package com.android.exchange;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.emailcommon.mail.MessagingException;
import com.android.exchange.utility.FileLogger; import com.android.exchange.utility.FileLogger;
import android.content.Context; import android.content.Context;

View File

@ -18,7 +18,6 @@
package com.android.exchange; package com.android.exchange;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.MessagingException;
import com.android.email.mail.transport.Rfc822Output; import com.android.email.mail.transport.Rfc822Output;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Body; 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.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.email.provider.EmailContent.SyncColumns; import com.android.email.provider.EmailContent.SyncColumns;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.service.EmailServiceStatus; import com.android.emailcommon.service.EmailServiceStatus;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;

View File

@ -18,10 +18,6 @@
package com.android.exchange; package com.android.exchange;
import com.android.email.Utility; 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.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.email.provider.EmailContent.Attachment; 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.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.email.provider.EmailContent.SyncColumns; 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.EmailServiceConstants;
import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.EmailServiceProxy;
import com.android.emailcommon.service.EmailServiceStatus; import com.android.emailcommon.service.EmailServiceStatus;

View File

@ -18,13 +18,6 @@
package com.android.exchange.adapter; package com.android.exchange.adapter;
import com.android.email.Utility; 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.EmailContent;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.email.provider.EmailContent.Account; 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.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.email.provider.EmailContent.SyncColumns; 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.AccountServiceProxy;
import com.android.emailcommon.service.SyncWindow; import com.android.emailcommon.service.SyncWindow;
import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.AttachmentUtilities;

View File

@ -19,10 +19,10 @@ package com.android.exchange.provider;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.VendorPolicyLoader; import com.android.email.VendorPolicyLoader;
import com.android.email.mail.PackedString;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; import com.android.email.provider.EmailContent.AccountColumns;
import com.android.emailcommon.mail.PackedString;
import com.android.exchange.EasSyncService; import com.android.exchange.EasSyncService;
import com.android.exchange.provider.GalResult.GalData; import com.android.exchange.provider.GalResult.GalData;

View File

@ -15,7 +15,7 @@
package com.android.exchange.provider; package com.android.exchange.provider;
import com.android.email.mail.PackedString; import com.android.emailcommon.mail.PackedString;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -19,12 +19,12 @@ package com.android.exchange.utility;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.emailcommon.mail.Address;
import com.android.emailcommon.service.AccountServiceProxy; import com.android.emailcommon.service.AccountServiceProxy;
import com.android.exchange.Eas; import com.android.exchange.Eas;
import com.android.exchange.EasSyncService; import com.android.exchange.EasSyncService;

View File

@ -16,25 +16,25 @@
package com.android.email; 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.EmailContent;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.ProviderTestUtils;
import com.android.email.provider.EmailContent.Attachment; 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 com.android.emailcommon.utility.ConversionUtilities;
import android.content.ContentUris; import android.content.ContentUris;

View File

@ -16,8 +16,8 @@
package com.android.email; package com.android.email;
import com.android.email.mail.MockFolder;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.emailcommon.mail.MockFolder;
import android.content.ContentUris; import android.content.ContentUris;
import android.net.Uri; import android.net.Uri;

View File

@ -16,9 +16,9 @@
package com.android.email; package com.android.email;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.ProviderTestUtils;
import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;

View File

@ -20,11 +20,11 @@ import com.android.email.Controller;
import com.android.email.DBTestHelper; import com.android.email.DBTestHelper;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.TestUtils; import com.android.email.TestUtils;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent; import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.ProviderTestUtils;
import com.android.emailcommon.mail.MessagingException;
import android.content.Context; import android.content.Context;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;

View File

@ -20,10 +20,10 @@ import com.android.email.Email;
import com.android.email.EmailAddressValidator; import com.android.email.EmailAddressValidator;
import com.android.email.R; import com.android.email.R;
import com.android.email.TestUtils; 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.Account;
import com.android.email.provider.EmailContent.Message; 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.ContentUris;
import android.content.Context; import android.content.Context;

View File

@ -17,6 +17,7 @@
package com.android.email.mail; package com.android.email.mail;
import com.android.email.Email; import com.android.email.Email;
import com.android.emailcommon.mail.MessagingException;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.MediumTest;

View File

@ -20,28 +20,28 @@ import com.android.email.Email;
import com.android.email.MockVendorPolicy; import com.android.email.MockVendorPolicy;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.VendorPolicyLoader; 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.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.ImapConnection;
import com.android.email.mail.store.ImapStore.ImapMessage; import com.android.email.mail.store.ImapStore.ImapMessage;
import com.android.email.mail.store.imap.ImapResponse; import com.android.email.mail.store.imap.ImapResponse;
import com.android.email.mail.store.imap.ImapTestUtils; import com.android.email.mail.store.imap.ImapTestUtils;
import com.android.email.mail.transport.MockTransport; 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; import org.apache.commons.io.IOUtils;

View File

@ -17,18 +17,18 @@
package com.android.email.mail.store; package com.android.email.mail.store;
import com.android.email.Email; 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.Transport;
import com.android.email.mail.internet.MimeMessage;
import com.android.email.mail.transport.MockTransport; 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.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -23,7 +23,6 @@ import static com.android.email.mail.store.imap.ImapTestUtils.createFixedLengthI
import com.android.email.Email; import com.android.email.Email;
import com.android.email.Utility; 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.ImapMemoryLiteral;
import com.android.email.mail.store.imap.ImapResponse; import com.android.email.mail.store.imap.ImapResponse;
import com.android.email.mail.store.imap.ImapResponseParser; 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.ImapTempFileLiteral;
import com.android.email.mail.store.imap.ImapResponseParser.ByeException; import com.android.email.mail.store.imap.ImapResponseParser.ByeException;
import com.android.email.mail.transport.DiscourseLogger; import com.android.email.mail.transport.DiscourseLogger;
import com.android.emailcommon.mail.MessagingException;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -17,10 +17,10 @@
package com.android.email.mail.transport; package com.android.email.mail.transport;
import com.android.email.R; import com.android.email.R;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Message; 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.field.Field;
import org.apache.james.mime4j.message.Body; import org.apache.james.mime4j.message.Body;

View File

@ -17,13 +17,13 @@
package com.android.email.mail.transport; package com.android.email.mail.transport;
import com.android.email.DBTestHelper; 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.mail.Transport;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Body; import com.android.email.provider.EmailContent.Body;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.emailcommon.mail.Address;
import com.android.emailcommon.mail.MessagingException;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;

View File

@ -18,11 +18,11 @@ package com.android.email.provider;
import com.android.email.AttachmentInfo; import com.android.email.AttachmentInfo;
import com.android.email.R; import com.android.email.R;
import com.android.email.mail.MessagingException;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Mailbox; import com.android.email.provider.EmailContent.Mailbox;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.AttachmentUtilities;
import android.content.ContentResolver; import android.content.ContentResolver;

View File

@ -16,7 +16,6 @@
package com.android.email.provider; package com.android.email.provider;
import com.android.email.Snippet;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns; 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.MailboxColumns;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.email.provider.EmailContent.MessageColumns; import com.android.email.provider.EmailContent.MessageColumns;
import com.android.emailcommon.mail.Snippet;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentUris; import android.content.ContentUris;

View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.mail.MessagingException; import com.android.emailcommon.internet.MimeBodyPart;
import com.android.email.mail.internet.MimeBodyPart; import com.android.emailcommon.internet.MimeHeader;
import com.android.email.mail.internet.MimeHeader; import com.android.emailcommon.mail.MessagingException;
import junit.framework.TestCase; import junit.framework.TestCase;

View File

@ -14,7 +14,9 @@
* limitations under the License. * 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; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -14,13 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.Email; import com.android.email.Email;
import com.android.email.mail.Address; import com.android.emailcommon.internet.MimeHeader;
import com.android.email.mail.Flag; import com.android.emailcommon.internet.MimeMessage;
import com.android.email.mail.MessagingException; import com.android.emailcommon.internet.MimeUtility;
import com.android.email.mail.Message.RecipientType; 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.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -14,15 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail.internet; package com.android.emailcommon.internet;
import com.android.email.mail.BodyPart; import com.android.emailcommon.internet.MimeBodyPart;
import com.android.email.mail.MessageTestUtils; import com.android.emailcommon.internet.MimeHeader;
import com.android.email.mail.Message; import com.android.emailcommon.internet.MimeUtility;
import com.android.email.mail.MessagingException; import com.android.emailcommon.internet.TextBody;
import com.android.email.mail.Part; import com.android.emailcommon.mail.BodyPart;
import com.android.email.mail.MessageTestUtils.MessageBuilder; import com.android.emailcommon.mail.Message;
import com.android.email.mail.MessageTestUtils.MultipartBuilder; 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; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -14,7 +14,9 @@
* limitations under the License. * 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.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -14,7 +14,9 @@
* limitations under the License. * 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; import android.test.suitebuilder.annotation.SmallTest;

View File

@ -14,14 +14,14 @@
* limitations under the License. * 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.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 com.android.emailcommon.utility.AttachmentUtilities;
import android.net.Uri; import android.net.Uri;

View File

@ -14,7 +14,12 @@
* limitations under the License. * 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 { public class MockFolder extends Folder {

View File

@ -14,7 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.email.mail; package com.android.emailcommon.mail;
import com.android.emailcommon.mail.PackedString;
import junit.framework.TestCase; import junit.framework.TestCase;

View File

@ -20,7 +20,9 @@
* You can run this entire test case with: * You can run this entire test case with:
* runtest -c com.android.email.SnippetTests email * 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; import android.test.AndroidTestCase;

View File

@ -16,10 +16,10 @@
package com.android.exchange.provider; package com.android.exchange.provider;
import com.android.email.mail.PackedString;
import com.android.email.provider.EmailProvider; import com.android.email.provider.EmailProvider;
import com.android.email.provider.ProviderTestUtils; import com.android.email.provider.ProviderTestUtils;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.emailcommon.mail.PackedString;
import com.android.exchange.provider.GalResult.GalData; import com.android.exchange.provider.GalResult.GalData;
import android.content.Context; import android.content.Context;

View File

@ -18,10 +18,10 @@ package com.android.exchange.utility;
import com.android.email.R; import com.android.email.R;
import com.android.email.Utility; import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.provider.EmailContent.Account; import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.Attachment; import com.android.email.provider.EmailContent.Attachment;
import com.android.email.provider.EmailContent.Message; import com.android.email.provider.EmailContent.Message;
import com.android.emailcommon.mail.Address;
import com.android.exchange.adapter.CalendarSyncAdapter; import com.android.exchange.adapter.CalendarSyncAdapter;
import com.android.exchange.adapter.Parser; import com.android.exchange.adapter.Parser;
import com.android.exchange.adapter.Serializer; import com.android.exchange.adapter.Serializer;