Merge pull request #16 from tombailey/master

Potential fix for issue #14

Author: pradeep1991singh

android/src/main/java/com/reactlibrary/securekeystore/RNSecureKeyStoreModule.java

@@ -66,7 +66,7 @@ private PublicKey getOrCreatePublicKey(String alias) throws GeneralSecurityExcep
     KeyStore keyStore = KeyStore.getInstance(getKeyStore());
     keyStore.load(null);
 
-    if (!keyStore.containsAlias(alias)) {
+    if (!keyStore.containsAlias(alias) || keyStore.getCertificate(alias) == null) {
       Log.i(Constants.TAG, "no existing asymmetric keys for alias");
 
       Calendar start = Calendar.getInstance();
@@ -125,7 +125,6 @@ private SecretKey getOrCreateSecretKey(String alias) throws GeneralSecurityExcep
       keyGenerator.init(256);
       SecretKey secretKey = keyGenerator.generateKey();
       PublicKey publicKey = getOrCreatePublicKey(alias);
-
       Storage.writeValues(getContext(), Constants.SKS_KEY_FILENAME + alias,
           encryptRsaPlainText(publicKey, secretKey.getEncoded()));
 
@@ -143,6 +142,9 @@ private void setCipherText(String alias, String input) throws GeneralSecurityExc
   public void get(String alias, Promise promise) {
     try {
       promise.resolve(getPlainText(alias));
+    } catch (FileNotFoundException fnfe) {
+      fnfe.printStackTrace();
+      promise.reject("404", "{\"code\":404,\"api-level\":" + Build.VERSION.SDK_INT + ",\"message\":" + fnfe.getMessage() + "}", fnfe);
     } catch (Exception e) {
       e.printStackTrace();
       Log.e(Constants.TAG, "Exception: " + e.getMessage());

ios/RNSecureKeyStore.m

@@ -153,7 +153,7 @@ - (void)handleAppUninstallation
         NSString *value = [self searchKeychainCopyMatching:key];
         if (value == nil) {
             NSString* errorMessage = @"{\"message\":\"key does not present\"}";
-            reject(@"1", errorMessage, secureKeyStoreError(errorMessage));
+            reject(@"404", errorMessage, secureKeyStoreError(errorMessage));
         } else {
             resolve(value);
         }

package.json

@@ -1,8 +1,7 @@
 {
   "name": "react-native-secure-key-store",
   "version": "1.0.8",
-  "description":
-    "React Native Library for securely storing keys to iOS and Android devices in KeyChain and KeyStore respectively.",
+  "description": "React Native Library for securely storing keys to iOS and Android devices in KeyChain and KeyStore respectively.",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"