fix: fingerprint-scanner no fork

standardnotes · Jun 17, 2020 · 5d5a199 · 5d5a199
1 parent 4b22e7a
commit 5d5a199
Show file tree

Hide file tree

Showing 94 changed files with 91 additions and 10,159 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 3000220
+        versionCode 3000221
         versionName "3.0.22"
 
         multiDexEnabled  true

diff --git a/android/build.gradle b/android/build.gradle
@@ -4,9 +4,9 @@ buildscript {
     ext.kotlinVersion = '1.3.10'
 
     ext {
-        buildToolsVersion = "28.0.3"
-        compileSdkVersion = 28
-        targetSdkVersion = 28
+        buildToolsVersion = "29.0.2"
+        compileSdkVersion = 29
+        targetSdkVersion = 29
         minSdkVersion = 21
     }
     repositories {

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -189,7 +189,7 @@ PODS:
   - React-jsinspector (0.61.5)
   - react-native-aes (1.3.6):
     - React
-  - react-native-fingerprint-scanner (4.0.0):
+  - react-native-fingerprint-scanner (5.0.0):
     - React
   - react-native-mail (4.1.0):
     - React
@@ -414,7 +414,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
   react-native-aes: 30cdabac81ff8461d2a838d4fd042bb3df74e23d
-  react-native-fingerprint-scanner: bfcf11a00eee4bb68e6d4e5cdd67d69bed687ea6
+  react-native-fingerprint-scanner: 77140320ed56d612200371ebc2abefa5f20b574e
   react-native-mail: a864fb211feaa5845c6c478a3266de725afdce89
   react-native-webview: b1ea98894c474b27c4080779939959e1f3653147
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76

diff --git a/ios/StandardNotes.xcodeproj/project.pbxproj b/ios/StandardNotes.xcodeproj/project.pbxproj
@@ -713,7 +713,7 @@
 				CODE_SIGN_ENTITLEMENTS = StandardNotes/StandardNotes.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = HKF9BXSN95;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -747,7 +747,7 @@
 				CODE_SIGN_ENTITLEMENTS = StandardNotes/StandardNotes.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = HKF9BXSN95;
 				FRAMEWORK_SEARCH_PATHS = "";
 				HEADER_SEARCH_PATHS = (

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,8 @@
     "lint": "eslint .",
     "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*",
     "bundle-android": "cd android && ./gradlew bundleRelease",
-    "apk-android": "cd android && ./gradlew assembleRelease"
+    "apk-android": "cd android && ./gradlew assembleRelease",
+    "postinstall": "patch-package"
   },
   "dependencies": {
     "@react-native-community/async-storage": "1.6.3",
@@ -23,11 +24,12 @@
     "immutable": "^3.8.2",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
+    "patch-package": "^6.2.2",
     "react": "16.12.0",
     "react-native": "0.61.5",
     "react-native-dark-mode": "^0.2.1",
     "react-native-file-viewer": "^2.0.0",
-    "react-native-fingerprint-scanner": "https://github.com/standardnotes/react-native-fingerprint-scanner.git#5984941f452e978da9d18f8ad324a16b0b459580",
+    "react-native-fingerprint-scanner": "https://github.com/hieuvp/react-native-fingerprint-scanner.git#0d9f8219cbff9dfd8811f120ac48c4c74593fb94",
     "react-native-fs": "^2.16.2",
     "react-native-gesture-handler": "^1.5.2",
     "react-native-keychain": "^4.0.1",

diff --git a/patches/react-native-fingerprint-scanner+5.0.0.patch b/patches/react-native-fingerprint-scanner+5.0.0.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/react-native-fingerprint-scanner/ios/ReactNativeFingerprintScanner.m b/node_modules/react-native-fingerprint-scanner/ios/ReactNativeFingerprintScanner.m
+index e29bad7..3ba4724 100644
+--- a/node_modules/react-native-fingerprint-scanner/ios/ReactNativeFingerprintScanner.m
++++ b/node_modules/react-native-fingerprint-scanner/ios/ReactNativeFingerprintScanner.m
+@@ -66,9 +66,9 @@ @implementation ReactNativeFingerprintScanner
+     }
+
+     // Device has FingerprintScanner
+-    if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&error]) {
++    if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication error:&error]) {
+         // Attempt Authentication
+-        [context evaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
++        [context evaluatePolicy:LAPolicyDeviceOwnerAuthentication
+                 localizedReason:reason
+                           reply:^(BOOL success, NSError *error)
+          {
diff --git a/vendor/react-native-fingerprint-scanner/.gitattributes b/vendor/react-native-fingerprint-scanner/.gitattributes
diff --git a/vendor/react-native-fingerprint-scanner/.gitignore b/vendor/react-native-fingerprint-scanner/.gitignore
diff --git a/vendor/react-native-fingerprint-scanner/.npmignore b/vendor/react-native-fingerprint-scanner/.npmignore
diff --git a/vendor/react-native-fingerprint-scanner/.travis.yml b/vendor/react-native-fingerprint-scanner/.travis.yml