Merge branch 'master' into feature/example

Author: mCodex

.github/stale.yml

@@ -1,10 +1,10 @@
 # Number of days of inactivity before an issue becomes stale
 daysUntilStale: 30
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 3
+daysUntilClose: 90
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - pinned
+  - 📌 pinned
   - security
 # Label to use when marking an issue as stale
 staleLabel: 🚧 stale

RNSensitiveInfo.js

@@ -4,12 +4,14 @@ const { RNSensitiveInfo } = NativeModules;
 
 module.exports = {
   ...RNSensitiveInfo,
-  setInvalidatedByBiometricEnrollment() {
+  setInvalidatedByBiometricEnrollment(invalidatedByBiometricEnrollment) {
     if (RNSensitiveInfo.setInvalidatedByBiometricEnrollment == null) {
       return;
     }
 
-    return RNSensitiveInfo.setInvalidatedByBiometricEnrollment();
+    return RNSensitiveInfo.setInvalidatedByBiometricEnrollment(
+      invalidatedByBiometricEnrollment,
+    );
   },
   cancelFingerprintAuth() {
     if (RNSensitiveInfo.cancelFingerprintAuth == null) {

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

@@ -348,7 +348,7 @@ class PutExtraWithAESCallback implements FingerprintUiHelper.Callback {
                                 @Override
                                 public void onAuthenticated(FingerprintManager.AuthenticationResult result) {
                                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                        putExtraWithAES(key, value, mSharedPreferences, showModal, strings, pm, result.getCryptoObject().getCipher());
+                                        putExtraWithAES(key, value, mSharedPreferences, true, strings, pm, result.getCryptoObject().getCipher());
                                     }
                                 }
 
@@ -390,7 +390,7 @@ public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
                                         public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
                                             super.onAuthenticationSucceeded(result);
                                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                                putExtraWithAES(key, value, mSharedPreferences, showModal, strings, pm, result.getCryptoObject().getCipher());
+                                                putExtraWithAES(key, value, mSharedPreferences, false, strings, pm, result.getCryptoObject().getCipher());
                                             }
                                         }
                                     }, null);
@@ -459,7 +459,7 @@ class DecryptWithAesCallback implements FingerprintUiHelper.Callback {
                                 @Override
                                 public void onAuthenticated(FingerprintManager.AuthenticationResult result) {
                                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                        decryptWithAes(encrypted, showModal, strings, pm, result.getCryptoObject().getCipher());
+                                        decryptWithAes(encrypted, true, strings, pm, result.getCryptoObject().getCipher());
                                     }
                                 }
 
@@ -501,7 +501,7 @@ public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
                                         public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
                                             super.onAuthenticationSucceeded(result);
                                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                                                decryptWithAes(encrypted, showModal, strings, pm, result.getCryptoObject().getCipher());
+                                                decryptWithAes(encrypted, false, strings, pm, result.getCryptoObject().getCipher());
                                             }
                                         }
                                     }, null);

index.d.ts

@@ -32,6 +32,7 @@ interface RNSensitiveInfoAndroidDialogStrings {
 export interface RNSensitiveInfoOptions {
   kSecAccessControl?: RNSensitiveInfoAccessControlOptions;
   kSecAttrAccessible?: RNSensitiveInfoAttrAccessibleOptions;
+  kSecAttrSynchronizable?: boolean;
   keychainService?: string;
   sharedPreferencesName?: string;
   touchID?: boolean;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-sensitive-info",
-  "version": "5.5.5",
+  "version": "5.5.7",
   "main": "RNSensitiveInfo.js",
   "types": "index.d.ts",
   "description": "react-native-sensitive-info manages all data stored in Android Shared Preferences and iOS Keychain. You can set, get and delete keys/values using simple methods.",
@@ -15,7 +15,7 @@
     "Mateus Andrade [email protected]",
     "Samin Shams <[email protected]>"
   ],
-  "homepage": "https://github.com/mcodex/react-native-sensitive-info",
+  "homepage": "https://mcodex.dev/react-native-sensitive-info/",
   "bugs": {
     "url": "https://github.com/mcodex/react-native-sensitive-info/issues"
   },

website/docs/installation.md

@@ -6,6 +6,8 @@ sidebar_label: Installation
 
 First of all, install it using `npm` or `yarn`
 
+### Master branch (using Keychain and Android Shared Preferences)
+
 ```bash
 npm install --save react-native-sensitive-info
 ```
@@ -14,6 +16,17 @@ npm install --save react-native-sensitive-info
 yarn add react-native-sensitive-info
 ```
 
+### Keystore branch (using Keychain and Keystore)
+
+```bash
+npm install --save git://github.com/mCodex/react-native-sensitive-info#keystore
+```
+
+```bash
+yarn add git://github.com/mCodex/react-native-sensitive-info#keystore
+```
+
+
 ## Linking
 
 ### React-Native >= 0.60

website/docs/setItem.md

@@ -15,7 +15,7 @@ Check out the options that you can use for [Android](android_options) and [iOS](
 Example:
 
 ```javascript
-import RNSInfo from 'react-native-sensitive-info';
+import SInfo from 'react-native-sensitive-info';
 
 const myFunc = async () => {
     return SInfo.setItem('key1', 'value1', {
@@ -39,4 +39,4 @@ But if you rather not to use it our **default** sharedPreferencesName is: **shar
 SInfo.setItem('key1', 'value1', {});
 ```
 
-If you used Android's getDefaultSharedPreferences in your project the shared preference's name that you are looking for is: **com.mypackage.MyApp_preferences**. On the other hand if you used iOS's Keychain the default service is: **app**.
+If you used Android's getDefaultSharedPreferences in your project the shared preference's name that you are looking for is: **com.mypackage.MyApp_preferences**. On the other hand if you used iOS's Keychain the default service is: **app**.

website/yarn.lock

@@ -5686,9 +5686,9 @@ [email protected], lodash.uniq@^4.5.0:
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
 lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 loglevel@^1.6.8:
   version "1.6.8"