moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Make deleteCertificate null-safe

Browse Source
This commit is contained in:
Jan Berkel 2015-01-14 03:45:09 +01:00
parent 833d9c5de8
commit 4808406739
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
k9mail/src/main/java/com/fsck/k9/Account.java
View File

@ -1894,9 +1894,15 @@ public class Account implements BaseAccount, StoreConfig {
public void deleteCertificates() { public void deleteCertificates() {
LocalKeyStore localKeyStore = LocalKeyStore.getInstance(); LocalKeyStore localKeyStore = LocalKeyStore.getInstance();
Uri uri = Uri.parse(getStoreUri()); String storeUri = getStoreUri();
localKeyStore.deleteCertificate(uri.getHost(), uri.getPort()); if (storeUri != null) {
uri = Uri.parse(getTransportUri()); Uri uri = Uri.parse(storeUri);
localKeyStore.deleteCertificate(uri.getHost(), uri.getPort()); localKeyStore.deleteCertificate(uri.getHost(), uri.getPort());
}
String transportUri = getTransportUri();
if (transportUri != null) {
Uri uri = Uri.parse(transportUri);
localKeyStore.deleteCertificate(uri.getHost(), uri.getPort());
}
} }
} }