moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-09 20:58:07 -05:00
Code Issues Releases Wiki Activity

Change LocalKeyStore error reporting

Browse Source 
The error reporting assures an exception is thrown if
setKeyStoreFile(null) is called without a prior call to
setKeyStoreLocation(String directory).

Also, fix TrustManagerFactoryTest indentation.
This commit is contained in:
Joe Steele 2013-12-04 12:10:12 -05:00 committed by cketti
parent f7f6a0e9f3
commit 927950b16c
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,11 +40,17 @@ public class LocalKeyStore {
private LocalKeyStore() { private LocalKeyStore() {
if (sKeyStoreLocation == null) { try {
Log.e(K9.LOG_TAG, "Local key store location has not been initialized");
} else {
upgradeKeyStoreFile(); upgradeKeyStoreFile();
setKeyStoreFile(null); setKeyStoreFile(null);
} catch (CertificateException e) {
/*
* Can happen if setKeyStoreLocation(String directory) has not been
* called before the first call to getInstance(). Not necessarily an
* error, presuming setKeyStoreFile(File) is called next with a
* non-null File.
*/
Log.w(K9.LOG_TAG, "Local key store has not been initialized");
} }
} }
@ -56,8 +62,11 @@ public class LocalKeyStore {
* {@link File} containing locally saved certificates. May be 0 * {@link File} containing locally saved certificates. May be 0
* length, in which case it is deleted and recreated. May be * length, in which case it is deleted and recreated. May be
* {@code null}, in which case a default file location is used. * {@code null}, in which case a default file location is used.
* @throws CertificateException
* Occurs if {@code file == null} and
* {@code setKeyStoreLocation(directory)} was not called previously.
*/ */
public synchronized void setKeyStoreFile(File file) { public synchronized void setKeyStoreFile(File file) throws CertificateException {
if (file == null) { if (file == null) {
file = new File(getKeyStoreFilePath(KEY_STORE_FILE_VERSION)); file = new File(getKeyStoreFilePath(KEY_STORE_FILE_VERSION));
} }
@ -164,14 +173,17 @@ public class LocalKeyStore {
} }
} }
private void upgradeKeyStoreFile() { private void upgradeKeyStoreFile() throws CertificateException {
if (KEY_STORE_FILE_VERSION > 0) { if (KEY_STORE_FILE_VERSION > 0) {
// Blow away version "0" because certificate aliases have changed. // Blow away version "0" because certificate aliases have changed.
new File(getKeyStoreFilePath(0)).delete(); new File(getKeyStoreFilePath(0)).delete();
} }
} }
private String getKeyStoreFilePath(int version) { private String getKeyStoreFilePath(int version) throws CertificateException {
if (sKeyStoreLocation == null) {
throw new CertificateException("Local key store location has not been initialized");
}
if (version < 1) { if (version < 1) {
return sKeyStoreLocation + File.separator + "KeyStore.bks"; return sKeyStoreLocation + File.separator + "KeyStore.bks";
} else { } else {