From c00ec35921d4dd4d9dd17c5f5544d183df5c4501 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 28 Oct 2008 01:22:17 +0000 Subject: [PATCH] Grand insane rename, step 3 --- src/com/fsck/k9/Account.java | 2 +- src/com/fsck/k9/Email.java | 12 ++-- src/com/fsck/k9/EmailAddressAdapter.java | 4 +- src/com/fsck/k9/EmailAddressValidator.java | 4 +- src/com/fsck/k9/FixedLengthInputStream.java | 2 +- src/com/fsck/k9/Manifest.java | 4 +- src/com/fsck/k9/MessagingController.java | 42 +++++------ src/com/fsck/k9/MessagingListener.java | 8 +-- src/com/fsck/k9/PeekableInputStream.java | 2 +- src/com/fsck/k9/Preferences.java | 2 +- src/com/fsck/k9/R.java | 2 +- src/com/fsck/k9/Utility.java | 4 +- src/com/fsck/k9/activity/Accounts.java | 24 +++---- src/com/fsck/k9/activity/Debug.java | 8 +-- .../fsck/k9/activity/FolderMessageList.java | 44 ++++++------ src/com/fsck/k9/activity/MessageCompose.java | 70 +++++++++---------- src/com/fsck/k9/activity/MessageView.java | 48 ++++++------- .../fsck/k9/activity/ProgressListener.java | 2 +- src/com/fsck/k9/activity/Welcome.java | 8 +-- .../k9/activity/setup/AccountSettings.java | 10 +-- .../setup/AccountSetupAccountType.java | 6 +- .../k9/activity/setup/AccountSetupBasics.java | 18 ++--- .../setup/AccountSetupCheckSettings.java | 16 ++--- .../activity/setup/AccountSetupIncoming.java | 10 +-- .../k9/activity/setup/AccountSetupNames.java | 14 ++-- .../activity/setup/AccountSetupOptions.java | 10 +-- .../activity/setup/AccountSetupOutgoing.java | 10 +-- .../fsck/k9/activity/setup/SpinnerOption.java | 2 +- src/com/fsck/k9/codec/binary/Base64.java | 2 +- .../k9/codec/binary/Base64OutputStream.java | 2 +- src/com/fsck/k9/mail/Address.java | 8 +-- .../mail/AuthenticationFailedException.java | 2 +- src/com/fsck/k9/mail/Body.java | 2 +- src/com/fsck/k9/mail/BodyPart.java | 2 +- .../mail/CertificateValidationException.java | 2 +- src/com/fsck/k9/mail/FetchProfile.java | 2 +- src/com/fsck/k9/mail/Flag.java | 2 +- src/com/fsck/k9/mail/Folder.java | 2 +- src/com/fsck/k9/mail/Message.java | 2 +- .../fsck/k9/mail/MessageDateComparator.java | 2 +- .../k9/mail/MessageRetrievalListener.java | 2 +- src/com/fsck/k9/mail/MessagingException.java | 2 +- src/com/fsck/k9/mail/Multipart.java | 2 +- .../fsck/k9/mail/NoSuchProviderException.java | 2 +- src/com/fsck/k9/mail/Part.java | 2 +- src/com/fsck/k9/mail/Store.java | 8 +-- src/com/fsck/k9/mail/Transport.java | 4 +- .../k9/mail/internet/BinaryTempFileBody.java | 10 +-- .../fsck/k9/mail/internet/MimeBodyPart.java | 12 ++-- src/com/fsck/k9/mail/internet/MimeHeader.java | 6 +- .../fsck/k9/mail/internet/MimeMessage.java | 18 ++--- .../fsck/k9/mail/internet/MimeMultipart.java | 8 +-- .../fsck/k9/mail/internet/MimeUtility.java | 16 ++--- src/com/fsck/k9/mail/internet/TextBody.java | 8 +-- .../k9/mail/store/ImapResponseParser.java | 10 +-- src/com/fsck/k9/mail/store/ImapStore.java | 46 ++++++------ src/com/fsck/k9/mail/store/LocalStore.java | 44 ++++++------ src/com/fsck/k9/mail/store/Pop3Store.java | 28 ++++---- .../k9/mail/store/TrustManagerFactory.java | 2 +- .../mail/transport/CountingOutputStream.java | 2 +- .../transport/EOLConvertingOutputStream.java | 2 +- .../fsck/k9/mail/transport/SmtpTransport.java | 24 +++---- .../k9/mail/transport/StatusOutputStream.java | 4 +- .../fsck/k9/provider/AttachmentProvider.java | 12 ++-- src/com/fsck/k9/service/BootReceiver.java | 4 +- src/com/fsck/k9/service/MailService.java | 28 ++++---- 66 files changed, 362 insertions(+), 362 deletions(-) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index e30c1ac0a..6be69b963 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.io.Serializable; import java.util.Arrays; diff --git a/src/com/fsck/k9/Email.java b/src/com/fsck/k9/Email.java index e0a9c8266..4b6dc5fae 100644 --- a/src/com/fsck/k9/Email.java +++ b/src/com/fsck/k9/Email.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.io.File; @@ -10,11 +10,11 @@ import android.content.pm.PackageManager; import android.util.Config; import android.util.Log; -import com.android.email.activity.MessageCompose; -import com.android.email.mail.internet.BinaryTempFileBody; -import com.android.email.mail.internet.MimeMessage; -import com.android.email.service.BootReceiver; -import com.android.email.service.MailService; +import com.fsck.k9.activity.MessageCompose; +import com.fsck.k9.mail.internet.BinaryTempFileBody; +import com.fsck.k9.mail.internet.MimeMessage; +import com.fsck.k9.service.BootReceiver; +import com.fsck.k9.service.MailService; public class Email extends Application { public static final String LOG_TAG = "Email"; diff --git a/src/com/fsck/k9/EmailAddressAdapter.java b/src/com/fsck/k9/EmailAddressAdapter.java index 45636c0b9..f547bafe7 100644 --- a/src/com/fsck/k9/EmailAddressAdapter.java +++ b/src/com/fsck/k9/EmailAddressAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.email; +package com.fsck.k9; import static android.provider.Contacts.ContactMethods.CONTENT_EMAIL_URI; import android.content.ContentResolver; @@ -27,7 +27,7 @@ import android.view.View; import android.widget.ResourceCursorAdapter; import android.widget.TextView; -import com.android.email.mail.Address; +import com.fsck.k9.mail.Address; public class EmailAddressAdapter extends ResourceCursorAdapter { public static final int NAME_INDEX = 1; diff --git a/src/com/fsck/k9/EmailAddressValidator.java b/src/com/fsck/k9/EmailAddressValidator.java index 2a0b65dc0..9a7ca21c3 100644 --- a/src/com/fsck/k9/EmailAddressValidator.java +++ b/src/com/fsck/k9/EmailAddressValidator.java @@ -1,7 +1,7 @@ -package com.android.email; +package com.fsck.k9; -import com.android.email.mail.Address; +import com.fsck.k9.mail.Address; import android.util.Config; import android.util.Log; diff --git a/src/com/fsck/k9/FixedLengthInputStream.java b/src/com/fsck/k9/FixedLengthInputStream.java index ac24641d0..457e7c3ca 100644 --- a/src/com/fsck/k9/FixedLengthInputStream.java +++ b/src/com/fsck/k9/FixedLengthInputStream.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/Manifest.java b/src/com/fsck/k9/Manifest.java index fbb008584..80158aa5a 100644 --- a/src/com/fsck/k9/Manifest.java +++ b/src/com/fsck/k9/Manifest.java @@ -5,10 +5,10 @@ * should not be modified by hand. */ -package com.android.email; +package com.fsck.k9; public final class Manifest { public static final class permission { - public static final String READ_ATTACHMENT="com.android.email.permission.READ_ATTACHMENT"; + public static final String READ_ATTACHMENT="com.fsck.k9.permission.READ_ATTACHMENT"; } } diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java index e6b23b5a9..8012d0844 100644 --- a/src/com/fsck/k9/MessagingController.java +++ b/src/com/fsck/k9/MessagingController.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.util.ArrayList; import java.util.Collections; @@ -15,23 +15,23 @@ import android.os.Process; import android.util.Config; import android.util.Log; -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.MessageRetrievalListener; -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.Folder.FolderType; -import com.android.email.mail.Folder.OpenMode; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeUtility; -import com.android.email.mail.store.LocalStore; -import com.android.email.mail.store.LocalStore.LocalFolder; -import com.android.email.mail.store.LocalStore.LocalMessage; -import com.android.email.mail.store.LocalStore.PendingCommand; +import com.fsck.k9.mail.FetchProfile; +import com.fsck.k9.mail.Flag; +import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessageRetrievalListener; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Part; +import com.fsck.k9.mail.Store; +import com.fsck.k9.mail.Transport; +import com.fsck.k9.mail.Folder.FolderType; +import com.fsck.k9.mail.Folder.OpenMode; +import com.fsck.k9.mail.internet.MimeHeader; +import com.fsck.k9.mail.internet.MimeUtility; +import com.fsck.k9.mail.store.LocalStore; +import com.fsck.k9.mail.store.LocalStore.LocalFolder; +import com.fsck.k9.mail.store.LocalStore.LocalMessage; +import com.fsck.k9.mail.store.LocalStore.PendingCommand; /** * Starts a long running (application) Thread that will run through commands @@ -67,11 +67,11 @@ public class MessagingController implements Runnable { private static final int MAX_SMALL_MESSAGE_SIZE = (25 * 1024); private static final String PENDING_COMMAND_TRASH = - "com.android.email.MessagingController.trash"; + "com.fsck.k9.MessagingController.trash"; private static final String PENDING_COMMAND_MARK_READ = - "com.android.email.MessagingController.markRead"; + "com.fsck.k9.MessagingController.markRead"; private static final String PENDING_COMMAND_APPEND = - "com.android.email.MessagingController.append"; + "com.fsck.k9.MessagingController.append"; private static MessagingController inst = null; private BlockingQueue mCommands = new LinkedBlockingQueue(); diff --git a/src/com/fsck/k9/MessagingListener.java b/src/com/fsck/k9/MessagingListener.java index f367c6e0b..17780e778 100644 --- a/src/com/fsck/k9/MessagingListener.java +++ b/src/com/fsck/k9/MessagingListener.java @@ -1,11 +1,11 @@ -package com.android.email; +package com.fsck.k9; import android.content.Context; -import com.android.email.mail.Folder; -import com.android.email.mail.Message; -import com.android.email.mail.Part; +import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.Part; /** * Defines the interface that MessagingController will use to callback to requesters. This class diff --git a/src/com/fsck/k9/PeekableInputStream.java b/src/com/fsck/k9/PeekableInputStream.java index 1ee269f21..2039c7ed0 100644 --- a/src/com/fsck/k9/PeekableInputStream.java +++ b/src/com/fsck/k9/PeekableInputStream.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/Preferences.java b/src/com/fsck/k9/Preferences.java index 24fa17ee0..c0be583be 100644 --- a/src/com/fsck/k9/Preferences.java +++ b/src/com/fsck/k9/Preferences.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.util.Arrays; diff --git a/src/com/fsck/k9/R.java b/src/com/fsck/k9/R.java index 9f3fabb62..0ed8eba27 100644 --- a/src/com/fsck/k9/R.java +++ b/src/com/fsck/k9/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package com.android.email; +package com.fsck.k9; public final class R { public static final class array { diff --git a/src/com/fsck/k9/Utility.java b/src/com/fsck/k9/Utility.java index a06b7c165..08f643f3b 100644 --- a/src/com/fsck/k9/Utility.java +++ b/src/com/fsck/k9/Utility.java @@ -1,5 +1,5 @@ -package com.android.email; +package com.fsck.k9; import java.io.IOException; import java.io.InputStream; @@ -7,7 +7,7 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.util.Date; -import com.android.email.codec.binary.Base64; +import com.fsck.k9.codec.binary.Base64; import android.text.Editable; import android.widget.TextView; diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java index feba03a48..0e34a0d18 100644 --- a/src/com/fsck/k9/activity/Accounts.java +++ b/src/com/fsck/k9/activity/Accounts.java @@ -1,5 +1,5 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import android.app.AlertDialog; import android.app.Dialog; @@ -24,17 +24,17 @@ import android.widget.TextView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.MessagingController; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.activity.setup.AccountSettings; -import com.android.email.activity.setup.AccountSetupBasics; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Store; -import com.android.email.mail.store.LocalStore; -import com.android.email.mail.store.LocalStore.LocalFolder; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.MessagingController; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.activity.setup.AccountSettings; +import com.fsck.k9.activity.setup.AccountSetupBasics; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Store; +import com.fsck.k9.mail.store.LocalStore; +import com.fsck.k9.mail.store.LocalStore.LocalFolder; public class Accounts extends ListActivity implements OnItemClickListener, OnClickListener { private static final int DIALOG_REMOVE_ACCOUNT = 1; diff --git a/src/com/fsck/k9/activity/Debug.java b/src/com/fsck/k9/activity/Debug.java index 555b64953..1c1314ae3 100644 --- a/src/com/fsck/k9/activity/Debug.java +++ b/src/com/fsck/k9/activity/Debug.java @@ -1,5 +1,5 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import android.app.Activity; import android.os.Bundle; @@ -10,9 +10,9 @@ import android.widget.CompoundButton; import android.widget.TextView; import android.widget.CompoundButton.OnCheckedChangeListener; -import com.android.email.Email; -import com.android.email.Preferences; -import com.android.email.R; +import com.fsck.k9.Email; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; public class Debug extends Activity implements OnCheckedChangeListener { private TextView mVersionView; diff --git a/src/com/fsck/k9/activity/FolderMessageList.java b/src/com/fsck/k9/activity/FolderMessageList.java index 39d7c60e2..36d75cf41 100644 --- a/src/com/fsck/k9/activity/FolderMessageList.java +++ b/src/com/fsck/k9/activity/FolderMessageList.java @@ -1,4 +1,4 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import java.text.DateFormat; import java.util.ArrayList; @@ -32,24 +32,24 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ExpandableListView.ExpandableListContextMenuInfo; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.MessagingController; -import com.android.email.MessagingListener; -import com.android.email.R; -import com.android.email.Utility; -import com.android.email.Preferences; -import com.android.email.activity.FolderMessageList.FolderMessageListAdapter.FolderInfoHolder; -import com.android.email.activity.FolderMessageList.FolderMessageListAdapter.MessageInfoHolder; -import com.android.email.activity.setup.AccountSettings; -import com.android.email.mail.Address; -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.Message.RecipientType; -import com.android.email.mail.store.LocalStore.LocalMessage; -import com.android.email.mail.store.LocalStore; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.MessagingController; +import com.fsck.k9.MessagingListener; +import com.fsck.k9.R; +import com.fsck.k9.Utility; +import com.fsck.k9.Preferences; +import com.fsck.k9.activity.FolderMessageList.FolderMessageListAdapter.FolderInfoHolder; +import com.fsck.k9.activity.FolderMessageList.FolderMessageListAdapter.MessageInfoHolder; +import com.fsck.k9.activity.setup.AccountSettings; +import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.Flag; +import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.store.LocalStore.LocalMessage; +import com.fsck.k9.mail.store.LocalStore; /** * FolderMessageList is the primary user interface for the program. This Activity shows @@ -76,11 +76,11 @@ public class FolderMessageList extends ExpandableListActivity { private static final String EXTRA_INITIAL_FOLDER = "initialFolder"; private static final String STATE_KEY_LIST = - "com.android.email.activity.folderlist_expandableListState"; + "com.fsck.k9.activity.folderlist_expandableListState"; private static final String STATE_KEY_EXPANDED_GROUP = - "com.android.email.activity.folderlist_expandedGroup"; + "com.fsck.k9.activity.folderlist_expandedGroup"; private static final String STATE_KEY_EXPANDED_GROUP_SELECTION = - "com.android.email.activity.folderlist_expandedGroupSelection"; + "com.fsck.k9.activity.folderlist_expandedGroupSelection"; private static final int UPDATE_FOLDER_ON_EXPAND_INTERVAL_MS = (1000 * 60 * 3); diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index b0ec86ccb..a804b4c88 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -1,5 +1,5 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import java.io.Serializable; import java.util.ArrayList; @@ -36,53 +36,53 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.AutoCompleteTextView.Validator; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.EmailAddressAdapter; -import com.android.email.EmailAddressValidator; -import com.android.email.MessagingController; -import com.android.email.MessagingListener; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.Utility; -import com.android.email.mail.Address; -import com.android.email.mail.Body; -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.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.mail.store.LocalStore; -import com.android.email.mail.store.LocalStore.LocalAttachmentBody; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.EmailAddressAdapter; +import com.fsck.k9.EmailAddressValidator; +import com.fsck.k9.MessagingController; +import com.fsck.k9.MessagingListener; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.Utility; +import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Multipart; +import com.fsck.k9.mail.Part; +import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.internet.MimeBodyPart; +import com.fsck.k9.mail.internet.MimeHeader; +import com.fsck.k9.mail.internet.MimeMessage; +import com.fsck.k9.mail.internet.MimeMultipart; +import com.fsck.k9.mail.internet.MimeUtility; +import com.fsck.k9.mail.internet.TextBody; +import com.fsck.k9.mail.store.LocalStore; +import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBody; public class MessageCompose extends Activity implements OnClickListener, OnFocusChangeListener { - private static final String ACTION_REPLY = "com.android.email.intent.action.REPLY"; - private static final String ACTION_REPLY_ALL = "com.android.email.intent.action.REPLY_ALL"; - private static final String ACTION_FORWARD = "com.android.email.intent.action.FORWARD"; - private static final String ACTION_EDIT_DRAFT = "com.android.email.intent.action.EDIT_DRAFT"; + private static final String ACTION_REPLY = "com.fsck.k9.intent.action.REPLY"; + private static final String ACTION_REPLY_ALL = "com.fsck.k9.intent.action.REPLY_ALL"; + private static final String ACTION_FORWARD = "com.fsck.k9.intent.action.FORWARD"; + private static final String ACTION_EDIT_DRAFT = "com.fsck.k9.intent.action.EDIT_DRAFT"; private static final String EXTRA_ACCOUNT = "account"; private static final String EXTRA_FOLDER = "folder"; private static final String EXTRA_MESSAGE = "message"; private static final String STATE_KEY_ATTACHMENTS = - "com.android.email.activity.MessageCompose.attachments"; + "com.fsck.k9.activity.MessageCompose.attachments"; private static final String STATE_KEY_CC_SHOWN = - "com.android.email.activity.MessageCompose.ccShown"; + "com.fsck.k9.activity.MessageCompose.ccShown"; private static final String STATE_KEY_BCC_SHOWN = - "com.android.email.activity.MessageCompose.bccShown"; + "com.fsck.k9.activity.MessageCompose.bccShown"; private static final String STATE_KEY_QUOTED_TEXT_SHOWN = - "com.android.email.activity.MessageCompose.quotedTextShown"; + "com.fsck.k9.activity.MessageCompose.quotedTextShown"; private static final String STATE_KEY_SOURCE_MESSAGE_PROCED = - "com.android.email.activity.MessageCompose.stateKeySourceMessageProced"; + "com.fsck.k9.activity.MessageCompose.stateKeySourceMessageProced"; private static final String STATE_KEY_DRAFT_UID = - "com.android.email.activity.MessageCompose.draftUid"; + "com.fsck.k9.activity.MessageCompose.draftUid"; private static final int MSG_PROGRESS_ON = 1; private static final int MSG_PROGRESS_OFF = 2; diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 851e54827..9f2605374 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -1,5 +1,5 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import java.io.File; import java.io.FileOutputStream; @@ -44,32 +44,32 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.MessagingController; -import com.android.email.MessagingListener; -import com.android.email.R; -import com.android.email.Utility; -import com.android.email.mail.Address; -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.email.mail.Message.RecipientType; -import com.android.email.mail.internet.MimeHeader; -import com.android.email.mail.internet.MimeUtility; -import com.android.email.mail.store.LocalStore.LocalAttachmentBody; -import com.android.email.mail.store.LocalStore.LocalAttachmentBodyPart; -import com.android.email.mail.store.LocalStore.LocalMessage; -import com.android.email.provider.AttachmentProvider; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.MessagingController; +import com.fsck.k9.MessagingListener; +import com.fsck.k9.R; +import com.fsck.k9.Utility; +import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Multipart; +import com.fsck.k9.mail.Part; +import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.internet.MimeHeader; +import com.fsck.k9.mail.internet.MimeUtility; +import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBody; +import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBodyPart; +import com.fsck.k9.mail.store.LocalStore.LocalMessage; +import com.fsck.k9.provider.AttachmentProvider; public class MessageView extends Activity implements UrlInterceptHandler, OnClickListener { - private static final String EXTRA_ACCOUNT = "com.android.email.MessageView_account"; - private static final String EXTRA_FOLDER = "com.android.email.MessageView_folder"; - private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message"; - private static final String EXTRA_FOLDER_UIDS = "com.android.email.MessageView_folderUids"; - private static final String EXTRA_NEXT = "com.android.email.MessageView_next"; + private static final String EXTRA_ACCOUNT = "com.fsck.k9.MessageView_account"; + private static final String EXTRA_FOLDER = "com.fsck.k9.MessageView_folder"; + private static final String EXTRA_MESSAGE = "com.fsck.k9.MessageView_message"; + private static final String EXTRA_FOLDER_UIDS = "com.fsck.k9.MessageView_folderUids"; + private static final String EXTRA_NEXT = "com.fsck.k9.MessageView_next"; private TextView mFromView; private TextView mDateView; diff --git a/src/com/fsck/k9/activity/ProgressListener.java b/src/com/fsck/k9/activity/ProgressListener.java index 2edf0a9bf..fb2382d3f 100644 --- a/src/com/fsck/k9/activity/ProgressListener.java +++ b/src/com/fsck/k9/activity/ProgressListener.java @@ -1,5 +1,5 @@ -package com.android.email.activity; +package com.fsck.k9.activity; import android.content.Context; diff --git a/src/com/fsck/k9/activity/Welcome.java b/src/com/fsck/k9/activity/Welcome.java index 9a372cf74..c42091f8a 100644 --- a/src/com/fsck/k9/activity/Welcome.java +++ b/src/com/fsck/k9/activity/Welcome.java @@ -1,9 +1,9 @@ -package com.android.email.activity; +package com.fsck.k9.activity; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.Preferences; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.Preferences; import android.app.Activity; import android.content.Intent; diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index d9aa30b5e..dad494a6b 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import android.content.Context; import android.content.Intent; @@ -13,10 +13,10 @@ import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.RingtonePreference; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.Preferences; -import com.android.email.R; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; public class AccountSettings extends PreferenceActivity { private static final String EXTRA_ACCOUNT = "account"; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java b/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java index b0a1e1778..79a346c85 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import java.net.URI; import java.net.URISyntaxException; @@ -12,8 +12,8 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import com.android.email.Account; -import com.android.email.R; +import com.fsck.k9.Account; +import com.fsck.k9.R; /** * Prompts the user to select an account type. The account type, along with the diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java index 2c342eea3..38f842a6e 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import java.io.Serializable; import java.net.URI; @@ -26,12 +26,12 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.EmailAddressValidator; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.Utility; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.EmailAddressValidator; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.Utility; /** * Prompts the user for the email address and password. Also prompts for @@ -43,10 +43,10 @@ import com.android.email.Utility; */ public class AccountSetupBasics extends Activity implements OnClickListener, TextWatcher { - private final static String EXTRA_ACCOUNT = "com.android.email.AccountSetupBasics.account"; + private final static String EXTRA_ACCOUNT = "com.fsck.k9.AccountSetupBasics.account"; private final static int DIALOG_NOTE = 1; private final static String STATE_KEY_PROVIDER = - "com.android.email.AccountSetupBasics.provider"; + "com.fsck.k9.AccountSetupBasics.provider"; private Preferences mPrefs; private EditText mEmailView; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java index b6b154df8..ebc8a4b0a 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import android.app.Activity; import android.app.AlertDialog; @@ -14,13 +14,13 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.email.Account; -import com.android.email.R; -import com.android.email.mail.AuthenticationFailedException; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Store; -import com.android.email.mail.Transport; -import com.android.email.mail.CertificateValidationException; +import com.fsck.k9.Account; +import com.fsck.k9.R; +import com.fsck.k9.mail.AuthenticationFailedException; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Store; +import com.fsck.k9.mail.Transport; +import com.fsck.k9.mail.CertificateValidationException; /** * Checks the given settings to make sure that they can be used to send and diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java index ef10a3cea..d5ee5b029 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import java.net.URI; import java.net.URISyntaxException; @@ -19,10 +19,10 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; -import com.android.email.Account; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.Utility; +import com.fsck.k9.Account; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.Utility; public class AccountSetupIncoming extends Activity implements OnClickListener { private static final String EXTRA_ACCOUNT = "account"; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupNames.java b/src/com/fsck/k9/activity/setup/AccountSetupNames.java index 5ff61a22f..874fe2f93 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupNames.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupNames.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import android.app.Activity; import android.content.Context; @@ -14,12 +14,12 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.EditText; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.Utility; -import com.android.email.activity.FolderMessageList; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.Utility; +import com.fsck.k9.activity.FolderMessageList; public class AccountSetupNames extends Activity implements OnClickListener { private static final String EXTRA_ACCOUNT = "account"; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOptions.java b/src/com/fsck/k9/activity/setup/AccountSetupOptions.java index 104e010fb..46c7a9b42 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupOptions.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupOptions.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import android.app.Activity; import android.content.Context; @@ -11,10 +11,10 @@ import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.Spinner; -import com.android.email.Account; -import com.android.email.Email; -import com.android.email.Preferences; -import com.android.email.R; +import com.fsck.k9.Account; +import com.fsck.k9.Email; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; public class AccountSetupOptions extends Activity implements OnClickListener { private static final String EXTRA_ACCOUNT = "account"; diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java index 12aea0b11..dfc547070 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java @@ -1,5 +1,5 @@ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import java.net.URI; import java.net.URISyntaxException; @@ -23,10 +23,10 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.CompoundButton.OnCheckedChangeListener; -import com.android.email.Account; -import com.android.email.Preferences; -import com.android.email.R; -import com.android.email.Utility; +import com.fsck.k9.Account; +import com.fsck.k9.Preferences; +import com.fsck.k9.R; +import com.fsck.k9.Utility; public class AccountSetupOutgoing extends Activity implements OnClickListener, OnCheckedChangeListener { diff --git a/src/com/fsck/k9/activity/setup/SpinnerOption.java b/src/com/fsck/k9/activity/setup/SpinnerOption.java index 14067b8f8..f97a95249 100644 --- a/src/com/fsck/k9/activity/setup/SpinnerOption.java +++ b/src/com/fsck/k9/activity/setup/SpinnerOption.java @@ -2,7 +2,7 @@ * */ -package com.android.email.activity.setup; +package com.fsck.k9.activity.setup; import android.widget.Spinner; diff --git a/src/com/fsck/k9/codec/binary/Base64.java b/src/com/fsck/k9/codec/binary/Base64.java index 9f6b74d69..ba5b03126 100644 --- a/src/com/fsck/k9/codec/binary/Base64.java +++ b/src/com/fsck/k9/codec/binary/Base64.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.android.email.codec.binary; +package com.fsck.k9.codec.binary; import org.apache.commons.codec.BinaryDecoder; import org.apache.commons.codec.BinaryEncoder; diff --git a/src/com/fsck/k9/codec/binary/Base64OutputStream.java b/src/com/fsck/k9/codec/binary/Base64OutputStream.java index ba59c3c95..f812cd368 100644 --- a/src/com/fsck/k9/codec/binary/Base64OutputStream.java +++ b/src/com/fsck/k9/codec/binary/Base64OutputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.android.email.codec.binary; +package com.fsck.k9.codec.binary; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java index f5a4ee450..17a4f003b 100644 --- a/src/com/fsck/k9/mail/Address.java +++ b/src/com/fsck/k9/mail/Address.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -16,9 +16,9 @@ import org.apache.james.mime4j.field.address.parser.ParseException; import android.util.Config; import android.util.Log; -import com.android.email.Email; -import com.android.email.Utility; -import com.android.email.mail.internet.MimeUtility; +import com.fsck.k9.Email; +import com.fsck.k9.Utility; +import com.fsck.k9.mail.internet.MimeUtility; public class Address { String mAddress; diff --git a/src/com/fsck/k9/mail/AuthenticationFailedException.java b/src/com/fsck/k9/mail/AuthenticationFailedException.java index dc79f6c79..006063a14 100644 --- a/src/com/fsck/k9/mail/AuthenticationFailedException.java +++ b/src/com/fsck/k9/mail/AuthenticationFailedException.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public class AuthenticationFailedException extends MessagingException { public static final long serialVersionUID = -1; diff --git a/src/com/fsck/k9/mail/Body.java b/src/com/fsck/k9/mail/Body.java index 6dacfa5c1..7deb2a1eb 100644 --- a/src/com/fsck/k9/mail/Body.java +++ b/src/com/fsck/k9/mail/Body.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/mail/BodyPart.java b/src/com/fsck/k9/mail/BodyPart.java index ff7c8d62b..e5f9375e6 100644 --- a/src/com/fsck/k9/mail/BodyPart.java +++ b/src/com/fsck/k9/mail/BodyPart.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public abstract class BodyPart implements Part { protected Multipart mParent; diff --git a/src/com/fsck/k9/mail/CertificateValidationException.java b/src/com/fsck/k9/mail/CertificateValidationException.java index 17bba50cc..ed35cf8ac 100644 --- a/src/com/fsck/k9/mail/CertificateValidationException.java +++ b/src/com/fsck/k9/mail/CertificateValidationException.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public class CertificateValidationException extends MessagingException { public static final long serialVersionUID = -1; diff --git a/src/com/fsck/k9/mail/FetchProfile.java b/src/com/fsck/k9/mail/FetchProfile.java index 558fec8bc..95bc44712 100644 --- a/src/com/fsck/k9/mail/FetchProfile.java +++ b/src/com/fsck/k9/mail/FetchProfile.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.util.ArrayList; diff --git a/src/com/fsck/k9/mail/Flag.java b/src/com/fsck/k9/mail/Flag.java index 71f299645..ec898a700 100644 --- a/src/com/fsck/k9/mail/Flag.java +++ b/src/com/fsck/k9/mail/Flag.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; /** * Flags that can be applied to Messages. diff --git a/src/com/fsck/k9/mail/Folder.java b/src/com/fsck/k9/mail/Folder.java index 001b98688..2f951e336 100644 --- a/src/com/fsck/k9/mail/Folder.java +++ b/src/com/fsck/k9/mail/Folder.java @@ -1,4 +1,4 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public abstract class Folder { diff --git a/src/com/fsck/k9/mail/Message.java b/src/com/fsck/k9/mail/Message.java index 5f13c33ff..58f036304 100644 --- a/src/com/fsck/k9/mail/Message.java +++ b/src/com/fsck/k9/mail/Message.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.util.Date; import java.util.HashSet; diff --git a/src/com/fsck/k9/mail/MessageDateComparator.java b/src/com/fsck/k9/mail/MessageDateComparator.java index 67b273aa3..2bde7af0b 100644 --- a/src/com/fsck/k9/mail/MessageDateComparator.java +++ b/src/com/fsck/k9/mail/MessageDateComparator.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.util.Comparator; diff --git a/src/com/fsck/k9/mail/MessageRetrievalListener.java b/src/com/fsck/k9/mail/MessageRetrievalListener.java index fd070521d..2a1446211 100644 --- a/src/com/fsck/k9/mail/MessageRetrievalListener.java +++ b/src/com/fsck/k9/mail/MessageRetrievalListener.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public interface MessageRetrievalListener { public void messageStarted(String uid, int number, int ofTotal); diff --git a/src/com/fsck/k9/mail/MessagingException.java b/src/com/fsck/k9/mail/MessagingException.java index 8ccd8473e..7e0a0d263 100644 --- a/src/com/fsck/k9/mail/MessagingException.java +++ b/src/com/fsck/k9/mail/MessagingException.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public class MessagingException extends Exception { public static final long serialVersionUID = -1; diff --git a/src/com/fsck/k9/mail/Multipart.java b/src/com/fsck/k9/mail/Multipart.java index 1e59a73b0..787f5b382 100644 --- a/src/com/fsck/k9/mail/Multipart.java +++ b/src/com/fsck/k9/mail/Multipart.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.util.ArrayList; diff --git a/src/com/fsck/k9/mail/NoSuchProviderException.java b/src/com/fsck/k9/mail/NoSuchProviderException.java index 68d663a44..5eb9029d0 100644 --- a/src/com/fsck/k9/mail/NoSuchProviderException.java +++ b/src/com/fsck/k9/mail/NoSuchProviderException.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; public class NoSuchProviderException extends MessagingException { public static final long serialVersionUID = -1; diff --git a/src/com/fsck/k9/mail/Part.java b/src/com/fsck/k9/mail/Part.java index 45c38c223..2d06744ed 100644 --- a/src/com/fsck/k9/mail/Part.java +++ b/src/com/fsck/k9/mail/Part.java @@ -1,5 +1,5 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/fsck/k9/mail/Store.java b/src/com/fsck/k9/mail/Store.java index 2c4cfed0f..9f7474ac8 100644 --- a/src/com/fsck/k9/mail/Store.java +++ b/src/com/fsck/k9/mail/Store.java @@ -1,13 +1,13 @@ -package com.android.email.mail; +package com.fsck.k9.mail; import java.util.HashMap; import android.app.Application; -import com.android.email.mail.store.ImapStore; -import com.android.email.mail.store.LocalStore; -import com.android.email.mail.store.Pop3Store; +import com.fsck.k9.mail.store.ImapStore; +import com.fsck.k9.mail.store.LocalStore; +import com.fsck.k9.mail.store.Pop3Store; /** * Store is the access point for an email message store. It's location can be diff --git a/src/com/fsck/k9/mail/Transport.java b/src/com/fsck/k9/mail/Transport.java index 6189a73e7..eba3f8969 100644 --- a/src/com/fsck/k9/mail/Transport.java +++ b/src/com/fsck/k9/mail/Transport.java @@ -1,7 +1,7 @@ -package com.android.email.mail; +package com.fsck.k9.mail; -import com.android.email.mail.transport.SmtpTransport; +import com.fsck.k9.mail.transport.SmtpTransport; public abstract class Transport { protected static final int SOCKET_CONNECT_TIMEOUT = 10000; diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java index 76b120d5b..e69dd1d7a 100644 --- a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java +++ b/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java @@ -1,4 +1,4 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.File; import java.io.FileInputStream; @@ -13,10 +13,10 @@ import org.apache.commons.io.IOUtils; import android.util.Config; import android.util.Log; -import com.android.email.Email; -import com.android.email.codec.binary.Base64OutputStream; -import com.android.email.mail.Body; -import com.android.email.mail.MessagingException; +import com.fsck.k9.Email; +import com.fsck.k9.codec.binary.Base64OutputStream; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.MessagingException; /** * A Body that is backed by a temp file. The Body exposes a getOutputStream method that allows diff --git a/src/com/fsck/k9/mail/internet/MimeBodyPart.java b/src/com/fsck/k9/mail/internet/MimeBodyPart.java index f41caedde..4504a99a8 100644 --- a/src/com/fsck/k9/mail/internet/MimeBodyPart.java +++ b/src/com/fsck/k9/mail/internet/MimeBodyPart.java @@ -1,14 +1,14 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import com.android.email.mail.Body; -import com.android.email.mail.BodyPart; -import com.android.email.mail.MessagingException; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.BodyPart; +import com.fsck.k9.mail.MessagingException; /** * TODO this is a close approximation of Message, need to update along with @@ -60,8 +60,8 @@ 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.fsck.k9.mail.Multipart) { + com.fsck.k9.mail.Multipart multipart = ((com.fsck.k9.mail.Multipart)body); multipart.setParent(this); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); } diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java index 7a233d054..35b50c357 100644 --- a/src/com/fsck/k9/mail/internet/MimeHeader.java +++ b/src/com/fsck/k9/mail/internet/MimeHeader.java @@ -1,5 +1,5 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.BufferedWriter; import java.io.IOException; @@ -7,8 +7,8 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.ArrayList; -import com.android.email.Utility; -import com.android.email.mail.MessagingException; +import com.fsck.k9.Utility; +import com.fsck.k9.mail.MessagingException; public class MimeHeader { /** diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java index a1a474f15..41d32fd5f 100644 --- a/src/com/fsck/k9/mail/internet/MimeMessage.java +++ b/src/com/fsck/k9/mail/internet/MimeMessage.java @@ -1,5 +1,5 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.BufferedWriter; import java.io.IOException; @@ -17,12 +17,12 @@ import org.apache.james.mime4j.MimeStreamParser; import org.apache.james.mime4j.field.DateTimeField; import org.apache.james.mime4j.field.Field; -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.fsck.k9.mail.Address; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.BodyPart; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Part; /** * An implementation of Message that stores all of it's metadata in RFC 822 and @@ -251,8 +251,8 @@ public class MimeMessage extends Message { 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.fsck.k9.mail.Multipart) { + com.fsck.k9.mail.Multipart multipart = ((com.fsck.k9.mail.Multipart)body); multipart.setParent(this); setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType()); setHeader("MIME-Version", "1.0"); diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/src/com/fsck/k9/mail/internet/MimeMultipart.java index 1b1d4cd13..d457b7e76 100644 --- a/src/com/fsck/k9/mail/internet/MimeMultipart.java +++ b/src/com/fsck/k9/mail/internet/MimeMultipart.java @@ -1,5 +1,5 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.BufferedWriter; import java.io.IOException; @@ -7,9 +7,9 @@ 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; +import com.fsck.k9.mail.BodyPart; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Multipart; public class MimeMultipart extends Multipart { protected String mPreamble; diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java index 46e3eb2ee..a347cebec 100644 --- a/src/com/fsck/k9/mail/internet/MimeUtility.java +++ b/src/com/fsck/k9/mail/internet/MimeUtility.java @@ -1,5 +1,5 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -15,13 +15,13 @@ import org.apache.james.mime4j.util.CharsetUtil; import android.util.Log; -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.fsck.k9.Email; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.BodyPart; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Multipart; +import com.fsck.k9.mail.Part; public class MimeUtility { public static String unfold(String s) { diff --git a/src/com/fsck/k9/mail/internet/TextBody.java b/src/com/fsck/k9/mail/internet/TextBody.java index c1755922c..0b85ba115 100644 --- a/src/com/fsck/k9/mail/internet/TextBody.java +++ b/src/com/fsck/k9/mail/internet/TextBody.java @@ -1,5 +1,5 @@ -package com.android.email.mail.internet; +package com.fsck.k9.mail.internet; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -8,9 +8,9 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import com.android.email.codec.binary.Base64; -import com.android.email.mail.Body; -import com.android.email.mail.MessagingException; +import com.fsck.k9.codec.binary.Base64; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.MessagingException; public class TextBody implements Body { String mBody; diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java index 975cfa2ae..3c0717f6b 100644 --- a/src/com/fsck/k9/mail/store/ImapResponseParser.java +++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java @@ -2,7 +2,7 @@ * */ -package com.android.email.mail.store; +package com.fsck.k9.mail.store; import java.io.IOException; import java.io.InputStream; @@ -14,10 +14,10 @@ import java.util.Date; import android.util.Config; import android.util.Log; -import com.android.email.Email; -import com.android.email.FixedLengthInputStream; -import com.android.email.PeekableInputStream; -import com.android.email.mail.MessagingException; +import com.fsck.k9.Email; +import com.fsck.k9.FixedLengthInputStream; +import com.fsck.k9.PeekableInputStream; +import com.fsck.k9.mail.MessagingException; public class ImapResponseParser { SimpleDateFormat mDateTimeFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z"); diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java index f164991d9..a2fe1c9c5 100644 --- a/src/com/fsck/k9/mail/store/ImapStore.java +++ b/src/com/fsck/k9/mail/store/ImapStore.java @@ -1,5 +1,5 @@ -package com.android.email.mail.store; +package com.fsck.k9.mail.store; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -31,28 +31,28 @@ import javax.net.ssl.SSLException; import android.util.Config; import android.util.Log; -import com.android.email.Email; -import com.android.email.PeekableInputStream; -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.MessageRetrievalListener; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.Store; -import com.android.email.mail.CertificateValidationException; -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.ImapResponseParser.ImapList; -import com.android.email.mail.store.ImapResponseParser.ImapResponse; -import com.android.email.mail.transport.CountingOutputStream; -import com.android.email.mail.transport.EOLConvertingOutputStream; +import com.fsck.k9.Email; +import com.fsck.k9.PeekableInputStream; +import com.fsck.k9.Utility; +import com.fsck.k9.mail.AuthenticationFailedException; +import com.fsck.k9.mail.FetchProfile; +import com.fsck.k9.mail.Flag; +import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessageRetrievalListener; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Part; +import com.fsck.k9.mail.Store; +import com.fsck.k9.mail.CertificateValidationException; +import com.fsck.k9.mail.internet.MimeBodyPart; +import com.fsck.k9.mail.internet.MimeHeader; +import com.fsck.k9.mail.internet.MimeMessage; +import com.fsck.k9.mail.internet.MimeMultipart; +import com.fsck.k9.mail.internet.MimeUtility; +import com.fsck.k9.mail.store.ImapResponseParser.ImapList; +import com.fsck.k9.mail.store.ImapResponseParser.ImapResponse; +import com.fsck.k9.mail.transport.CountingOutputStream; +import com.fsck.k9.mail.transport.EOLConvertingOutputStream; import com.beetstra.jutf7.CharsetProvider; /** diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index e93902ec5..41bd6e9d5 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -1,5 +1,5 @@ -package com.android.email.mail.store; +package com.fsck.k9.mail.store; import java.io.ByteArrayInputStream; import java.io.File; @@ -25,27 +25,27 @@ import android.net.Uri; import android.util.Config; import android.util.Log; -import com.android.email.Email; -import com.android.email.Utility; -import com.android.email.codec.binary.Base64OutputStream; -import com.android.email.mail.Address; -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.Message; -import com.android.email.mail.MessageRetrievalListener; -import com.android.email.mail.MessagingException; -import com.android.email.mail.Part; -import com.android.email.mail.Store; -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.AttachmentProvider; +import com.fsck.k9.Email; +import com.fsck.k9.Utility; +import com.fsck.k9.codec.binary.Base64OutputStream; +import com.fsck.k9.mail.Address; +import com.fsck.k9.mail.Body; +import com.fsck.k9.mail.FetchProfile; +import com.fsck.k9.mail.Flag; +import com.fsck.k9.mail.Folder; +import com.fsck.k9.mail.Message; +import com.fsck.k9.mail.MessageRetrievalListener; +import com.fsck.k9.mail.MessagingException; +import com.fsck.k9.mail.Part; +import com.fsck.k9.mail.Store; +import com.fsck.k9.mail.Message.RecipientType; +import com.fsck.k9.mail.internet.MimeBodyPart; +import com.fsck.k9.mail.internet.MimeHeader; +import com.fsck.k9.mail.internet.MimeMessage; +import com.fsck.k9.mail.internet.MimeMultipart; +import com.fsck.k9.mail.internet.MimeUtility; +import com.fsck.k9.mail.internet.TextBody; +import com.fsck.k9.provider.AttachmentProvider; /** * 
diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java
index 5d5f6e1b2..3c739880b 100644
--- a/src/com/fsck/k9/mail/store/Pop3Store.java
+++ b/src/com/fsck/k9/mail/store/Pop3Store.java
@@ -1,5 +1,5 @@
 
-package com.android.email.mail.store;
+package com.fsck.k9.mail.store;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -24,19 +24,19 @@ import javax.net.ssl.SSLException;
 import android.util.Config;
 import android.util.Log;
 
-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.MessageRetrievalListener;
-import com.android.email.mail.MessagingException;
-import com.android.email.mail.Store;
-import com.android.email.mail.CertificateValidationException;
-import com.android.email.mail.Folder.OpenMode;
-import com.android.email.mail.internet.MimeMessage;
+import com.fsck.k9.Email;
+import com.fsck.k9.Utility;
+import com.fsck.k9.mail.AuthenticationFailedException;
+import com.fsck.k9.mail.FetchProfile;
+import com.fsck.k9.mail.Flag;
+import com.fsck.k9.mail.Folder;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessageRetrievalListener;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.Store;
+import com.fsck.k9.mail.CertificateValidationException;
+import com.fsck.k9.mail.Folder.OpenMode;
+import com.fsck.k9.mail.internet.MimeMessage;
 
 public class Pop3Store extends Store {
     public static final int CONNECTION_SECURITY_NONE = 0;
diff --git a/src/com/fsck/k9/mail/store/TrustManagerFactory.java b/src/com/fsck/k9/mail/store/TrustManagerFactory.java
index 20716f700..dcfa2070c 100644
--- a/src/com/fsck/k9/mail/store/TrustManagerFactory.java
+++ b/src/com/fsck/k9/mail/store/TrustManagerFactory.java
@@ -1,5 +1,5 @@
 
-package com.android.email.mail.store;
+package com.fsck.k9.mail.store;
 
 import android.util.Log;
 import android.net.http.DomainNameChecker;
diff --git a/src/com/fsck/k9/mail/transport/CountingOutputStream.java b/src/com/fsck/k9/mail/transport/CountingOutputStream.java
index 424aede5c..51a786c8c 100644
--- a/src/com/fsck/k9/mail/transport/CountingOutputStream.java
+++ b/src/com/fsck/k9/mail/transport/CountingOutputStream.java
@@ -1,4 +1,4 @@
-package com.android.email.mail.transport;
+package com.fsck.k9.mail.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java b/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java
index 719959a80..02d465615 100644
--- a/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java
+++ b/src/com/fsck/k9/mail/transport/EOLConvertingOutputStream.java
@@ -1,4 +1,4 @@
-package com.android.email.mail.transport;
+package com.fsck.k9.mail.transport;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java
index fc97bd307..61df80898 100644
--- a/src/com/fsck/k9/mail/transport/SmtpTransport.java
+++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java
@@ -1,5 +1,5 @@
 
-package com.android.email.mail.transport;
+package com.fsck.k9.mail.transport;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -21,17 +21,17 @@ import javax.net.ssl.SSLException;
 import android.util.Config;
 import android.util.Log;
 
-import com.android.email.Email;
-import com.android.email.PeekableInputStream;
-import com.android.email.codec.binary.Base64;
-import com.android.email.mail.Address;
-import com.android.email.mail.AuthenticationFailedException;
-import com.android.email.mail.Message;
-import com.android.email.mail.MessagingException;
-import com.android.email.mail.Transport;
-import com.android.email.mail.CertificateValidationException;
-import com.android.email.mail.Message.RecipientType;
-import com.android.email.mail.store.TrustManagerFactory;
+import com.fsck.k9.Email;
+import com.fsck.k9.PeekableInputStream;
+import com.fsck.k9.codec.binary.Base64;
+import com.fsck.k9.mail.Address;
+import com.fsck.k9.mail.AuthenticationFailedException;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.Transport;
+import com.fsck.k9.mail.CertificateValidationException;
+import com.fsck.k9.mail.Message.RecipientType;
+import com.fsck.k9.mail.store.TrustManagerFactory;
 
 public class SmtpTransport extends Transport {
     public static final int CONNECTION_SECURITY_NONE = 0;
diff --git a/src/com/fsck/k9/mail/transport/StatusOutputStream.java b/src/com/fsck/k9/mail/transport/StatusOutputStream.java
index 4e51569b6..2a3da086c 100644
--- a/src/com/fsck/k9/mail/transport/StatusOutputStream.java
+++ b/src/com/fsck/k9/mail/transport/StatusOutputStream.java
@@ -1,10 +1,10 @@
-package com.android.email.mail.transport;
+package com.fsck.k9.mail.transport;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.android.email.Email;
+import com.fsck.k9.Email;
 
 import android.util.Config;
 import android.util.Log;
diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/src/com/fsck/k9/provider/AttachmentProvider.java
index 95136fa10..81df530c6 100644
--- a/src/com/fsck/k9/provider/AttachmentProvider.java
+++ b/src/com/fsck/k9/provider/AttachmentProvider.java
@@ -1,4 +1,4 @@
-package com.android.email.provider;
+package com.fsck.k9.provider;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -21,16 +21,16 @@ import android.provider.OpenableColumns;
 import android.util.Config;
 import android.util.Log;
 
-import com.android.email.Account;
-import com.android.email.Email;
-import com.android.email.Utility;
-import com.android.email.mail.internet.MimeUtility;
+import com.fsck.k9.Account;
+import com.fsck.k9.Email;
+import com.fsck.k9.Utility;
+import com.fsck.k9.mail.internet.MimeUtility;
 
 /*
  * A simple ContentProvider that allows file access to Email's attachments.
  */
 public class AttachmentProvider extends ContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse( "content://com.android.email.attachmentprovider");
+    public static final Uri CONTENT_URI = Uri.parse( "content://com.fsck.k9.attachmentprovider");
 
     private static final String FORMAT_RAW = "RAW";
     private static final String FORMAT_THUMBNAIL = "THUMBNAIL";
diff --git a/src/com/fsck/k9/service/BootReceiver.java b/src/com/fsck/k9/service/BootReceiver.java
index 3867eb574..19714e34e 100644
--- a/src/com/fsck/k9/service/BootReceiver.java
+++ b/src/com/fsck/k9/service/BootReceiver.java
@@ -1,7 +1,7 @@
 
-package com.android.email.service;
+package com.fsck.k9.service;
 
-import com.android.email.MessagingController;
+import com.fsck.k9.MessagingController;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/fsck/k9/service/MailService.java b/src/com/fsck/k9/service/MailService.java
index a41171420..3879548c7 100644
--- a/src/com/fsck/k9/service/MailService.java
+++ b/src/com/fsck/k9/service/MailService.java
@@ -1,5 +1,5 @@
 
-package com.android.email.service;
+package com.fsck.k9.service;
 
 import java.util.HashMap;
 
@@ -17,21 +17,21 @@ import android.util.Log;
 import android.text.TextUtils;
 import android.net.Uri;
 
-import com.android.email.Account;
-import com.android.email.Email;
-import com.android.email.MessagingController;
-import com.android.email.MessagingListener;
-import com.android.email.Preferences;
-import com.android.email.R;
-import com.android.email.activity.Accounts;
-import com.android.email.activity.FolderMessageList;
+import com.fsck.k9.Account;
+import com.fsck.k9.Email;
+import com.fsck.k9.MessagingController;
+import com.fsck.k9.MessagingListener;
+import com.fsck.k9.Preferences;
+import com.fsck.k9.R;
+import com.fsck.k9.activity.Accounts;
+import com.fsck.k9.activity.FolderMessageList;
 
 /**
  */
 public class MailService extends Service {
-    private static final String ACTION_CHECK_MAIL = "com.android.email.intent.action.MAIL_SERVICE_WAKEUP";
-    private static final String ACTION_RESCHEDULE = "com.android.email.intent.action.MAIL_SERVICE_RESCHEDULE";
-    private static final String ACTION_CANCEL = "com.android.email.intent.action.MAIL_SERVICE_CANCEL";
+    private static final String ACTION_CHECK_MAIL = "com.fsck.k9.intent.action.MAIL_SERVICE_WAKEUP";
+    private static final String ACTION_RESCHEDULE = "com.fsck.k9.intent.action.MAIL_SERVICE_RESCHEDULE";
+    private static final String ACTION_CANCEL = "com.fsck.k9.intent.action.MAIL_SERVICE_CANCEL";
 
     private Listener mListener = new Listener();
 
@@ -88,7 +88,7 @@ public class MailService extends Service {
     private void cancel() {
         AlarmManager alarmMgr = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
         Intent i = new Intent();
-        i.setClassName("com.android.email", "com.android.email.service.MailService");
+        i.setClassName("com.fsck.k9", "com.fsck.k9.service.MailService");
         i.setAction(ACTION_CHECK_MAIL);
         PendingIntent pi = PendingIntent.getService(this, 0, i, 0);
         alarmMgr.cancel(pi);
@@ -97,7 +97,7 @@ public class MailService extends Service {
     private void reschedule() {
         AlarmManager alarmMgr = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
         Intent i = new Intent();
-        i.setClassName("com.android.email", "com.android.email.service.MailService");
+        i.setClassName("com.fsck.k9", "com.fsck.k9.service.MailService");
         i.setAction(ACTION_CHECK_MAIL);
         PendingIntent pi = PendingIntent.getService(this, 0, i, 0);