Skip to content

Commit

Permalink
Merge pull request NiklasMerz#9 from exxbrain/2.0.0-biometricpromt-an…
Browse files Browse the repository at this point in the history
…d-consistent-callbacks

2.0.0 biometricpromt and consistent callbacks
  • Loading branch information
greaterking authored Oct 18, 2019
2 parents 7e5ff42 + 96397eb commit 9b594c6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"test-travis": "npm run test-ios",
"test-appveyor": "npm run test-browser",
"test-local": "npm run test-browser && npm run test-android && npm run test-ios",
"test-android": "npx cordova-paramedic --platform android@8.1.0 --plugin $(pwd)",
"test-android": "npx cordova-paramedic --platform android --plugin $(pwd)",
"test-ios": "npx cordova-paramedic --platform ios --plugin $(pwd) --verbose",
"test-windows": "npx cordova-paramedic --platform windows --plugin $(pwd)",
"test-browser": "npx cordova-paramedic --platform browser --plugin $(pwd)",
Expand Down
1 change: 1 addition & 0 deletions src/android/BiometricActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ private void onError(int errorCode, @NonNull CharSequence errString) {

switch (errorCode)
{
case BiometricPrompt.ERROR_USER_CANCELED:
case BiometricPrompt.ERROR_CANCELED:
finishWithError(PluginError.BIOMETRIC_FINGERPRINT_DISMISSED);
return;
Expand Down
10 changes: 10 additions & 0 deletions src/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
dependencies {

/**
* The android-biometric.aar file has been taken from com.github.exxbrain:android-biometric library.
* Android biometric library is a clone of androidx.biometric library adapted for non-androidx apps.
* This project could be found at https://github.com/exxbrain/android-biometric.
* It has Apache License 2.0.
*
* TODO: Temporary solution. Should be removed after moving cordova-android to androidx. Then use androidx.biometric.
*/
implementation files('src/main/libs/android-biometric.aar')

implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
Expand Down

0 comments on commit 9b594c6

Please sign in to comment.