Merge pull request #217 from maggialejandro/fix-unrecoverable-key-exception

fix(android): handle UnrecoverableKeyException

Author: mCodex

android/src/main/java/br/com/classapp/RNSensitiveInfo/RNSensitiveInfoModule.java

@@ -31,6 +31,7 @@
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.security.KeyStore;
+import java.security.UnrecoverableKeyException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
@@ -295,6 +296,7 @@ private void initKeyStore() {
                 prepareKey();
             }
         } catch (Exception e) {
+            //
         }
     }
 
@@ -337,7 +339,6 @@ private void putExtraWithAES(final String key, final String value, final SharedP
                     cipher = Cipher.getInstance(AES_DEFAULT_TRANSFORMATION);
                     cipher.init(Cipher.ENCRYPT_MODE, secretKey);
 
-
                     // Retrieve information about the SecretKey from the KeyStore.
                     SecretKeyFactory factory = SecretKeyFactory.getInstance(
                             secretKey.getAlgorithm(), ANDROID_KEYSTORE_PROVIDER);
@@ -404,6 +405,7 @@ public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult re
                     }
                     return;
                 }
+
                 byte[] encryptedBytes = cipher.doFinal(value.getBytes());
 
                 // Encode the initialization vector (IV) and encryptedBytes to Base64.
@@ -414,7 +416,7 @@ public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult re
 
                 putExtra(key, result, mSharedPreferences);
                 pm.resolve(value);
-            } catch (InvalidKeyException e) {
+            } catch (InvalidKeyException | UnrecoverableKeyException e) {
                 try {
                     mKeyStore.deleteEntry(KEY_ALIAS_AES);
                     prepareKey();
@@ -522,7 +524,7 @@ public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult re
                 }
                 byte[] decryptedBytes = cipher.doFinal(cipherBytes);
                 pm.resolve(new String(decryptedBytes));
-            } catch (InvalidKeyException e) {
+            } catch (InvalidKeyException | UnrecoverableKeyException e) {
                 try {
                     mKeyStore.deleteEntry(KEY_ALIAS_AES);
                     prepareKey();