From 1bd74ad263ac63e024a705d0d3b2711adfb2afa9 Mon Sep 17 00:00:00 2001
From: Jan Berkel <jan.berkel@gmail.com>
Date: Sat, 20 Dec 2014 03:03:06 +0100
Subject: [PATCH] Move settings to the right place

---
 src/com/fsck/k9/mail/store/imap/ImapConnection.java           | 1 -
 .../fsck/k9/mail/{transport => store}/imap/ImapSettings.java  | 4 ++--
 src/com/fsck/k9/mail/store/imap/ImapStore.java                | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename src/com/fsck/k9/mail/{transport => store}/imap/ImapSettings.java (91%)

diff --git a/src/com/fsck/k9/mail/store/imap/ImapConnection.java b/src/com/fsck/k9/mail/store/imap/ImapConnection.java
index 77da82b66..88482c4b6 100644
--- a/src/com/fsck/k9/mail/store/imap/ImapConnection.java
+++ b/src/com/fsck/k9/mail/store/imap/ImapConnection.java
@@ -14,7 +14,6 @@ import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.filter.Base64;
 import com.fsck.k9.mail.filter.PeekableInputStream;
 import com.fsck.k9.mail.ssl.TrustedSocketFactory;
-import com.fsck.k9.mail.transport.imap.ImapSettings;
 import com.jcraft.jzlib.JZlib;
 import com.jcraft.jzlib.ZOutputStream;
 
diff --git a/src/com/fsck/k9/mail/transport/imap/ImapSettings.java b/src/com/fsck/k9/mail/store/imap/ImapSettings.java
similarity index 91%
rename from src/com/fsck/k9/mail/transport/imap/ImapSettings.java
rename to src/com/fsck/k9/mail/store/imap/ImapSettings.java
index 115477840..d59aba2b6 100644
--- a/src/com/fsck/k9/mail/transport/imap/ImapSettings.java
+++ b/src/com/fsck/k9/mail/store/imap/ImapSettings.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.transport.imap;
+package com.fsck.k9.mail.store.imap;
 
 import com.fsck.k9.mail.AuthType;
 import com.fsck.k9.mail.ConnectionSecurity;
@@ -7,7 +7,7 @@ import com.fsck.k9.mail.store.imap.ImapStore;
 /**
  * Settings source for IMAP. Implemented in order to remove coupling between {@link ImapStore} and {@link com.fsck.k9.mail.store.ImapConnection}.
  */
-public interface ImapSettings {
+interface ImapSettings {
     String getHost();
 
     int getPort();
diff --git a/src/com/fsck/k9/mail/store/imap/ImapStore.java b/src/com/fsck/k9/mail/store/imap/ImapStore.java
index 6bf42431e..9600cb053 100644
--- a/src/com/fsck/k9/mail/store/imap/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/imap/ImapStore.java
@@ -63,7 +63,6 @@ import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.ssl.TrustedSocketFactory;
 import com.fsck.k9.mail.store.RemoteStore;
 import com.fsck.k9.mail.store.StoreConfig;
-import com.fsck.k9.mail.transport.imap.ImapSettings;
 
 import com.beetstra.jutf7.CharsetProvider;