Dg 21589 npe fixes

README.md

@@ -7,7 +7,7 @@
 
 React Native Touch ID is a [React Native](http://facebook.github.io/react-native/) library for authenticating users with biometric authentication methods like Face ID and Touch ID on both iOS and Android (experimental).
 
-⚠️ Note: **This library is not currently actively maintained.** If you're looking for something more stable that "just works", the awesome folks over at [Expo](https://expo.io) have begun open-sourcing some of their modules for compatability with React Native projects not built with Expo. As such you can attempt to use their equivalent library called [LocalAuthentication](https://docs.expo.io/versions/v30.0.0/sdk/local-authentication) at [expo-local-authentication](https://www.npmjs.com/package/expo-local-authentication) if you run into any issues here!
+Note: the awesome folks over at [Expo](https://expo.io) have begun open-sourcing some of their modules for compatability with React Native projects not built with Expo. As such you can attempt to use their equivalent library called [LocalAuthentication](https://docs.expo.io/versions/v30.0.0/sdk/local-authentication) at [expo-local-authentication](https://www.npmjs.com/package/expo-local-authentication) if you run into any issues here!
 
 ![react-native-touch-id](https://cloud.githubusercontent.com/assets/1627824/7975919/2c69a776-0a42-11e5-9773-3ea1c7dd79f3.gif)
 
@@ -260,7 +260,6 @@ Format:
 | `LAErrorPasscodeNotSet`       | Authentication could not start because the passcode is not set on the device.                                                        |
 | `LAErrorTouchIDNotAvailable`  | Authentication could not start because Touch ID is not available on the device                                                       |
 | `LAErrorTouchIDNotEnrolled`   | Authentication could not start because Touch ID has no enrolled fingers.                                                             |
-| `LAErrorTouchIDLockout`       | Authentication failed because of too many failed attempts.                                                                               |
 | `RCTTouchIDUnknownError`      | Could not authenticate for an unknown reason.                                                                                        |
 | `RCTTouchIDNotSupported`      | Device does not support Touch ID.                                                                                                    |
 

TouchID.android.js

@@ -10,8 +10,8 @@ export default {
         (error, code) => {
           return reject(createError(config, error, code));
         },
-        (biometryType) => {
-          return resolve(biometryType);
+        success => {
+          return resolve(true);
         }
       );
     });

TouchID.m

@@ -137,10 +137,6 @@ - (NSString *)getErrorReason:(NSError *)error
         case LAErrorTouchIDNotEnrolled:
             errorReason = @"LAErrorTouchIDNotEnrolled";
             break;
-
-        case LAErrorTouchIDLockout:
-            errorReason = @"LAErrorTouchIDLockout";
-            break;
 
         default:
             errorReason = @"RCTTouchIDUnknownError";

TouchID.xcodeproj/xcuserdata/admin.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>TouchID.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>11</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>58B511DA1A9E6C8500147676</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
+  <dict>
+    <key>SchemeUserState</key>
+    <dict>
+      <key>TouchID.xcscheme</key>
+      <dict>
+        <key>orderHint</key>
+        <integer>11</integer>
+        <key>isShown</key>
+        <false/>
+      </dict>
+    </dict>
+    <key>SuppressBuildableAutocreation</key>
+    <dict>
+      <key>58B511DA1A9E6C8500147676</key>
+      <dict>
+        <key>primary</key>
+        <true/>
+      </dict>
+    </dict>
+  </dict>
+</plist>

TouchID.xcodeproj/xcuserdata/naoufal.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>TouchID.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>58B511DA1A9E6C8500147676</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
+  <dict>
+    <key>SchemeUserState</key>
+    <dict>
+      <key>TouchID.xcscheme</key>
+      <dict>
+        <key>orderHint</key>
+        <integer>0</integer>
+        <key>isShown</key>
+        <false/>
+      </dict>
+    </dict>
+    <key>SuppressBuildableAutocreation</key>
+    <dict>
+      <key>58B511DA1A9E6C8500147676</key>
+      <dict>
+        <key>primary</key>
+        <true/>
+      </dict>
+    </dict>
+  </dict>
+</plist>

android/build.gradle

@@ -1,8 +1,3 @@
-// Inspired by rayronvictor's PR #248 tp react-native-config
-// https://github.com/luggit/react-native-config/pull/248
-
-def _ext = rootProject.ext
-
 buildscript {
   repositories {
     maven {
@@ -14,12 +9,17 @@ buildscript {
   }
 
   dependencies {
-    classpath _ext.has('gradleBuildTools') ? _ext.gradleBuildTools : 'com.android.tools.build:gradle:3.4.0'
+    classpath 'com.android.tools.build:gradle:3.3.1'
   }
 }
 
 apply plugin: 'com.android.library'
 
+// Inspired by rayronvictor's PR #248 tp react-native-config
+// https://github.com/luggit/react-native-config/pull/248
+
+def _ext = rootProject.ext
+
 def _reactNativeVersion = _ext.has('reactNative') ? _ext.reactNative : '+'
 def _compileSdkVersion = _ext.has('compileSdkVersion') ? _ext.compileSdkVersion : 27
 def _buildToolsVersion = _ext.has('buildToolsVersion') ? _ext.buildToolsVersion : '27.0.3'

android/src/main/java/com/rnfingerprint/DialogResultHandler.java

@@ -14,17 +14,23 @@ public DialogResultHandler(Callback reactErrorCallback, Callback reactSuccessCal
     @Override
     public void onAuthenticated() {
       FingerprintAuthModule.inProgress = false;
-      successCallback.invoke("Successfully authenticated.");
+      if(successCallback != null) {
+          successCallback.invoke("Successfully authenticated.");
+      }
     }
 
     @Override
     public void onError(String errorString, int errorCode) {
       FingerprintAuthModule.inProgress = false;
-      errorCallback.invoke(errorString, errorCode);
+      if (errorCallback != null) {
+          errorCallback.invoke(errorString, errorCode);
+      }
     }
     @Override
     public void onCancelled() {
       FingerprintAuthModule.inProgress = false;
-      errorCallback.invoke("cancelled", FingerprintAuthConstants.AUTHENTICATION_CANCELED);
+        if (errorCallback != null) {
+            errorCallback.invoke("cancelled", FingerprintAuthConstants.AUTHENTICATION_CANCELED);
+        }
     }
 }

android/src/main/java/com/rnfingerprint/FingerprintAuthModule.java

@@ -59,10 +59,7 @@ public void isSupported(final Callback reactErrorCallback, final Callback reactS
 
         int result = isFingerprintAuthAvailable();
         if (result == FingerprintAuthConstants.IS_SUPPORTED) {
-            // TODO: once this package supports Android's Face Unlock,
-            // implement a method to find out which type of biometry
-            // (not just fingerprint) is actually supported
-            reactSuccessCallback.invoke("Fingerprint");
+            reactSuccessCallback.invoke("Is supported.");
         } else {
             reactErrorCallback.invoke("Not supported.", result);
         }

android/src/main/java/com/rnfingerprint/FingerprintDialog.java

@@ -166,7 +166,9 @@ public interface DialogResultListener {
     @Override
     public void onAuthenticated() {
         this.isAuthInProgress = false;
-        this.dialogCallback.onAuthenticated();
+        if (this.dialogCallback != null) {
+            this.dialogCallback.onAuthenticated();
+        }
         dismiss();
     }
 
@@ -181,7 +183,9 @@ public void onError(String errorString, int errorCode) {
     public void onCancelled() {
         this.isAuthInProgress = false;
         this.mFingerprintHandler.endAuth();
-        this.dialogCallback.onCancelled();
+        if (this.dialogCallback != null) {
+            this.dialogCallback.onCancelled();
+        }
         dismiss();
     }
 }

data/errors.js

@@ -7,7 +7,6 @@ const codes = {
     LAErrorPasscodeNotSet: 'LAErrorPasscodeNotSet',
     LAErrorTouchIDNotAvailable: 'LAErrorTouchIDNotAvailable',
     LAErrorTouchIDNotEnrolled: 'LAErrorTouchIDNotEnrolled',
-    LAErrorTouchIDLockout: 'LAErrorTouchIDLockout',
     RCTTouchIDNotSupported: 'RCTTouchIDNotSupported',
     RCTTouchIDUnknownError: 'RCTTouchIDUnknownError'
   },
@@ -56,9 +55,6 @@ const iOSErrors = {
   [codes.iOSCodes.LAErrorTouchIDNotEnrolled]: {
     message: 'Authentication could not start because Touch ID has no enrolled fingers.'
   },
-  [codes.iOSCodes.LAErrorTouchIDLockout]: {
-    message: 'Authentication failed because of too many failed attempts.'
-  },
   [codes.iOSCodes.RCTTouchIDUnknownError]: {
     message: 'Could not authenticate for an unknown reason.'
   },

errors.js

@@ -72,9 +72,6 @@ const getError = (code) => {
   case codes.iOSCodes.LAErrorUserFallback:
     return errors.USER_FALLBACK;
 
-  case codes.iOSCodes.LAErrorTouchIDLockout:
-    return errors.LOCKOUT;
-
   default:
     return errors.UNKNOWN_ERROR;
   }