Merge branch 'master' into feature/keystoreAsDefault

Author: mCodex

.all-contributorsrc

@@ -16,6 +16,16 @@
         "review",
         "ideas"
       ]
+    },
+    {
+      "login": "maggialejandro",
+      "name": "Alejandro",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3394748?v=4",
+      "profile": "https://github.com/maggialejandro",
+      "contributions": [
+        "code",
+        "maintenance"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -40,6 +40,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <table>
   <tr>
     <td align="center"><a href="https://mcodex.github.io"><img src="https://avatars2.githubusercontent.com/u/5920613?v=4" width="100px;" alt=""/><br /><sub><b>Mateus Andrade</b></sub></a><br /><a href="https://github.com/mCodex/react-native-sensitive-info/commits?author=mcodex" title="Documentation">📖</a> <a href="https://github.com/mCodex/react-native-sensitive-info/commits?author=mcodex" title="Code">💻</a> <a href="https://github.com/mCodex/react-native-sensitive-info/pulls?q=is%3Apr+reviewed-by%3Amcodex" title="Reviewed Pull Requests">👀</a> <a href="#ideas-mcodex" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/maggialejandro"><img src="https://avatars1.githubusercontent.com/u/3394748?v=4" width="100px;" alt=""/><br /><sub><b>Alejandro</b></sub></a><br /><a href="https://github.com/mCodex/react-native-sensitive-info/commits?author=maggialejandro" title="Code">💻</a> <a href="#maintenance-maggialejandro" title="Maintenance">🚧</a></td>
   </tr>
 </table>
 

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

@@ -38,6 +38,7 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.util.Calendar;
+import java.security.UnrecoverableKeyException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
@@ -360,7 +361,7 @@ private void initFingerprintKeyStore() {
                 prepareKey();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            //
         }
     }
 
@@ -401,7 +402,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);
@@ -468,6 +468,7 @@ public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult re
                     }
                     return;
                 }
+
                 byte[] encryptedBytes = cipher.doFinal(value.getBytes());
 
                 // Encode the initialization vector (IV) and encryptedBytes to Base64.
@@ -478,7 +479,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();
@@ -586,7 +587,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();