moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Eliminate the need to pass a context to LocalKeyStore.getInstance

Browse Source 
Instead, have K9.onCreate initialize the location of the key
store file (similar to what is done with
BinaryTempFileBody.setTempDirectory).

Also, LocalKeyStore.getInstance has been changed so that it
no longer needs to be synchronized.
This commit is contained in:
Joe Steele 2013-12-03 19:20:20 -05:00
parent 9333f4f7f4
commit cedcd7e47c
9 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/fsck/k9/Account.java
View File

@ -1873,7 +1873,7 @@ public class Account implements BaseAccount {
/**
* Add a new certificate for the incoming or outgoing server to the local key store.
*/
public void addCertificate(Context context, CheckDirection direction,
public void addCertificate(CheckDirection direction,
X509Certificate certificate) throws CertificateException {
Uri uri;
if (direction.equals(CheckDirection.INCOMING)) {
@ -1881,7 +1881,7 @@ public class Account implements BaseAccount {
} else {
uri = Uri.parse(getTransportUri());
}
LocalKeyStore localKeyStore = LocalKeyStore.getInstance(context);
LocalKeyStore localKeyStore = LocalKeyStore.getInstance();
localKeyStore.addCertificate(uri.getHost(), uri.getPort(), certificate);
}
@ -1890,7 +1890,7 @@ public class Account implements BaseAccount {
* new host/port, then try and delete any (possibly non-existent) certificate stored for the
* old host/port.
*/
public void deleteCertificate(Context context, String newHost, int newPort,
public void deleteCertificate(String newHost, int newPort,
CheckDirection direction) {
Uri uri;
if (direction.equals(CheckDirection.INCOMING)) {
@ -1905,7 +1905,7 @@ public class Account implements BaseAccount {
return;
}
if (!newHost.equals(oldHost) || newPort != oldPort) {
LocalKeyStore localKeyStore = LocalKeyStore.getInstance(context);
LocalKeyStore localKeyStore = LocalKeyStore.getInstance();
localKeyStore.deleteCertificate(oldHost, oldPort);
}
}
@ -1914,8 +1914,8 @@ public class Account implements BaseAccount {
* Examine the settings for the account and attempt to delete (possibly non-existent)
* certificates for the incoming and outgoing servers.
*/
public void deleteCertificates(Context context) {
LocalKeyStore localKeyStore = LocalKeyStore.getInstance(context);
public void deleteCertificates() {
LocalKeyStore localKeyStore = LocalKeyStore.getInstance();
Uri uri = Uri.parse(getStoreUri());
localKeyStore.deleteCertificate(uri.getHost(), uri.getPort());

3
src/com/fsck/k9/K9.java
View File

@ -39,6 +39,7 @@ import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.internet.BinaryTempFileBody;
import com.fsck.k9.mail.store.LocalStore;
import com.fsck.k9.provider.UnreadWidgetProvider;
import com.fsck.k9.security.LocalKeyStore;
import com.fsck.k9.service.BootReceiver;
import com.fsck.k9.service.MailService;
import com.fsck.k9.service.ShutdownReceiver;
@ -590,6 +591,8 @@ public class K9 extends Application {
*/
BinaryTempFileBody.setTempDirectory(getCacheDir());
LocalKeyStore.setKeyStoreLocation(getDir("KeyStore", MODE_PRIVATE).toString());
/*
* Enable background sync of messages
*/

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

@ -15,7 +15,6 @@ import android.util.Log;
import com.fsck.k9.mail.Store;
import com.fsck.k9.preferences.Editor;
import com.fsck.k9.preferences.Storage;
import com.fsck.k9.security.LocalKeyStore;
public class Preferences {
@ -128,7 +127,7 @@ public class Preferences {
Store.removeAccount(account);
account.deleteCertificates(mContext);
account.deleteCertificates();
account.delete(this);
if (newAccount == account) {

2
src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View File

@ -363,7 +363,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
try {
mAccount.addCertificate(getApplicationContext(), mDirection, chain[0]);
mAccount.addCertificate(mDirection, chain[0]);
} catch (CertificateException e) {
showErrorDialog(
R.string.account_setup_failed_dlg_certificate_message_fmt,

2
src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View File

@ -428,7 +428,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mWebdavMailboxPathView.getText().toString());
}
mAccount.deleteCertificate(this, host, port, CheckDirection.INCOMING);
mAccount.deleteCertificate(host, port, CheckDirection.INCOMING);
ServerSettings settings = new ServerSettings(mStoreType, host, port,
connectionSecurity, authType, username, password, extra);

2
src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
View File

@ -312,7 +312,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener,
String newHost = mServerView.getText().toString();
int newPort = Integer.parseInt(mPortView.getText().toString());
uri = new URI(smtpSchemes[securityType], userInfo, newHost, newPort, null, null, null);
mAccount.deleteCertificate(this, newHost, newPort, CheckDirection.OUTGOING);
mAccount.deleteCertificate(newHost, newPort, CheckDirection.OUTGOING);
mAccount.setTransportUri(uri.toString());
AccountSetupCheckSettings.actionCheckSettings(this, mAccount, CheckDirection.OUTGOING);
} catch (UnsupportedEncodingException enc) {

3
src/com/fsck/k9/net/ssl/TrustManagerFactory.java
View File

@ -3,7 +3,6 @@ package com.fsck.k9.net.ssl;
import android.util.Log;
import com.fsck.k9.K9;
import com.fsck.k9.helper.DomainNameChecker;
import com.fsck.k9.mail.CertificateChainException;
import com.fsck.k9.security.LocalKeyStore;
@ -102,7 +101,7 @@ public final class TrustManagerFactory {
static {
try {
keyStore = LocalKeyStore.getInstance(K9.app);
keyStore = LocalKeyStore.getInstance();
javax.net.ssl.TrustManagerFactory tmf = javax.net.ssl.TrustManagerFactory.getInstance("X509");
tmf.init((KeyStore) null);

34
src/com/fsck/k9/security/LocalKeyStore.java
View File

@ -13,7 +13,6 @@ import java.security.cert.X509Certificate;
import org.apache.commons.io.IOUtils;
import android.content.Context;
import android.util.Log;
import com.fsck.k9.K9;
@ -21,26 +20,32 @@ import com.fsck.k9.K9;
public class LocalKeyStore {
private static final int KEY_STORE_FILE_VERSION = 1;
private static LocalKeyStore sInstance;
private static String sKeyStoreLocation;
public static void setKeyStoreLocation(String directory) {
sKeyStoreLocation = directory;
}
public synchronized static LocalKeyStore getInstance(Context context) {
if (sInstance == null) {
sInstance = new LocalKeyStore(context);
}
return sInstance;
private static class LocalKeyStoreHolder {
static final LocalKeyStore INSTANCE = new LocalKeyStore();
}
public static LocalKeyStore getInstance() {
return LocalKeyStoreHolder.INSTANCE;
}
private final Context mContext;
private File mKeyStoreFile;
private KeyStore mKeyStore;
private LocalKeyStore(Context context) {
mContext = context.getApplicationContext();
upgradeKeyStoreFile();
setKeyStoreFile(null);
private LocalKeyStore() {
if (sKeyStoreLocation == null) {
Log.e(K9.LOG_TAG, "Local key store location has not been initialized");
} else {
upgradeKeyStoreFile();
setKeyStoreFile(null);
}
}
/**
@ -167,11 +172,10 @@ public class LocalKeyStore {
}
private String getKeyStoreFilePath(int version) {
File dir = mContext.getDir("KeyStore", Context.MODE_PRIVATE);
if (version < 1) {
return dir + File.separator + "KeyStore.bks";
return sKeyStoreLocation + File.separator + "KeyStore.bks";
} else {
return dir + File.separator + "KeyStore_v" + version + ".bks";
return sKeyStoreLocation + File.separator + "KeyStore_v" + version + ".bks";
}
}
}

2
tests/src/com/fsck/k9/net/ssl/TrustManagerFactoryTest.java
View File

@ -208,7 +208,7 @@ public class TrustManagerFactoryTest extends AndroidTestCase {
@Override
public void setUp() throws Exception {
mKeyStoreFile = File.createTempFile("localKeyStore", null, getContext().getCacheDir());
mKeyStore = LocalKeyStore.getInstance(getContext());
mKeyStore = LocalKeyStore.getInstance();
mKeyStore.setKeyStoreFile(mKeyStoreFile);
}