diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index 46f5c5d62..e86ee07a1 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -32,9 +32,9 @@ import com.fsck.k9.mail.Folder.FolderClass; import com.fsck.k9.mail.filter.Base64; import com.fsck.k9.mail.store.RemoteStore; import com.fsck.k9.mail.store.StoreConfig; -import com.fsck.k9.local.StorageManager; -import com.fsck.k9.local.StorageManager.StorageProvider; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.StorageManager; +import com.fsck.k9.mailstore.StorageManager.StorageProvider; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.provider.EmailProvider; import com.fsck.k9.provider.EmailProvider.StatsColumns; import com.fsck.k9.search.ConditionsTreeNode; diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index 7e062d5f9..b565ffc8c 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -36,7 +36,7 @@ import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.BinaryTempFileBody; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.provider.UnreadWidgetProvider; import com.fsck.k9.mail.ssl.LocalKeyStore; import com.fsck.k9.service.BootReceiver; diff --git a/src/com/fsck/k9/Preferences.java b/src/com/fsck/k9/Preferences.java index a5c0cd4bc..016928eb0 100644 --- a/src/com/fsck/k9/Preferences.java +++ b/src/com/fsck/k9/Preferences.java @@ -13,7 +13,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.util.Log; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.preferences.Editor; import com.fsck.k9.preferences.Storage; diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java index c2a0ec21b..0a7041165 100644 --- a/src/com/fsck/k9/activity/Accounts.java +++ b/src/com/fsck/k9/activity/Accounts.java @@ -80,7 +80,7 @@ import com.fsck.k9.mail.ServerSettings; import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.internet.MimeUtility; import com.fsck.k9.mail.store.RemoteStore; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.StorageManager; import com.fsck.k9.mail.store.WebDavStore; import com.fsck.k9.preferences.SettingsExporter; import com.fsck.k9.preferences.SettingsImportExportException; diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java index d1d7c17e4..254b87745 100644 --- a/src/com/fsck/k9/activity/FolderList.java +++ b/src/com/fsck/k9/activity/FolderList.java @@ -55,7 +55,7 @@ import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; -import com.fsck.k9.local.LocalFolder; +import com.fsck.k9.mailstore.LocalFolder; import com.fsck.k9.search.LocalSearch; import com.fsck.k9.search.SearchSpecification.Attribute; import com.fsck.k9.search.SearchSpecification.Searchfield; diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index d9f489052..30f3e11cb 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -109,10 +109,10 @@ 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.internet.TextBodyBuilder; -import com.fsck.k9.local.LocalAttachmentBody; -import com.fsck.k9.local.LocalMessage; -import com.fsck.k9.local.TempFileBody; -import com.fsck.k9.local.TempFileMessageBody; +import com.fsck.k9.mailstore.LocalAttachmentBody; +import com.fsck.k9.mailstore.LocalMessage; +import com.fsck.k9.mailstore.TempFileBody; +import com.fsck.k9.mailstore.TempFileMessageBody; import com.fsck.k9.view.MessageWebView; import org.apache.james.mime4j.codec.EncoderUtil; diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/src/com/fsck/k9/activity/MessageInfoHolder.java index 379543525..09708fbe6 100644 --- a/src/com/fsck/k9/activity/MessageInfoHolder.java +++ b/src/com/fsck/k9/activity/MessageInfoHolder.java @@ -2,7 +2,7 @@ package com.fsck.k9.activity; import java.util.Date; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalMessage; public class MessageInfoHolder { public String date; diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index ebfb3ef3b..569753f7b 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -42,8 +42,8 @@ import com.fsck.k9.fragment.MessageListFragment; import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener; import com.fsck.k9.fragment.MessageViewFragment; import com.fsck.k9.fragment.MessageViewFragment.MessageViewFragmentListener; -import com.fsck.k9.local.StorageManager; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.StorageManager; +import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.search.LocalSearch; import com.fsck.k9.search.SearchAccount; import com.fsck.k9.search.SearchSpecification; diff --git a/src/com/fsck/k9/activity/MessageReference.java b/src/com/fsck/k9/activity/MessageReference.java index 0ba73a0c2..131b0715a 100644 --- a/src/com/fsck/k9/activity/MessageReference.java +++ b/src/com/fsck/k9/activity/MessageReference.java @@ -10,8 +10,8 @@ import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.MessagingException; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.mail.filter.Base64; import java.util.StringTokenizer; diff --git a/src/com/fsck/k9/activity/UpgradeDatabases.java b/src/com/fsck/k9/activity/UpgradeDatabases.java index f5b2b9754..ae8cd6fd7 100644 --- a/src/com/fsck/k9/activity/UpgradeDatabases.java +++ b/src/com/fsck/k9/activity/UpgradeDatabases.java @@ -30,7 +30,7 @@ import android.widget.TextView; *
  • {@link #actionUpgradeDatabases(Context, Intent)} will call {@link K9#areDatabasesUpToDate()} * to check if we already know whether the databases have been upgraded.
    • *
  • {@link K9#areDatabasesUpToDate()} will compare the last known database version stored in a - * {@link SharedPreferences} file to {@link com.fsck.k9.local.LocalStore#DB_VERSION}. This + * {@link SharedPreferences} file to {@link com.fsck.k9.mailstore.LocalStore#DB_VERSION}. This * is done as an optimization because it's faster than opening all of the accounts' databases * one by one.
    • *
  • If there was an error reading the cached database version or if it shows the databases need diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index 2eac23514..c6ee715de 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -36,8 +36,8 @@ import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.activity.ManageIdentities; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Store; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.StorageManager; import com.fsck.k9.service.MailService; import org.openintents.openpgp.util.OpenPgpListPreference; diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/src/com/fsck/k9/activity/setup/FolderSettings.java index af9ab8b67..737e2ffc3 100644 --- a/src/com/fsck/k9/activity/setup/FolderSettings.java +++ b/src/com/fsck/k9/activity/setup/FolderSettings.java @@ -16,8 +16,8 @@ import com.fsck.k9.mail.Folder.FolderClass; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Store; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.service.MailService; public class FolderSettings extends K9PreferenceActivity { diff --git a/src/com/fsck/k9/cache/EmailProviderCache.java b/src/com/fsck/k9/cache/EmailProviderCache.java index a37f66acd..81b785997 100644 --- a/src/com/fsck/k9/cache/EmailProviderCache.java +++ b/src/com/fsck/k9/cache/EmailProviderCache.java @@ -11,8 +11,8 @@ import android.support.v4.content.LocalBroadcastManager; import com.fsck.k9.fragment.MessageListFragment; import com.fsck.k9.mail.Message; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.provider.EmailProvider; /** diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index c95748874..1e7e98885 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -81,14 +81,14 @@ import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.internet.MimeUtility; import com.fsck.k9.mail.internet.TextBody; -import com.fsck.k9.local.MessageRemovalListener; +import com.fsck.k9.mailstore.MessageRemovalListener; import com.fsck.k9.mail.MessageRetrievalListener; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalMessage; -import com.fsck.k9.local.LocalStore; -import com.fsck.k9.local.LocalStore.PendingCommand; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalMessage; +import com.fsck.k9.mailstore.LocalStore; +import com.fsck.k9.mailstore.LocalStore.PendingCommand; import com.fsck.k9.mail.store.Pop3Store; -import com.fsck.k9.local.UnavailableStorageException; +import com.fsck.k9.mailstore.UnavailableStorageException; import com.fsck.k9.provider.EmailProvider; import com.fsck.k9.provider.EmailProvider.StatsColumns; import com.fsck.k9.search.ConditionsTreeNode; diff --git a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java index d99f5feb1..3bdec8c22 100644 --- a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java +++ b/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java @@ -11,8 +11,8 @@ import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.PushReceiver; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.service.SleepService; import java.util.List; diff --git a/src/com/fsck/k9/controller/MessagingListener.java b/src/com/fsck/k9/controller/MessagingListener.java index a0396b535..72bd93d18 100644 --- a/src/com/fsck/k9/controller/MessagingListener.java +++ b/src/com/fsck/k9/controller/MessagingListener.java @@ -11,7 +11,7 @@ import com.fsck.k9.BaseAccount; import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Part; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalMessage; /** * Defines the interface that {@link MessagingController} will use to callback to requesters. diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java index 46760b3fa..f697b6f2e 100644 --- a/src/com/fsck/k9/fragment/MessageListFragment.java +++ b/src/com/fsck/k9/fragment/MessageListFragment.java @@ -88,9 +88,9 @@ 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.local.LocalFolder; -import com.fsck.k9.local.LocalMessage; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalMessage; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.provider.EmailProvider; import com.fsck.k9.provider.EmailProvider.MessageColumns; import com.fsck.k9.provider.EmailProvider.SpecialColumns; diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java index 5ffee961a..961a38555 100644 --- a/src/com/fsck/k9/fragment/MessageViewFragment.java +++ b/src/com/fsck/k9/fragment/MessageViewFragment.java @@ -38,7 +38,7 @@ import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.view.AttachmentView; import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; import com.fsck.k9.view.MessageHeader; diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java index 5e88d3b5e..55caf8f66 100644 --- a/src/com/fsck/k9/helper/MessageHelper.java +++ b/src/com/fsck/k9/helper/MessageHelper.java @@ -13,7 +13,7 @@ import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Message.RecipientType; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalMessage; public class MessageHelper { diff --git a/src/com/fsck/k9/local/AttachmentMessageBodyUtil.java b/src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java similarity index 97% rename from src/com/fsck/k9/local/AttachmentMessageBodyUtil.java rename to src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java index 97a8a2394..71fc418d6 100644 --- a/src/com/fsck/k9/local/AttachmentMessageBodyUtil.java +++ b/src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/local/BinaryAttachmentBody.java b/src/com/fsck/k9/mailstore/BinaryAttachmentBody.java similarity index 98% rename from src/com/fsck/k9/local/BinaryAttachmentBody.java rename to src/com/fsck/k9/mailstore/BinaryAttachmentBody.java index 466f6e57f..ecf40c75f 100644 --- a/src/com/fsck/k9/local/BinaryAttachmentBody.java +++ b/src/com/fsck/k9/mailstore/BinaryAttachmentBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.IOException; import java.io.InputStream; diff --git a/src/com/fsck/k9/local/LocalAttachmentBody.java b/src/com/fsck/k9/mailstore/LocalAttachmentBody.java similarity index 97% rename from src/com/fsck/k9/local/LocalAttachmentBody.java rename to src/com/fsck/k9/mailstore/LocalAttachmentBody.java index acfbe7980..0accef810 100644 --- a/src/com/fsck/k9/local/LocalAttachmentBody.java +++ b/src/com/fsck/k9/mailstore/LocalAttachmentBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; diff --git a/src/com/fsck/k9/local/LocalAttachmentBodyPart.java b/src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java similarity index 96% rename from src/com/fsck/k9/local/LocalAttachmentBodyPart.java rename to src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java index 7d5a19798..ab6eae968 100644 --- a/src/com/fsck/k9/local/LocalAttachmentBodyPart.java +++ b/src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import com.fsck.k9.mail.Body; import com.fsck.k9.mail.MessagingException; diff --git a/src/com/fsck/k9/local/LocalAttachmentMessageBody.java b/src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java similarity index 97% rename from src/com/fsck/k9/local/LocalAttachmentMessageBody.java rename to src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java index 6dc632495..bd0a4329f 100644 --- a/src/com/fsck/k9/local/LocalAttachmentMessageBody.java +++ b/src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/fsck/k9/local/LocalFolder.java b/src/com/fsck/k9/mailstore/LocalFolder.java similarity index 99% rename from src/com/fsck/k9/local/LocalFolder.java rename to src/com/fsck/k9/mailstore/LocalFolder.java index 9fa2bcc79..edf81d931 100644 --- a/src/com/fsck/k9/local/LocalFolder.java +++ b/src/com/fsck/k9/mailstore/LocalFolder.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.File; import java.io.FileOutputStream; @@ -52,8 +52,8 @@ 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.internet.MimeUtility.ViewableContainer; -import com.fsck.k9.local.LockableDatabase.DbCallback; -import com.fsck.k9.local.LockableDatabase.WrappedException; +import com.fsck.k9.mailstore.LockableDatabase.DbCallback; +import com.fsck.k9.mailstore.LockableDatabase.WrappedException; import com.fsck.k9.provider.AttachmentProvider; public class LocalFolder extends Folder implements Serializable { diff --git a/src/com/fsck/k9/local/LocalMessage.java b/src/com/fsck/k9/mailstore/LocalMessage.java similarity index 99% rename from src/com/fsck/k9/local/LocalMessage.java rename to src/com/fsck/k9/mailstore/LocalMessage.java index 292be2c51..464a6b1e9 100644 --- a/src/com/fsck/k9/local/LocalMessage.java +++ b/src/com/fsck/k9/mailstore/LocalMessage.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.IOException; import java.io.OutputStream; @@ -22,8 +22,8 @@ import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.internet.MimeUtility; -import com.fsck.k9.local.LockableDatabase.DbCallback; -import com.fsck.k9.local.LockableDatabase.WrappedException; +import com.fsck.k9.mailstore.LockableDatabase.DbCallback; +import com.fsck.k9.mailstore.LockableDatabase.WrappedException; public class LocalMessage extends MimeMessage { protected MessageReference mReference; diff --git a/src/com/fsck/k9/local/LocalStore.java b/src/com/fsck/k9/mailstore/LocalStore.java similarity index 99% rename from src/com/fsck/k9/local/LocalStore.java rename to src/com/fsck/k9/mailstore/LocalStore.java index a7ec36f51..45ce9ad42 100644 --- a/src/com/fsck/k9/local/LocalStore.java +++ b/src/com/fsck/k9/mailstore/LocalStore.java @@ -1,5 +1,5 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import android.app.Application; import android.content.ContentResolver; @@ -22,10 +22,10 @@ import com.fsck.k9.mail.MessageRetrievalListener; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Store; import com.fsck.k9.mail.store.RemoteStore; -import com.fsck.k9.local.StorageManager.StorageProvider; +import com.fsck.k9.mailstore.StorageManager.StorageProvider; import com.fsck.k9.mail.store.StoreConfig; -import com.fsck.k9.local.LockableDatabase.DbCallback; -import com.fsck.k9.local.LockableDatabase.WrappedException; +import com.fsck.k9.mailstore.LockableDatabase.DbCallback; +import com.fsck.k9.mailstore.LockableDatabase.WrappedException; import com.fsck.k9.provider.EmailProvider; import com.fsck.k9.provider.EmailProvider.MessageColumns; import com.fsck.k9.search.LocalSearch; diff --git a/src/com/fsck/k9/local/LocalTextBody.java b/src/com/fsck/k9/mailstore/LocalTextBody.java similarity index 93% rename from src/com/fsck/k9/local/LocalTextBody.java rename to src/com/fsck/k9/mailstore/LocalTextBody.java index b40d79b8e..57c4963cf 100644 --- a/src/com/fsck/k9/local/LocalTextBody.java +++ b/src/com/fsck/k9/mailstore/LocalTextBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import com.fsck.k9.mail.internet.TextBody; diff --git a/src/com/fsck/k9/local/LockableDatabase.java b/src/com/fsck/k9/mailstore/LockableDatabase.java similarity index 99% rename from src/com/fsck/k9/local/LockableDatabase.java rename to src/com/fsck/k9/mailstore/LockableDatabase.java index 62f013953..f7c0a2258 100644 --- a/src/com/fsck/k9/local/LockableDatabase.java +++ b/src/com/fsck/k9/mailstore/LockableDatabase.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.File; import java.util.concurrent.locks.Lock; @@ -34,7 +34,7 @@ public class LockableDatabase { * @return Any relevant data. Can be null. * @throws WrappedException * @throws com.fsck.k9.mail.MessagingException - * @throws com.fsck.k9.local.UnavailableStorageException + * @throws com.fsck.k9.mailstore.UnavailableStorageException */ T doDbWork(SQLiteDatabase db) throws WrappedException, MessagingException; } diff --git a/src/com/fsck/k9/local/MessageRemovalListener.java b/src/com/fsck/k9/mailstore/MessageRemovalListener.java similarity index 80% rename from src/com/fsck/k9/local/MessageRemovalListener.java rename to src/com/fsck/k9/mailstore/MessageRemovalListener.java index 3f4d47d0e..51ad9a15e 100644 --- a/src/com/fsck/k9/local/MessageRemovalListener.java +++ b/src/com/fsck/k9/mailstore/MessageRemovalListener.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import com.fsck.k9.mail.Message; diff --git a/src/com/fsck/k9/local/StorageManager.java b/src/com/fsck/k9/mailstore/StorageManager.java similarity index 99% rename from src/com/fsck/k9/local/StorageManager.java rename to src/com/fsck/k9/mailstore/StorageManager.java index 20676d720..3aaf663dc 100644 --- a/src/com/fsck/k9/local/StorageManager.java +++ b/src/com/fsck/k9/mailstore/StorageManager.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.File; import java.io.IOException; diff --git a/src/com/fsck/k9/local/StoreSchemaDefinition.java b/src/com/fsck/k9/mailstore/StoreSchemaDefinition.java similarity index 99% rename from src/com/fsck/k9/local/StoreSchemaDefinition.java rename to src/com/fsck/k9/mailstore/StoreSchemaDefinition.java index c893e5888..f9e786dba 100644 --- a/src/com/fsck/k9/local/StoreSchemaDefinition.java +++ b/src/com/fsck/k9/mailstore/StoreSchemaDefinition.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.util.ArrayList; import java.util.List; diff --git a/src/com/fsck/k9/local/TempFileBody.java b/src/com/fsck/k9/mailstore/TempFileBody.java similarity index 95% rename from src/com/fsck/k9/local/TempFileBody.java rename to src/com/fsck/k9/mailstore/TempFileBody.java index c687d6082..934b3bd68 100644 --- a/src/com/fsck/k9/local/TempFileBody.java +++ b/src/com/fsck/k9/mailstore/TempFileBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/src/com/fsck/k9/local/TempFileMessageBody.java b/src/com/fsck/k9/mailstore/TempFileMessageBody.java similarity index 97% rename from src/com/fsck/k9/local/TempFileMessageBody.java rename to src/com/fsck/k9/mailstore/TempFileMessageBody.java index 55f6b76e4..c310ae2e4 100644 --- a/src/com/fsck/k9/local/TempFileMessageBody.java +++ b/src/com/fsck/k9/mailstore/TempFileMessageBody.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import java.io.IOException; import java.io.OutputStream; diff --git a/src/com/fsck/k9/local/ThreadInfo.java b/src/com/fsck/k9/mailstore/ThreadInfo.java similarity index 93% rename from src/com/fsck/k9/local/ThreadInfo.java rename to src/com/fsck/k9/mailstore/ThreadInfo.java index cf72dddc1..9f9ee2204 100644 --- a/src/com/fsck/k9/local/ThreadInfo.java +++ b/src/com/fsck/k9/mailstore/ThreadInfo.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; class ThreadInfo { public final long threadId; diff --git a/src/com/fsck/k9/local/UnavailableStorageException.java b/src/com/fsck/k9/mailstore/UnavailableStorageException.java similarity index 96% rename from src/com/fsck/k9/local/UnavailableStorageException.java rename to src/com/fsck/k9/mailstore/UnavailableStorageException.java index d6e1cd69d..d764a0e39 100644 --- a/src/com/fsck/k9/local/UnavailableStorageException.java +++ b/src/com/fsck/k9/mailstore/UnavailableStorageException.java @@ -1,4 +1,4 @@ -package com.fsck.k9.local; +package com.fsck.k9.mailstore; import com.fsck.k9.mail.MessagingException; diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java index 327ff38b2..6bdcb4699 100644 --- a/src/com/fsck/k9/preferences/AccountSettings.java +++ b/src/com/fsck/k9/preferences/AccountSettings.java @@ -13,7 +13,7 @@ import com.fsck.k9.Account.SortType; import com.fsck.k9.K9; import com.fsck.k9.R; import com.fsck.k9.Account.FolderMode; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.StorageManager; import com.fsck.k9.preferences.Settings.*; public class AccountSettings { diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/src/com/fsck/k9/provider/AttachmentProvider.java index 792c8885f..6516f60ef 100644 --- a/src/com/fsck/k9/provider/AttachmentProvider.java +++ b/src/com/fsck/k9/provider/AttachmentProvider.java @@ -15,9 +15,9 @@ import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.MimeUtility; -import com.fsck.k9.local.LocalStore; -import com.fsck.k9.local.LocalStore.AttachmentInfo; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.LocalStore; +import com.fsck.k9.mailstore.LocalStore.AttachmentInfo; +import com.fsck.k9.mailstore.StorageManager; import java.io.*; import java.util.List; diff --git a/src/com/fsck/k9/provider/EmailProvider.java b/src/com/fsck/k9/provider/EmailProvider.java index fb025f46c..d599f4ac7 100644 --- a/src/com/fsck/k9/provider/EmailProvider.java +++ b/src/com/fsck/k9/provider/EmailProvider.java @@ -10,11 +10,11 @@ import com.fsck.k9.Preferences; import com.fsck.k9.cache.EmailProviderCacheCursor; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.MessagingException; -import com.fsck.k9.local.LockableDatabase; -import com.fsck.k9.local.LockableDatabase.DbCallback; -import com.fsck.k9.local.LockableDatabase.WrappedException; -import com.fsck.k9.local.UnavailableStorageException; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LockableDatabase; +import com.fsck.k9.mailstore.LockableDatabase.DbCallback; +import com.fsck.k9.mailstore.LockableDatabase.WrappedException; +import com.fsck.k9.mailstore.UnavailableStorageException; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.search.SqlQueryBuilder; import android.content.ContentProvider; diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java index a02bf5520..4508edf1b 100644 --- a/src/com/fsck/k9/provider/MessageProvider.java +++ b/src/com/fsck/k9/provider/MessageProvider.java @@ -32,9 +32,9 @@ 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.local.LocalFolder; -import com.fsck.k9.local.LocalMessage; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalMessage; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.search.SearchAccount; import java.lang.ref.WeakReference; diff --git a/src/com/fsck/k9/search/SqlQueryBuilder.java b/src/com/fsck/k9/search/SqlQueryBuilder.java index 8286f5d9e..118467301 100644 --- a/src/com/fsck/k9/search/SqlQueryBuilder.java +++ b/src/com/fsck/k9/search/SqlQueryBuilder.java @@ -5,8 +5,8 @@ import java.util.List; import com.fsck.k9.Account; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Folder; -import com.fsck.k9.local.LocalFolder; -import com.fsck.k9.local.LocalStore; +import com.fsck.k9.mailstore.LocalFolder; +import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.search.SearchSpecification.Attribute; import com.fsck.k9.search.SearchSpecification.SearchCondition; import com.fsck.k9.search.SearchSpecification.Searchfield; diff --git a/src/com/fsck/k9/service/DatabaseUpgradeService.java b/src/com/fsck/k9/service/DatabaseUpgradeService.java index 15f0e16f1..d0fe0b5b4 100644 --- a/src/com/fsck/k9/service/DatabaseUpgradeService.java +++ b/src/com/fsck/k9/service/DatabaseUpgradeService.java @@ -17,7 +17,7 @@ import com.fsck.k9.Preferences; import com.fsck.k9.activity.UpgradeDatabases; import com.fsck.k9.helper.power.TracingPowerManager; import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock; -import com.fsck.k9.local.UnavailableStorageException; +import com.fsck.k9.mailstore.UnavailableStorageException; /** * Service used to upgrade the accounts' databases and/or track the progress of the upgrade. diff --git a/src/com/fsck/k9/service/NotificationActionService.java b/src/com/fsck/k9/service/NotificationActionService.java index 96d3cf705..50f14bc15 100644 --- a/src/com/fsck/k9/service/NotificationActionService.java +++ b/src/com/fsck/k9/service/NotificationActionService.java @@ -11,7 +11,7 @@ import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.mail.Flag; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalMessage; import android.app.PendingIntent; import android.content.Context; diff --git a/src/com/fsck/k9/service/StorageGoneReceiver.java b/src/com/fsck/k9/service/StorageGoneReceiver.java index 022ae9b9c..592656f9d 100644 --- a/src/com/fsck/k9/service/StorageGoneReceiver.java +++ b/src/com/fsck/k9/service/StorageGoneReceiver.java @@ -7,7 +7,7 @@ import android.net.Uri; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.StorageManager; /** * That BroadcastReceiver is only interested in UNMOUNT events. diff --git a/src/com/fsck/k9/service/StorageReceiver.java b/src/com/fsck/k9/service/StorageReceiver.java index 1cf116dd6..abf36dd13 100644 --- a/src/com/fsck/k9/service/StorageReceiver.java +++ b/src/com/fsck/k9/service/StorageReceiver.java @@ -7,7 +7,7 @@ import android.net.Uri; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.local.StorageManager; +import com.fsck.k9.mailstore.StorageManager; /** * That BroadcastReceiver is only interested in MOUNT events. diff --git a/src/com/fsck/k9/view/AttachmentView.java b/src/com/fsck/k9/view/AttachmentView.java index 84d0d9ff8..7552c23b5 100644 --- a/src/com/fsck/k9/view/AttachmentView.java +++ b/src/com/fsck/k9/view/AttachmentView.java @@ -43,7 +43,7 @@ import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeHeader; import com.fsck.k9.mail.internet.MimeUtility; -import com.fsck.k9.local.LocalAttachmentBodyPart; +import com.fsck.k9.mailstore.LocalAttachmentBodyPart; import com.fsck.k9.provider.AttachmentProvider; import org.apache.commons.io.IOUtils; diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java index 4747415ef..3ebdd89a3 100644 --- a/src/com/fsck/k9/view/SingleMessageView.java +++ b/src/com/fsck/k9/view/SingleMessageView.java @@ -56,8 +56,8 @@ import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Multipart; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeUtility; -import com.fsck.k9.local.LocalAttachmentBodyPart; -import com.fsck.k9.local.LocalMessage; +import com.fsck.k9.mailstore.LocalAttachmentBodyPart; +import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns; import org.apache.commons.io.IOUtils;