gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-26 15:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split different exception scopes

Browse Source 
Before this change the initinalization of the trusted key store was
combined in one try-catch-block. If anything went wrong an new in memory
trusted key store was created. Programming against an exception is an
bad pattern.

So the initialization is now splitted into multiple try-catch-blocks
with it's own scopes and the decision if the trusted key store is newly
created in memory or loaded from a exisitng file is done by an if
condition check.

Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2023-01-09 13:04:59 +01:00 committed by Marcel Hibbe (Rebase PR Action)
parent 1bbbe20834
commit eabd0b2d2c
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/nextcloud/talk/utils/ssl/MagicTrustManager.java
View File

@ -54,13 +54,22 @@ public class MagicTrustManager implements X509TrustManager {
private KeyStore trustedKeyStore = null;
public MagicTrustManager() {
keystoreFile = new File(NextcloudTalkApplication.Companion.getSharedApplication().getDir("CertsKeystore",
Context.MODE_PRIVATE), "keystore.bks");
try (FileInputStream fileInputStream = new FileInputStream(keystoreFile)) {
keystoreFile = new File(NextcloudTalkApplication.Companion.getSharedApplication()
.getDir("CertsKeystore", Context.MODE_PRIVATE),
"keystore.bks");
try {
trustedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustedKeyStore.load(fileInputStream, null);
} catch (Exception exception) {
} catch (KeyStoreException e) {
Log.e(TAG, "Trusted key store can't be created.", e);
}
if (keystoreFile.exists()) {
try (FileInputStream fileInputStream = new FileInputStream(keystoreFile)) {
trustedKeyStore.load(fileInputStream, null);
} catch (Exception exception) {
Log.e(TAG, "Error during opening the trusted key store.", exception);
}
} else {
try {
trustedKeyStore.load(null, null);
} catch (Exception e) {
@ -71,7 +80,7 @@ public class MagicTrustManager implements X509TrustManager {
TrustManagerFactory trustManagerFactory = null;
try {
trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.
getDefaultAlgorithm());
getDefaultAlgorithm());
trustManagerFactory.init((KeyStore) null);
@ -101,10 +110,10 @@ public class MagicTrustManager implements X509TrustManager {
} catch (CertificateException e) {
if (!isCertInMagicTrustStore(x509Certificate)) {
EventBus.getDefault().post(new CertificateEvent(x509Certificate, this,
null));
null));
long startTime = System.currentTimeMillis();
while (!isCertInMagicTrustStore(x509Certificate) && System.currentTimeMillis() <=
startTime + 15000) {
startTime + 15000) {
//do nothing
}
return isCertInMagicTrustStore(x509Certificate);