Move some classes out of com.fsck.k9.mail.store

The classes are just as much related to com.fsck.k9.mail.transport
as com.fsck.k9.mail.store, so having them in
com.fsck.k9.mail.store doesn't seem appropriate.

Move LocalKeyStore to com.fsck.k9.security

Move TrustManagerFactory and TrustedSocketFactory to com.fsck.k9.net.ssl

src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java

@@ -22,9 +22,9 @@ import com.fsck.k9.mail.AuthenticationFailedException;
 import com.fsck.k9.mail.CertificateValidationException;
 import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.Transport;
-import com.fsck.k9.mail.store.LocalKeyStore;
 import com.fsck.k9.mail.store.WebDavStore;
 import com.fsck.k9.mail.filter.Hex;
+import com.fsck.k9.security.LocalKeyStore;
 
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateEncodingException;

src/com/fsck/k9/mail/store/ImapStore.java

@@ -96,6 +96,8 @@ import com.fsck.k9.mail.store.ImapResponseParser.ImapList;
 import com.fsck.k9.mail.store.ImapResponseParser.ImapResponse;
 import com.fsck.k9.mail.store.imap.ImapUtility;
 import com.fsck.k9.mail.transport.imap.ImapSettings;
+import com.fsck.k9.net.ssl.TrustManagerFactory;
+import com.fsck.k9.net.ssl.TrustedSocketFactory;
 import com.jcraft.jzlib.JZlib;
 import com.jcraft.jzlib.ZOutputStream;
 

src/com/fsck/k9/mail/store/Pop3Store.java

@@ -10,6 +10,8 @@ import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
 
 import com.fsck.k9.mail.internet.MimeMessage;
+import com.fsck.k9.net.ssl.TrustManagerFactory;
+import com.fsck.k9.net.ssl.TrustedSocketFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;

src/com/fsck/k9/mail/store/WebDavSocketFactory.java

@@ -4,6 +4,8 @@ import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.scheme.LayeredSocketFactory;
 import org.apache.http.params.HttpParams;
 
+import com.fsck.k9.net.ssl.TrustManagerFactory;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;

src/com/fsck/k9/mail/transport/SmtpTransport.java

@@ -12,9 +12,9 @@ import com.fsck.k9.mail.filter.LineWrapOutputStream;
 import com.fsck.k9.mail.filter.PeekableInputStream;
 import com.fsck.k9.mail.filter.SmtpDataStuffing;
 import com.fsck.k9.mail.internet.MimeUtility;
-import com.fsck.k9.mail.store.TrustManagerFactory;
 import com.fsck.k9.mail.store.LocalStore.LocalMessage;
-import com.fsck.k9.mail.store.TrustedSocketFactory;
+import com.fsck.k9.net.ssl.TrustManagerFactory;
+import com.fsck.k9.net.ssl.TrustedSocketFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;

src/com/fsck/k9/net/ssl/TrustManagerFactory.java

@@ -1,9 +1,10 @@
 
-package com.fsck.k9.mail.store;
+package com.fsck.k9.net.ssl;
 
 import android.util.Log;
 import com.fsck.k9.helper.DomainNameChecker;
 import com.fsck.k9.mail.CertificateChainException;
+import com.fsck.k9.security.LocalKeyStore;
 
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;

src/com/fsck/k9/net/ssl/TrustedSocketFactory.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.store;
+package com.fsck.k9.net.ssl;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;

src/com/fsck/k9/security/LocalKeyStore.java

@@ -1,4 +1,4 @@
-package com.fsck.k9.mail.store;
+package com.fsck.k9.security;
 
 import java.io.File;
 import java.io.FileInputStream;

tests/src/com/fsck/k9/mail/store/TrustManagerFactoryTest.java

@@ -1,6 +1,10 @@
 package com.fsck.k9.mail.store;
 
 import javax.net.ssl.X509TrustManager;
+
+import com.fsck.k9.net.ssl.TrustManagerFactory;
+import com.fsck.k9.security.LocalKeyStore;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.security.cert.CertificateException;