Merge pull request #11 from Anaxagor1987/cancelation_signal-fix-biome…

…tric-prompt-23 Fixes the issue with dialog not dismissed by cancellation signal
fython · Sep 14, 2018 · 1a10f27 · 1a10f27
2 parents 9d0da44 + 90e9b18
commit 1a10f27
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/library/src/main/java/moe/feng/support/biometricprompt/BiometricPromptApi23Impl.java b/library/src/main/java/moe/feng/support/biometricprompt/BiometricPromptApi23Impl.java
@@ -97,10 +97,14 @@ public void authenticate(
         }
         this.cancellationSignal = cancel;
         this.callback = callback;
-        if (cancel == null) {
-            cancel = new CancellationSignal();
+        if (cancellationSignal == null) {
+            cancellationSignal = new CancellationSignal();
         }
-        cancel.setOnCancelListener(dialog::cancel);
+        CancellationSignal innerCancel = new CancellationSignal();
+        cancellationSignal.setOnCancelListener(() -> {
+            innerCancel.cancel();
+            dialog.cancel();
+        });
 
         dialog.setOnDismissListener(dialogInterface -> {
             if (cancellationSignal != null && !cancellationSignal.isCanceled()) {
@@ -116,7 +120,7 @@ public void authenticate(
             dialog.getFingerprintIcon().setState(
                     FingerprintIconView.State.ON, false);
             fingerprintManager.authenticate(
-                    toCryptoObjectApi23(crypto), cancellationSignal,
+                    toCryptoObjectApi23(crypto), innerCancel,
                     0, fmAuthCallback, mainHandler);
         });
 
@@ -133,16 +137,20 @@ BiometricPromptCompatDialog getAuthenticateDialogForFragment(
         }
         this.cancellationSignal = cancel;
         this.callback = callback;
-        if (cancel == null) {
-            cancel = new CancellationSignal();
+        if (cancellationSignal == null) {
+            cancellationSignal = new CancellationSignal();
         }
-        cancel.setOnCancelListener(dialog::cancel);
+        CancellationSignal innerCancel = new CancellationSignal();
+        cancellationSignal.setOnCancelListener(() -> {
+            innerCancel.cancel();
+            dialog.cancel();
+        });
 
         dialog.setOnShowListener(d -> {
             dialog.getFingerprintIcon().setState(
                     FingerprintIconView.State.ON, false);
             fingerprintManager.authenticate(
-                    toCryptoObjectApi23(crypto), cancellationSignal,
+                    toCryptoObjectApi23(crypto), innerCancel,
                     0, fmAuthCallback, mainHandler);
         });