From 708fb57c0462ca62feae824b36126522ad3124c6 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Fri, 12 Dec 2014 12:49:26 +0000 Subject: [PATCH] Move things into local --- src/com/fsck/k9/controller/MessagingController.java | 2 ++ src/com/fsck/k9/mail/Folder.java | 2 +- src/com/fsck/k9/mail/store/ImapStore.java | 2 +- src/com/fsck/k9/mail/store/Pop3Store.java | 2 +- src/com/fsck/k9/mail/store/WebDavStore.java | 2 +- src/com/fsck/k9/mail/store/local/LocalFolder.java | 2 -- src/com/fsck/k9/mail/store/local/LocalStore.java | 1 - .../store/local}/MessageRemovalListener.java | 2 +- .../store/local}/MessageRetrievalListener.java | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) rename src/com/fsck/k9/{controller => mail/store/local}/MessageRemovalListener.java (77%) rename src/com/fsck/k9/{controller => mail/store/local}/MessageRetrievalListener.java (92%) diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index e8cbb048a..458c713c7 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -81,6 +81,8 @@ 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.mail.store.local.MessageRemovalListener; +import com.fsck.k9.mail.store.local.MessageRetrievalListener; import com.fsck.k9.mail.store.local.LocalFolder; import com.fsck.k9.mail.store.local.LocalMessage; import com.fsck.k9.mail.store.local.LocalStore; diff --git a/src/com/fsck/k9/mail/Folder.java b/src/com/fsck/k9/mail/Folder.java index d8bf087a6..c4f1a3998 100644 --- a/src/com/fsck/k9/mail/Folder.java +++ b/src/com/fsck/k9/mail/Folder.java @@ -8,7 +8,7 @@ import java.util.Set; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.controller.MessageRetrievalListener; +import com.fsck.k9.mail.store.local.MessageRetrievalListener; public abstract class Folder { private String status = null; diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java index 542f78b83..b8be10039 100644 --- a/src/com/fsck/k9/mail/store/ImapStore.java +++ b/src/com/fsck/k9/mail/store/ImapStore.java @@ -57,7 +57,6 @@ import android.util.Log; import com.fsck.k9.K9; import com.fsck.k9.R; -import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.helper.UrlEncodingHelper; import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.power.TracingPowerManager; @@ -72,6 +71,7 @@ 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.store.local.MessageRetrievalListener; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.PushReceiver; diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java index e0b290c76..0871579b1 100644 --- a/src/com/fsck/k9/mail/store/Pop3Store.java +++ b/src/com/fsck/k9/mail/store/Pop3Store.java @@ -5,7 +5,6 @@ import android.util.Log; import com.fsck.k9.K9; import com.fsck.k9.R; -import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.helper.UrlEncodingHelper; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; @@ -13,6 +12,7 @@ import com.fsck.k9.mail.filter.Base64; import com.fsck.k9.mail.filter.Hex; import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.ssl.TrustedSocketFactory; +import com.fsck.k9.mail.store.local.MessageRetrievalListener; import javax.net.ssl.SSLException; diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index 61dba1088..300a68d18 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -3,13 +3,13 @@ package com.fsck.k9.mail.store; import android.util.Log; import com.fsck.k9.K9; -import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.helper.UrlEncodingHelper; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.*; import com.fsck.k9.mail.filter.EOLConvertingOutputStream; import com.fsck.k9.mail.internet.MimeMessage; +import com.fsck.k9.mail.store.local.MessageRetrievalListener; import org.apache.commons.io.IOUtils; import org.apache.http.*; diff --git a/src/com/fsck/k9/mail/store/local/LocalFolder.java b/src/com/fsck/k9/mail/store/local/LocalFolder.java index 22c3674ee..d4273d03f 100644 --- a/src/com/fsck/k9/mail/store/local/LocalFolder.java +++ b/src/com/fsck/k9/mail/store/local/LocalFolder.java @@ -32,8 +32,6 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.Account.MessageFormat; import com.fsck.k9.activity.Search; -import com.fsck.k9.controller.MessageRemovalListener; -import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.helper.HtmlConverter; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.Address; diff --git a/src/com/fsck/k9/mail/store/local/LocalStore.java b/src/com/fsck/k9/mail/store/local/LocalStore.java index 0dded3e3f..64bacb2ef 100644 --- a/src/com/fsck/k9/mail/store/local/LocalStore.java +++ b/src/com/fsck/k9/mail/store/local/LocalStore.java @@ -14,7 +14,6 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.Preferences; -import com.fsck.k9.controller.MessageRetrievalListener; import com.fsck.k9.helper.UrlEncodingHelper; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.Flag; diff --git a/src/com/fsck/k9/controller/MessageRemovalListener.java b/src/com/fsck/k9/mail/store/local/MessageRemovalListener.java similarity index 77% rename from src/com/fsck/k9/controller/MessageRemovalListener.java rename to src/com/fsck/k9/mail/store/local/MessageRemovalListener.java index 38973dde4..95e35fd22 100644 --- a/src/com/fsck/k9/controller/MessageRemovalListener.java +++ b/src/com/fsck/k9/mail/store/local/MessageRemovalListener.java @@ -1,4 +1,4 @@ -package com.fsck.k9.controller; +package com.fsck.k9.mail.store.local; import com.fsck.k9.mail.Message; diff --git a/src/com/fsck/k9/controller/MessageRetrievalListener.java b/src/com/fsck/k9/mail/store/local/MessageRetrievalListener.java similarity index 92% rename from src/com/fsck/k9/controller/MessageRetrievalListener.java rename to src/com/fsck/k9/mail/store/local/MessageRetrievalListener.java index 6af8714af..12679b4e5 100644 --- a/src/com/fsck/k9/controller/MessageRetrievalListener.java +++ b/src/com/fsck/k9/mail/store/local/MessageRetrievalListener.java @@ -1,5 +1,5 @@ -package com.fsck.k9.controller; +package com.fsck.k9.mail.store.local; import com.fsck.k9.mail.Message;