moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Move SSL code into package

This commit is contained in:
Jan Berkel 2014-12-12 12:34:57 +00:00
parent 2536719749
commit 9f16b9f465
10 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/fsck/k9/Preferences.java
View File

@ -13,7 +13,6 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;
import com.fsck.k9.mail.Store;
import com.fsck.k9.mail.store.local.LocalStore;
import com.fsck.k9.preferences.Editor;
import com.fsck.k9.preferences.Storage;

4
src/com/fsck/k9/net/ssl/KeyChainKeyManager.java → src/com/fsck/k9/mail/ssl/KeyChainKeyManager.java
View File

@ -1,5 +1,5 @@
package com.fsck.k9.net.ssl;
package com.fsck.k9.mail.ssl;
import java.net.Socket;
import java.security.Principal;
@ -29,7 +29,7 @@ import com.fsck.k9.mail.MessagingException;
* For client certificate authentication! Provide private keys and certificates
* during the TLS handshake using the Android 4.0 KeyChain API.
*/
public class KeyChainKeyManager extends X509ExtendedKeyManager {
class KeyChainKeyManager extends X509ExtendedKeyManager {
private static PrivateKey sClientCertificateReferenceWorkaround;

2
src/com/fsck/k9/net/ssl/TrustManagerFactory.java → src/com/fsck/k9/mail/ssl/TrustManagerFactory.java
View File

@ -1,5 +1,5 @@
package com.fsck.k9.net.ssl;
package com.fsck.k9.mail.ssl;
import android.util.Log;

2
src/com/fsck/k9/net/ssl/TrustedSocketFactory.java → src/com/fsck/k9/mail/ssl/TrustedSocketFactory.java
View File

@ -1,4 +1,4 @@
package com.fsck.k9.net.ssl;
package com.fsck.k9.mail.ssl;
import android.util.Log;

2
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -90,7 +90,7 @@ 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.TrustedSocketFactory;
import com.fsck.k9.mail.ssl.TrustedSocketFactory;
import com.beetstra.jutf7.CharsetProvider;
import com.jcraft.jzlib.JZlib;

2
src/com/fsck/k9/mail/store/Pop3Store.java
View File

@ -12,7 +12,7 @@ import com.fsck.k9.mail.*;
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.net.ssl.TrustedSocketFactory;
import com.fsck.k9.mail.ssl.TrustedSocketFactory;
import javax.net.ssl.SSLException;

2
src/com/fsck/k9/mail/store/WebDavSocketFactory.java
View File

@ -4,7 +4,7 @@ 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 com.fsck.k9.mail.ssl.TrustManagerFactory;
import java.io.IOException;
import java.net.InetAddress;

79
src/com/fsck/k9/mail/store/local/LocalStore.java
View File

@ -1,6 +1,40 @@
package com.fsck.k9.mail.store.local;
import android.app.Application;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.text.TextUtils;
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;
import com.fsck.k9.mail.Folder;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.Store;
import com.fsck.k9.mail.store.RemoteStore;
import com.fsck.k9.mail.store.StorageManager;
import com.fsck.k9.mail.store.StorageManager.StorageProvider;
import com.fsck.k9.mail.store.StoreConfig;
import com.fsck.k9.mail.store.UnavailableStorageException;
import com.fsck.k9.mail.store.local.LockableDatabase.DbCallback;
import com.fsck.k9.mail.store.local.LockableDatabase.WrappedException;
import com.fsck.k9.provider.EmailProvider;
import com.fsck.k9.provider.EmailProvider.MessageColumns;
import com.fsck.k9.search.LocalSearch;
import com.fsck.k9.search.SearchSpecification.Attribute;
import com.fsck.k9.search.SearchSpecification.Searchfield;
import com.fsck.k9.search.SqlQueryBuilder;
import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
@ -13,41 +47,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import android.app.Application;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.text.TextUtils;
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;
import com.fsck.k9.mail.Folder;
import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.Store;
import com.fsck.k9.mail.store.RemoteStore;
import com.fsck.k9.mail.store.StoreConfig;
import com.fsck.k9.mail.store.local.LockableDatabase.DbCallback;
import com.fsck.k9.mail.store.local.LockableDatabase.WrappedException;
import com.fsck.k9.mail.store.StorageManager;
import com.fsck.k9.mail.store.StorageManager.StorageProvider;
import com.fsck.k9.mail.store.UnavailableStorageException;
import com.fsck.k9.provider.EmailProvider;
import com.fsck.k9.provider.EmailProvider.MessageColumns;
import com.fsck.k9.search.LocalSearch;
import com.fsck.k9.search.SearchSpecification.Attribute;
import com.fsck.k9.search.SearchSpecification.Searchfield;
import com.fsck.k9.search.SqlQueryBuilder;
/**
* <pre>
* Implements a SQLite database backed local store for Messages.
@ -209,17 +208,17 @@ public class LocalStore extends Store implements Serializable {
}
}
public static void removeAccount(StoreConfig storeConfig) {
public static void removeAccount(Account account) {
try {
RemoteStore.removeInstance(storeConfig);
RemoteStore.removeInstance(account);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Failed to reset remote store for account " + storeConfig.getUuid(), e);
Log.e(K9.LOG_TAG, "Failed to reset remote store for account " + account.getUuid(), e);
}
try {
removeInstance(storeConfig);
removeInstance(account);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Failed to reset local store for account " + storeConfig.getUuid(), e);
Log.e(K9.LOG_TAG, "Failed to reset local store for account " + account.getUuid(), e);
}
}

2
src/com/fsck/k9/mail/transport/SmtpTransport.java
View File

@ -17,7 +17,7 @@ import com.fsck.k9.mail.filter.SmtpDataStuffing;
import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mail.store.StoreConfig;
import com.fsck.k9.mail.store.local.LocalMessage;
import com.fsck.k9.net.ssl.TrustedSocketFactory;
import com.fsck.k9.mail.ssl.TrustedSocketFactory;
import javax.net.ssl.SSLException;

3
tests/src/com/fsck/k9/net/ssl/TrustManagerFactoryTest.java → tests/src/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java
View File

@ -1,7 +1,8 @@
package com.fsck.k9.net.ssl;
package com.fsck.k9.mail.ssl;
import javax.net.ssl.X509TrustManager;
import com.fsck.k9.mail.ssl.TrustManagerFactory;
import com.fsck.k9.security.LocalKeyStore;
import java.io.ByteArrayInputStream;