From 15c0e294129f3fdfa9346dadff71d1b0c2439a0f Mon Sep 17 00:00:00 2001
From: EddyVerbruggen <eddyverbruggen@gmail.com>
Date: Tue, 30 Jan 2018 13:19:44 +0100
Subject: [PATCH] Custom UI for Fingerprint Auth #5

---
 LICENSE                                       |   2 +-
 README.md                                     |  34 +++--
 .../App_Resources/Android/values/strings.xml  |  23 +++
 demo/app/app.css                              |  19 ++-
 demo/app/main-page.xml                        |  10 +-
 demo/app/main-view-model.ts                   | 108 +++++++-------
 src/appcompat-activity.android.ts             |  42 ++++++
 src/fingerprint-auth.android.ts               | 140 ++++++++++++++----
 src/fingerprint-auth.common.ts                |  22 ++-
 src/fingerprint-auth.ios.ts                   |   4 +-
 src/package.json                              |   4 +-
 src/platforms/android/AndroidManifest.xml     |   7 +-
 src/platforms/android/include.gradle          |  15 ++
 13 files changed, 321 insertions(+), 109 deletions(-)
 create mode 100644 demo/app/App_Resources/Android/values/strings.xml
 create mode 100644 src/appcompat-activity.android.ts
 create mode 100644 src/platforms/android/include.gradle

diff --git a/LICENSE b/LICENSE
index c2ac7f0..c636872 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2017 Eddy Verbruggen
+Copyright 2018 Eddy Verbruggen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index e8ab703..b075b2c 100755
--- a/README.md
+++ b/README.md
@@ -69,20 +69,30 @@ class MyClass {
 Note that on the iOS simulator this will just `resolve()`.
 
 ```js
-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 5)
-}).then(
-    function() {
-      console.log("Fingerprint was OK");
-    },
-    function() {
-      console.log("Fingerprint NOT OK");
-    }
-)
+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 5)
+	  useCustomAndroidUI: false // set to true to use a different authentication screen (see below)
+	})
+	.then(() => console.log("Biometric ID OK"))
+	.catch(err => console.log(`Biometric ID NOT OK: ${JSON.stringify(err)}`));
 ```
 
+#### A nicer UX/UI on Android (`useCustomAndroidUI: true`)
+The default authentication screen on Android is a standalone screen that (depending on the exact Android version) looks kinda 'uninteresting'. So with version 6.0.0 this plugin added the ability to override the default screen and offer an iOS popover style which you can activate by passing in `useCustomAndroidUI: true` in the function above.
+
+##### Mandatory change
+To be able to use this screen, a change to `App_Resources/Android/AndroidManifest.xml` is required as our NativeScript activity needs to extend AppCompatActivity (note that in the future this may become the default for NativeScript apps).
+
+To do so, open the file and replace `<activity android:name="com.tns.NativeScriptActivity"` by `<activity android:name="org.nativescript.fingerprintplugin.AppCompatActivity"`.
+
+Note that if you forget this and set `useCustomAndroidUI: true` the plugin will `reject` the Promise with a relevant error message.
+
+##### Optional change
+If you want to override the default texts of this popover screen, then drop a file `App_Resources/Android/values/strings.xml` in your project and override the properties you like. See the demo app for an example.
+
 ### `verifyFingerprintWithCustomFallback` (iOS only, falls back to `verifyFingerprint` on Android)
 Instead of falling back to the default Passcode UI of iOS you can roll your own.
 Just show that when the error callback is invoked.
diff --git a/demo/app/App_Resources/Android/values/strings.xml b/demo/app/App_Resources/Android/values/strings.xml
new file mode 100644
index 0000000..f566ab0
--- /dev/null
+++ b/demo/app/App_Resources/Android/values/strings.xml
@@ -0,0 +1,23 @@
+<resources>
+  <string name="app_name">Fingerprint</string>
+  <string name="title_activity_kimera">Fingerprint</string>
+
+  <string name="cancel">Cancel</string>
+  <string name="use_password">Use password</string>
+  <string name="ok">OK</string>
+  <string name="password_description">Enter your password to continue</string>
+  <string name="new_fingerprint_enrolled_description">A new fingerprint was added to this device, so your password is required.</string>
+
+  <string name="use_fingerprint_in_future">Use fingerprint in the future</string>
+  <string name="use_fingerprint_to_authenticate_key" >use_fingerprint_to_authenticate_key</string>
+  <!--<string name="fingerprint_description">Confirm fingerprint 2 continue</string>-->
+  <string name="fingerprint_hint">Touch da sensor</string>
+
+  <!-- Error messages -->
+  <string name="fingerprint_auth_not_available_msg"><![CDATA[\"Secure lock screen hasn\'t set up.\\n\"                             + \"Go to \'Settings -> Security -> Fingerprint\' to set up a fingerprint\"]]></string>
+  <string name="fingerprint_auth_not_enrolled_msg">Go to \'Settings -> Security -> Fingerprint\' and register at least one fingerprint</string>
+  <string name="fingerprint_not_initialised_error_msg">Fingerprint not initialised</string>
+  <string name="fingerprint_not_available_error_msg">Fingerprint not available</string>
+  <string name="fingerprint_not_recognized_error_msg">Fingerprint not recognized</string>
+  <string name="warning_password_empty">Password can\'t be empty</string>
+</resources>
\ No newline at end of file
diff --git a/demo/app/app.css b/demo/app/app.css
index 1bdcb5f..53dbe1d 100644
--- a/demo/app/app.css
+++ b/demo/app/app.css
@@ -2,6 +2,10 @@
   background-color: #F4F4F4;
 }
 
+label {
+  font-size: 14;
+}
+
 .tab-content {
   color: #808080;
   padding: 20;
@@ -14,15 +18,14 @@
 }
 
 .status {
+  border-radius: 8;
   font-size: 16;
-  margin: 14;
-  padding: 8;
-  color: white;
-  background-color: brown;
-}
-
-label {
-  font-size: 14;
+  margin: 20;
+  padding: 18 12;
+  color: #444444;
+  background-color: #cccccc;
+  border-color: #aaaaaa;
+  border-width: 1px;
 }
 
 button {
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 836271c..73387d5 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -5,7 +5,7 @@
       <TabViewItem.view>
         <ScrollView>
           <StackLayout class="tab-content">
-            <Label text="{{ status }}" class="status" textWrap="true" style="text-align: center" width="100%"/>
+            <Label text="{{ status }}" class="status" textWrap="true" style="text-align: center"/>
             <Label text="Checking availability" class="title"/>
             <Button text="available?" tap="{{ doCheckAvailable }}" class="button" />
 
@@ -15,7 +15,13 @@
             <Label text="Scanning the fingerprint / face" class="title"/>
             <Label text="When scanning fails or is not possible, you can either use the built-in passcode fallback or handle it yourself (custom fallback)." textWrap="true"/>
             <Button text="verify with passcode fallback" tap="{{ doVerifyFingerprint }}" class="button" />
-            <Button text="verify with custom fallback" tap="{{ doVerifyFingerprintWithCustomFallback }}" class="button" />
+            <iOS>
+              <Button text="verify with custom fallback" tap="{{ doVerifyFingerprintWithCustomFallback }}" class="button" />
+            </iOS>
+            <Android>
+              <Label text="Note that this will fail if you previously cancelled authentication with the button above. Try reinstalling the app if funny things happen." textWrap="true"/>
+              <Button text="verify with custom UI" tap="{{ doVerifyFingerprintWithCustomUI }}" class="button" />
+            </Android>
           </StackLayout>
         </ScrollView>
       </TabViewItem.view>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 8a827fe..f5da77a 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,11 +1,10 @@
-import { Observable } from "tns-core-modules/data/observable";
 import { alert } from "tns-core-modules/ui/dialogs";
-import { FingerprintAuth } from "nativescript-fingerprint-auth";
-import { BiometricIDAvailableResult } from "../../src/fingerprint-auth.common";
+import { Observable } from "tns-core-modules/data/observable";
+import { FingerprintAuth, BiometricIDAvailableResult } from "nativescript-fingerprint-auth";
 
 export class HelloWorldModel extends Observable {
   private fingerprintAuth: FingerprintAuth;
-  public status: string = 'STATUS';
+  public status: string = "Tap a button..";
 
   constructor() {
     super();
@@ -14,64 +13,71 @@ export class HelloWorldModel extends Observable {
 
   public doCheckAvailable(): void {
     this.fingerprintAuth.available().then(
-      (result: BiometricIDAvailableResult) => {
-        console.log("available result: " + JSON.stringify(result));
-        this.set('status', "Biometric ID available? - " + (result.any ? (result.face ? "Face" : "Touch") : "NO"));
-      }
-    );
+        (result: BiometricIDAvailableResult) => {
+          console.log("available result: " + JSON.stringify(result));
+          this.set('status', "Biometric ID available? - " + (result.any ? (result.face ? "Face" : "Touch") : "NO"));
+        });
   }
 
   public doCheckFingerprintsChanged(): void {
     this.fingerprintAuth.didFingerprintDatabaseChange().then(
-      (changed: boolean) => {
-        this.set('status', "Biometric ID changed? - " + (changed ? "YES" : "NO"));
-      }
-    );
+        (changed: boolean) => {
+          this.set('status', "Biometric ID changed? - " + (changed ? "YES" : "NO"));
+        });
   }
 
   public doVerifyFingerprint(): void {
-    this.fingerprintAuth.verifyFingerprint({
-      message: 'Scan yer finger', // optional
-      authenticationValidityDuration: 10 // Android
-    }).then(
-      () => {
-        this.set('status', "Biometric ID OK");
-        alert({
-          title: "Biometric ID / passcode OK",
-          okButtonText: "Sweet"
+    this.fingerprintAuth.verifyFingerprint(
+        {
+          message: 'Scan yer finger', // optional
+          authenticationValidityDuration: 10 // Android
+        })
+        .then(() => {
+          alert({
+            title: "Biometric ID / passcode OK",
+            okButtonText: "Sweet"
+          });
+        })
+        .catch(err => {
+          alert({
+            title: "Biometric ID NOT OK / canceled",
+            message: JSON.stringify(err),
+            okButtonText: "Mmkay"
+          });
         });
-      },
-      err => {
-        this.set('status', "Biometric ID NOT OK: " + err);
-        alert({
-          title: "Biometric ID NOT OK / canceled",
-          okButtonText: "Mmkay"
-        });
-      }
-      );
+  }
+
+  public doVerifyFingerprintWithCustomUI(): void {
+    this.fingerprintAuth.verifyFingerprint(
+        {
+          message: 'Scan yer finger', // optional
+          useCustomAndroidUI: true // Android
+        })
+        .then(() => this.set('status', "Biometric ID OK"))
+        .catch(err => this.set('status', `Biometric ID NOT OK: " + ${JSON.stringify(err)}`));
   }
 
   public doVerifyFingerprintWithCustomFallback(): void {
-    this.fingerprintAuth.verifyFingerprintWithCustomFallback({
-      message: 'Scan yer finger', // optional
-      fallbackMessage: 'Enter PIN', // optional
-      authenticationValidityDuration: 10 // Android
-    }).then(
-      () => {
-        this.set('status', "Biometric ID OK");
-        alert({
-          title: "Biometric ID OK",
-          okButtonText: "Sweet"
-        });
-      },
-      error => {
-        this.set('status', "Biometric ID NOT OK: " + JSON.stringify(error));
-        alert({
-          title: "Biometric ID NOT OK",
-          message: (error.code === -3 ? "Show custom fallback" : error.message),
-          okButtonText: "Mmkay"
+    this.fingerprintAuth.verifyFingerprintWithCustomFallback(
+        {
+          message: 'Scan yer finger', // optional
+          fallbackMessage: 'Enter PIN', // optional
+          authenticationValidityDuration: 10 // Android
+        })
+        .then(() => {
+          this.set('status', "Biometric ID OK");
+          alert({
+            title: "Biometric ID OK",
+            okButtonText: "Sweet"
+          });
+        })
+        .catch(error => {
+          this.set('status', "Biometric ID NOT OK: " + JSON.stringify(error));
+          alert({
+            title: "Biometric ID NOT OK",
+            message: (error.code === -3 ? "Show custom fallback" : error.message),
+            okButtonText: "Mmkay"
+          });
         });
-      }
-      );
   }
 }
\ No newline at end of file
diff --git a/src/appcompat-activity.android.ts b/src/appcompat-activity.android.ts
new file mode 100644
index 0000000..82f22de
--- /dev/null
+++ b/src/appcompat-activity.android.ts
@@ -0,0 +1,42 @@
+import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";
+
+@JavaProxy("org.nativescript.fingerprintplugin.AppCompatActivity")
+class Activity extends android.support.v7.app.AppCompatActivity {
+  private _callbacks: AndroidActivityCallbacks;
+
+  protected onCreate(savedInstanceState: android.os.Bundle): void {
+    if (!this._callbacks) {
+      setActivityCallbacks(this);
+    }
+
+    this._callbacks.onCreate(this, savedInstanceState, super.onCreate);
+  }
+
+  protected onSaveInstanceState(outState: android.os.Bundle): void {
+    this._callbacks.onSaveInstanceState(this, outState, super.onSaveInstanceState);
+  }
+
+  protected onStart(): void {
+    this._callbacks.onStart(this, super.onStart);
+  }
+
+  protected onStop(): void {
+    this._callbacks.onStop(this, super.onStop);
+  }
+
+  protected onDestroy(): void {
+    this._callbacks.onDestroy(this, super.onDestroy);
+  }
+
+  public onBackPressed(): void {
+    this._callbacks.onBackPressed(this, super.onBackPressed);
+  }
+
+  public onRequestPermissionsResult(requestCode: number, permissions: Array<String>, grantResults: Array<number>): void {
+    this._callbacks.onRequestPermissionsResult(this, requestCode, permissions, grantResults, undefined);
+  }
+
+  protected onActivityResult(requestCode: number, resultCode: number, data: android.content.Intent): void {
+    this._callbacks.onActivityResult(this, requestCode, resultCode, data, super.onActivityResult);
+  }
+}
\ No newline at end of file
diff --git a/src/fingerprint-auth.android.ts b/src/fingerprint-auth.android.ts
index 9b5ace1..38884dc 100755
--- a/src/fingerprint-auth.android.ts
+++ b/src/fingerprint-auth.android.ts
@@ -1,13 +1,13 @@
 import * as app from "tns-core-modules/application";
 import * as utils from "tns-core-modules/utils/utils";
 import {
-  BiometricIDAvailableResult,
+  BiometricIDAvailableResult, ERROR_CODES,
   FingerprintAuthApi,
   VerifyFingerprintOptions,
   VerifyFingerprintWithCustomFallbackOptions
 } from "./fingerprint-auth.common";
 
-declare const android: any;
+declare const android, com: any;
 
 const KeyStore = java.security.KeyStore;
 const Cipher = javax.crypto.Cipher;
@@ -21,6 +21,7 @@ const REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS = 788; // arbitrary
 
 export class FingerprintAuth implements FingerprintAuthApi {
   private keyguardManager: any;
+  private fingerPrintManager: any;
 
   constructor() {
     this.keyguardManager = utils.ad.getApplicationContext().getSystemService("keyguard");
@@ -65,48 +66,129 @@ export class FingerprintAuth implements FingerprintAuthApi {
   didFingerprintDatabaseChange(): Promise<boolean> {
     return new Promise((resolve, reject) => {
       // not implemented for Android
+      // TODO should be possible..
       resolve(false);
     });
   }
 
+  private verifyWithCustomAndroidUI(resolve, reject, authenticationCallback) {
+    this.fingerPrintManager.authenticate(
+        authenticationCallback,
+        app.android.foregroundActivity.getSupportFragmentManager());
+  }
+
   verifyFingerprint(options: VerifyFingerprintOptions): Promise<any> {
     return new Promise((resolve, reject) => {
       try {
-        app.android.foregroundActivity.onActivityResult = (requestCode, resultCode, data) => {
-          if (requestCode === REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
-            if (resultCode === android.app.Activity.RESULT_OK) { // OK = -1
-              // the user has just authenticated via the ConfirmDeviceCredential activity
-              resolve({
-                any: true,
-                touch: true
+        // in case 'activity.getSupportFragmentManager' is available ({N} started supporting it,
+        // or the user added our Activity to their Android manifest), use the 3rd party FP library
+        const hasSupportFragment = app.android.foregroundActivity.getSupportFragmentManager !== undefined;
+
+        if (options.useCustomAndroidUI && !hasSupportFragment) {
+          reject({
+            code: ERROR_CODES.DEVELOPER_ERROR,
+            message: "Custom Fingerprint UI requires changes to AndroidManifest.xml. See the nativescript-fingerprint-auth documentation."
+          });
+
+        } else if (options.useCustomAndroidUI && hasSupportFragment) {
+          if (!this.fingerPrintManager) {
+            this.fingerPrintManager = new com.jesusm.kfingerprintmanager.KFingerprintManager(utils.ad.getApplicationContext(), KEY_NAME);
+          }
+          const that = this;
+          const callback = new com.jesusm.kfingerprintmanager.KFingerprintManager.AuthenticationCallback({
+            attempts: 0,
+            onAuthenticationFailedWithHelp(help): void {
+              if (++this.attempts < 3) {
+                // just invoke the UI again as it's very sensitive (need a timeout to prevent an infinite loop)
+                setTimeout(() => that.verifyWithCustomAndroidUI(resolve, reject, this), 50);
+              } else {
+                reject({
+                  code: ERROR_CODES.RECOVERABLE_ERROR,
+                  message: help
+                });
+              }
+            },
+            onAuthenticationSuccess(): void {
+              resolve();
+            },
+            onSuccessWithManualPassword(password): void {
+              resolve();
+            },
+            onFingerprintNotRecognized(): void {
+              if (++this.attempts < 3) {
+                // just invoke the UI again as it's very sensitive (need a timeout to prevent an infinite loop)
+                setTimeout(() => that.verifyWithCustomAndroidUI(resolve, reject, this), 50);
+              } else {
+                reject({
+                  code: ERROR_CODES.NOT_RECOGNIZED,
+                  message: "Fingerprint not recognized."
+                });
+              }
+            },
+            onFingerprintNotAvailable(): void {
+              reject({
+                code: ERROR_CODES.NOT_CONFIGURED,
+                message: "Secure lock screen hasn't been set up.\n Go to \"Settings -> Security -> Screenlock\" to set up a lock screen."
+              });
+            },
+            onCancelled(): void {
+              reject({
+                code: ERROR_CODES.PASSWORD_FALLBACK_SELECTED,
+                message: "Cancelled by user"
               });
-            } else {
-              // the user has quit the activity without providing credentials
-              reject('The last authentication attempt was cancelled.');
             }
-          }
-        };
+          });
+          this.verifyWithCustomAndroidUI(resolve, reject, callback);
 
-        if (!this.keyguardManager) {
-          reject('Sorry, your device does not support keyguardManager.');
-        }
-        if (this.keyguardManager && !this.keyguardManager.isKeyguardSecure()) {
-          reject('Secure lock screen hasn\'t been set up.\n Go to "Settings -> Security -> Screenlock" to set up a lock screen.');
-        }
+        } else {
+          app.android.foregroundActivity.onActivityResult = (requestCode, resultCode, data) => {
+            if (requestCode === REQUEST_CODE_CONFIRM_DEVICE_CREDENTIALS) {
+              if (resultCode === android.app.Activity.RESULT_OK) { // OK = -1
+                // the user has just authenticated via the ConfirmDeviceCredential activity
+                resolve();
+              } else {
+                // the user has quit the activity without providing credentials
+                reject({
+                  code: ERROR_CODES.USER_CANCELLED,
+                  message: "User cancelled."
+                });
+              }
+            }
+          };
 
-        FingerprintAuth.createKey(options);
+          if (!this.keyguardManager) {
+            reject({
+              code: ERROR_CODES.NOT_AVAILABLE,
+              message: "Keyguard manager not available."
+            });
+          }
+          if (this.keyguardManager && !this.keyguardManager.isKeyguardSecure()) {
+            reject({
+              code: ERROR_CODES.NOT_CONFIGURED,
+              message: "Secure lock screen hasn't been set up.\n Go to \"Settings -> Security -> Screenlock\" to set up a lock screen."
+            });
+          }
 
-        const tryEncryptResult: boolean = this.tryEncrypt(options);
-        if (tryEncryptResult === undefined) {
-          // this one is async
-        } else if (tryEncryptResult === true) {
-          resolve();
-        } else {
-          reject();
+          FingerprintAuth.createKey(options);
+
+          const tryEncryptResult: boolean = this.tryEncrypt(options);
+          if (tryEncryptResult === undefined) {
+            // this one is async
+          } else if (tryEncryptResult === true) {
+            resolve();
+          } else {
+            reject({
+              code: ERROR_CODES.UNEXPECTED_ERROR,
+              message: "See the console for error logs."
+            });
+          }
         }
       } catch (ex) {
         console.log(`Error in fingerprint-auth.verifyFingerprint: ${ex}`);
-        reject(ex);
+        reject({
+          code: ERROR_CODES.UNEXPECTED_ERROR,
+          message: ex
+        });
       }
     });
   }
diff --git a/src/fingerprint-auth.common.ts b/src/fingerprint-auth.common.ts
index 9764234..7526fb2 100644
--- a/src/fingerprint-auth.common.ts
+++ b/src/fingerprint-auth.common.ts
@@ -1,3 +1,14 @@
+export enum ERROR_CODES {
+  PASSWORD_FALLBACK_SELECTED = -3, // historically this is what iOS uses, so using that as well
+  DEVELOPER_ERROR = 10,
+  NOT_AVAILABLE = 20,
+  NOT_CONFIGURED = 30,
+  NOT_RECOGNIZED = 40,
+  RECOVERABLE_ERROR = 50,
+  USER_CANCELLED = 60,
+  UNEXPECTED_ERROR = 70
+}
+
 export interface VerifyFingerprintOptions {
   /**
    * The optional title in the fingerprint page for android.
@@ -16,6 +27,13 @@ export interface VerifyFingerprintOptions {
    * Android only.
    */
   authenticationValidityDuration?: number;
+
+  /**
+   * On Android you can either use our fancy proprietary UI or the stock UI Android ships with.
+   * Default false (so use the default UI).
+   * Android only.
+   */
+  useCustomAndroidUI?: boolean;
 }
 
 export interface VerifyFingerprintWithCustomFallbackOptions {
@@ -52,11 +70,11 @@ export interface FingerprintAuthApi {
   /**
    * This (recommended) method uses keychain instead of localauth so the passcode fallback can be used.
    */
-  verifyFingerprint(options: VerifyFingerprintOptions): Promise<any>;
+  verifyFingerprint(options: VerifyFingerprintOptions): Promise<void>;
 
   /**
    * This implementation uses LocalAuthentication and has no built-in passcode fallback on iOS.
    * On Android this is exactly the same as 'verifyFingerprint'
    */
-  verifyFingerprintWithCustomFallback(options: VerifyFingerprintWithCustomFallbackOptions): Promise<any>;
+  verifyFingerprintWithCustomFallback(options: VerifyFingerprintWithCustomFallbackOptions): Promise<void>;
 }
\ No newline at end of file
diff --git a/src/fingerprint-auth.ios.ts b/src/fingerprint-auth.ios.ts
index 5698838..af348ed 100755
--- a/src/fingerprint-auth.ios.ts
+++ b/src/fingerprint-auth.ios.ts
@@ -79,7 +79,7 @@ export class FingerprintAuth implements FingerprintAuthApi {
   /**
    * this 'default' method uses keychain instead of localauth so the passcode fallback can be used
    */
-  verifyFingerprint(options: VerifyFingerprintOptions): Promise<any> {
+  verifyFingerprint(options: VerifyFingerprintOptions): Promise<void> {
     return new Promise((resolve, reject) => {
       try {
         if (keychainItemServiceName === null) {
@@ -118,7 +118,7 @@ export class FingerprintAuth implements FingerprintAuthApi {
   /**
    * This implementation uses LocalAuthentication and has no built-in passcode fallback
    */
-  verifyFingerprintWithCustomFallback(options: VerifyFingerprintWithCustomFallbackOptions): Promise<any> {
+  verifyFingerprintWithCustomFallback(options: VerifyFingerprintWithCustomFallbackOptions): Promise<void> {
     return new Promise((resolve, reject) => {
       try {
         const laContext = LAContext.new();
diff --git a/src/package.json b/src/package.json
index 9e440bb..2acc448 100755
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-fingerprint-auth",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "A fingerprint authentication plugin for use in NativeScript apps",
   "main": "fingerprint-auth",
   "nativescript": {
@@ -39,6 +39,8 @@
     "TouchID",
     "Touch ID",
     "FaceID",
+    "Biometric",
+    "Biometric ID",
     "Fingerprint",
     "Fingerprint scanner",
     "Face ID",
diff --git a/src/platforms/android/AndroidManifest.xml b/src/platforms/android/AndroidManifest.xml
index 7684e44..048d7ee 100644
--- a/src/platforms/android/AndroidManifest.xml
+++ b/src/platforms/android/AndroidManifest.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
   <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+
+  <uses-sdk tools:overrideLibrary="com.jesusm.kfingerprintmanager"/>
+
 </manifest>
\ No newline at end of file
diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle
new file mode 100644
index 0000000..11eaa15
--- /dev/null
+++ b/src/platforms/android/include.gradle
@@ -0,0 +1,15 @@
+android {
+	productFlavors {
+		"nativescript-fpauth" {
+			dimension "nativescript-fpauth"
+		}
+	}
+}
+
+repositories {
+	maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+	compile 'com.github.JesusM:FingerprintManager:v2.0.2'
+}
\ No newline at end of file