Android: Cipher error #12

Author: EddyVerbruggen

README.md

@@ -71,7 +71,7 @@ Note that on the iOS simulator this will just `resolve()`.
 fingerprintAuth.verifyFingerprint({
   title: 'Android title', // optional title (used only on Android)
   message: 'Scan yer finger', // optional (used on both platforms) - for FaceID on iOS see the notes about NSFaceIDUsageDescription 
-  authenticationValidityDuration: 10 // optional (used on Android, default 0)
+  authenticationValidityDuration: 10 // optional (used on Android, default 5)
 }).then(
     function() {
       console.log("Fingerprint was OK");
@@ -89,7 +89,8 @@ Just show that when the error callback is invoked.
 ```js
 fingerprintAuth.verifyFingerprintWithCustomFallback({
   message: 'Scan yer finger', // optional, shown in the fingerprint dialog (default: 'Scan your finger').
-  fallbackMessage: 'Enter PIN' // optional, the button label when scanning fails (default: 'Enter password').
+  fallbackMessage: 'Enter PIN', // optional, the button label when scanning fails (default: 'Enter password').
+  authenticationValidityDuration: 10 // optional (used on Android, default 5)
 }).then(
     function() {
       console.log("Fingerprint was OK");

demo/app/main-view-model.ts

@@ -31,7 +31,8 @@ export class HelloWorldModel extends Observable {
 
   public doVerifyFingerprint(): void {
     this.fingerprintAuth.verifyFingerprint({
-      message: 'Scan yer finger' // optional
+      message: 'Scan yer finger', // optional
+      authenticationValidityDuration: 10 // Android
     }).then(
       () => {
         alert({
@@ -51,7 +52,8 @@ export class HelloWorldModel extends Observable {
   public doVerifyFingerprintWithCustomFallback(): void {
     this.fingerprintAuth.verifyFingerprintWithCustomFallback({
       message: 'Scan yer finger', // optional
-      fallbackMessage: 'Enter PIN' // optional
+      fallbackMessage: 'Enter PIN', // optional
+      authenticationValidityDuration: 10 // Android
     }).then(
       () => {
         alert({

demo/package.json

@@ -1,10 +1,10 @@
 {
   "nativescript": {
     "id": "org.nativescript.fingerprintauth",
-    "tns-ios": {
-      "version": "3.3.0"
-    },
     "tns-android": {
+      "version": "3.3.1"
+    },
+    "tns-ios": {
       "version": "3.3.0"
     }
   },

src/fingerprint-auth.android.ts

@@ -17,7 +17,7 @@ const KeyGenParameterSpec = android.security.keystore.KeyGenParameterSpec;
 
 const KEY_NAME = "fingerprintauth";
 const SECRET_BYTE_ARRAY = Array.create("byte", 16);
-const REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 1;
+const REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 788; // arbitrary
 
 export class FingerprintAuth implements FingerprintAuthApi {
   private keyguardManager: any;
@@ -72,12 +72,9 @@ export class FingerprintAuth implements FingerprintAuthApi {
   verifyFingerprint(options: VerifyFingerprintOptions): Promise<any> {
     return new Promise((resolve, reject) => {
       try {
-        app.android.foregroundActivity.onActivityResult = function onActivityResult(requestCode, resultCode, data) {
-          console.log(">>> onActivityResult 1: " + requestCode);
+        app.android.foregroundActivity.onActivityResult = (requestCode, resultCode, data) => {
           if (requestCode === REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
-            console.log(">>> onActivityResult 2: " + resultCode);
-            console.log(">>> android.app.Activity.RESULT_OK: " + android.app.Activity.RESULT_OK);
-            if (resultCode === android.app.Activity.RESULT_OK) {
+            if (resultCode === android.app.Activity.RESULT_OK) { // OK = -1
               // the user has just authenticated via the ConfirmDeviceCredential activity
               resolve({
                 any: true,
@@ -132,7 +129,7 @@ export class FingerprintAuth implements FingerprintAuthApi {
           new KeyGenParameterSpec.Builder(KEY_NAME, KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
               .setBlockModes([KeyProperties.BLOCK_MODE_CBC])
               .setUserAuthenticationRequired(true)
-              .setUserAuthenticationValidityDurationSeconds(options && options.authenticationValidityDuration ? options.authenticationValidityDuration : 0)
+              .setUserAuthenticationValidityDurationSeconds(options && options.authenticationValidityDuration ? options.authenticationValidityDuration : 5)
               .setEncryptionPaddings([KeyProperties.ENCRYPTION_PADDING_PKCS7])
               .build()
       );

src/fingerprint-auth.common.ts

@@ -10,6 +10,12 @@ export interface VerifyFingerprintOptions {
    * Default: 'Scan your finger' on iOS and the device default on Android (which is likely 'Enter your device password to continue').
    */
   message?: string;
+
+  /**
+   * Default 5 (seconds). Can be 0  to always trigger auth.
+   * Android only.
+   */
+  authenticationValidityDuration?: number;
 }
 
 export interface VerifyFingerprintWithCustomFallbackOptions {
@@ -24,6 +30,12 @@ export interface VerifyFingerprintWithCustomFallbackOptions {
    * Default: 'Enter password'.
    */
   fallbackMessage?: string;
+
+  /**
+   * Default 5 (seconds). Can be 0  to always trigger auth.
+   * Android only.
+   */
+  authenticationValidityDuration?: number;
 }
 
 export interface BiometricIDAvailableResult {

src/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-fingerprint-auth",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "A fingerprint authentication plugin for use in NativeScript apps",
   "main": "fingerprint-auth",
   "nativescript": {