fix(android): Error is null on invalidateEnrollment set to false (#258)

* fix(android): Error is null on invalidated biometric enrollment

* fix:  fixing gradle setup in project

* fix: further gradle improvements

Author: denissb

.gitignore

@@ -39,6 +39,7 @@ example/node_modules
 
 android/build/
 android/local.properties
+android/.gradle/
 android.yml
 *.iml
 

android/build.gradle

@@ -3,7 +3,17 @@ apply plugin: 'com.android.library'
 def DEFAULT_COMPILE_SDK_VERSION             = 29
 def DEFAULT_BUILD_TOOLS_VERSION             = "29.0.2"
 def DEFAULT_TARGET_SDK_VERSION              = 29
-def DEFAULT_MIN_SDK_VERSION                 = 16
+def DEFAULT_MIN_SDK_VERSION                 = 23
+
+buildscript {
+    repositories {
+        jcenter()
+        google() //in newer versions of Android Studio
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.1'
+    }
+}
 
 android {
     compileSdkVersion project.hasProperty('compileSdkVersion') ? project.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
@@ -23,6 +33,13 @@ android {
     }
 }
 
+allprojects {
+    repositories {
+        maven { url "$rootDir/../node_modules/react-native/android" } // All of React Native (JS, Android binaries) is installed from npm
+        jcenter()
+        google()
+    }
+}
 dependencies {
     implementation 'androidx.biometric:biometric:1.0.1'
     implementation 'com.facebook.react:react-native:+'

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 16 10:45:51 BRT 2017
+#Thu Jan 14 21:51:10 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

android/src/main/java/dev/mcodex/RNSensitiveInfoModule.java

@@ -6,53 +6,51 @@
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Build;
 import android.os.CancellationSignal;
+import android.security.KeyPairGeneratorSpec;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyInfo;
-
-import java.security.InvalidKeyException;
-
-import android.security.KeyPairGeneratorSpec;
 import android.security.keystore.KeyProperties;
 import android.util.Base64;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
 import androidx.biometric.BiometricConstants;
 import androidx.biometric.BiometricManager;
 import androidx.biometric.BiometricPrompt;
+import androidx.fragment.app.FragmentActivity;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import java.math.BigInteger;
+import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.KeyPairGenerator;
 import java.security.KeyStore;
-import java.security.InvalidKeyException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.util.Calendar;
 import java.security.UnrecoverableKeyException;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
-
-import androidx.fragment.app.FragmentActivity;
 import javax.security.auth.x500.X500Principal;
 
 import dev.mcodex.RNSensitiveInfo.utils.AppConstants;
@@ -618,6 +616,9 @@ public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult re
                 } else {
                     pm.reject(e);
                 }
+             } catch (BadPaddingException e){
+                Log.d("RNSensitiveInfo", "Biometric key invalid");
+                pm.reject(AppConstants.E_BIOMETRICS_INVALIDATED, e.getCause().getMessage());
             } catch (SecurityException e) {
                 pm.reject(e);
             } catch (Exception e) {

android/src/main/java/dev/mcodex/utils/AppConstants.java

@@ -11,4 +11,5 @@ public interface AppConstants {
     String E_AUTHENTICATION_CANCELLED = "E_AUTHENTICATION_CANCELLED";
     String E_BIOMETRIC_NOT_SUPPORTED = "E_BIOMETRIC_NOT_SUPPORTED";
     String E_INIT_FAILURE = "E_INIT_FAILURE";
+    String E_BIOMETRICS_INVALIDATED = "E_BIOMETRICS_INVALIDATED";
 }