#212 added more detailed handling of android error result

Author: smstuebe

doc/changelog.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 2.1.5
+
+- #212 Android authentication result is now `Cancelled` instead of `Failed` if the user presses a button to dismiss the dialog.
+
 ### 2.1.4
 
 - #203, #205 fixed mLifecycleObserver related crash on some devices (thx @Seuleuzeuh)

src/Directory.build.props

@@ -6,7 +6,7 @@
     <Copyright>Copyright (c) Sven-Michael Stübe</Copyright> 
     <Authors>Sven-Michael Stübe</Authors>
     <Owners>Sven-Michael Stübe</Owners>
-    <Version>2.1.4</Version>
+    <Version>2.1.5</Version>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryUrl>https://github.com/smstuebe/xamarin-fingerprint</RepositoryUrl>

src/MvvmCross.Plugins.Fingerprint/MvvmCross.Plugins.Fingerprint.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461;Xamarin.Mac20;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid9;uap10.0.16299;Tizen40;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;Xamarin.Mac20;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid9;uap10.0.19041;Tizen40;</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AssemblyName>MvvmCross.Plugins.Fingerprint</AssemblyName>

src/Plugin.Fingerprint/Platforms/Android/AuthenticationHandler.cs

@@ -42,10 +42,13 @@ public override void OnAuthenticationError(int errorCode, ICharSequence errStrin
             var message = errString != null ? errString.ToString() : string.Empty;
             var result = new FingerprintAuthenticationResult { Status = FingerprintAuthenticationResultStatus.Failed, ErrorMessage = message };
 
-            if (errorCode == BiometricPrompt.ErrorLockout)
+            result.Status = errorCode switch
             {
-                result.Status = FingerprintAuthenticationResultStatus.TooManyAttempts;
-            }
+                BiometricPrompt.ErrorLockout => FingerprintAuthenticationResultStatus.TooManyAttempts,
+                BiometricPrompt.ErrorUserCanceled => FingerprintAuthenticationResultStatus.Canceled,
+                BiometricPrompt.ErrorNegativeButton => FingerprintAuthenticationResultStatus.Canceled,
+                _ => FingerprintAuthenticationResultStatus.Failed
+            };
 
             SetResultSafe(result);
         }

src/Plugin.Fingerprint/Plugin.Fingerprint.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net45;Xamarin.Mac20;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid90;uap10.0.16299;Tizen40;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net45;Xamarin.Mac20;Xamarin.iOS10;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid90;uap10.0.19041;Tizen40;</TargetFrameworks>
     <LangVersion>8</LangVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>