kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify the exception catching in KeyStoreHelper

Browse source
This commit is contained in:
Jakob Nixdorf 2018-01-10 07:12:02 +01:00
parent c0d05c8e2c
commit 1e21c36ecc
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/shadowice/flocke/andotp/Utilities/KeyStoreHelper.java
View file

@ -100,26 +100,17 @@ public class KeyStoreHelper {
} }
public static SecretKey loadEncryptionKeyFromKeyStore(Context context, boolean failSilent) { public static SecretKey loadEncryptionKeyFromKeyStore(Context context, boolean failSilent) {
KeyPair pair = null; SecretKey encKey = null;
try { try {
pair = KeyStoreHelper.loadOrGenerateAsymmetricKeyPair(context, Constants.KEYSTORE_ALIAS_WRAPPING); KeyPair pair = KeyStoreHelper.loadOrGenerateAsymmetricKeyPair(context, Constants.KEYSTORE_ALIAS_WRAPPING);
encKey = EncryptionHelper.loadOrGenerateWrappedKey(new File(context.getFilesDir() + "/" + Constants.FILENAME_ENCRYPTED_KEY), pair);
} catch (GeneralSecurityException | IOException e) { } catch (GeneralSecurityException | IOException e) {
e.printStackTrace(); e.printStackTrace();
if (! failSilent) if (! failSilent)
UIHelper.showGenericDialog(context, R.string.dialog_title_keystore_error, R.string.dialog_msg_keystore_error); UIHelper.showGenericDialog(context, R.string.dialog_title_keystore_error, R.string.dialog_msg_keystore_error);
} }
if (pair != null) { return encKey;
try {
return EncryptionHelper.loadOrGenerateWrappedKey(new File(context.getFilesDir() + "/" + Constants.FILENAME_ENCRYPTED_KEY), pair);
} catch (GeneralSecurityException | IOException e) {
e.printStackTrace();
if (! failSilent)
UIHelper.showGenericDialog(context, R.string.dialog_title_keystore_error, R.string.dialog_msg_keystore_error);
}
}
return null;
} }
} }