Merge branch 'marcoDallas-fingerprint-improvement-#831'

src/keepass2android/PasswordActivity.cs

@@ -905,6 +905,22 @@ namespace keepass2android
 					b.SetTitle(Resource.String.fingerprint_prefs);
 					b.SetMessage(btn.Tag.ToString());
 					b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+					if (_fingerprintDec != null)
+					{
+						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
+						{
+							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
+							_fingerprintDec?.StopListening();
+							_fingerprintDec = null;
+						});
+					}
+					else
+					{
+						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
+						{
+							InitFingerprintUnlock();
+						});
+					}
 					b.Show();
 				};
 				_fingerprintPermissionGranted = true;
@@ -919,7 +935,6 @@ namespace keepass2android
 			edit.Commit();
 		}
 
-		
 		public void OnFingerprintError(string message)
 		{
 			var btn = FindViewById<ImageButton>(Resource.Id.fingerprintbtn);
@@ -999,7 +1014,7 @@ namespace keepass2android
 					
 				if (_appnameclickCount == 7)
 				{
-					throw new Exception("this is an easter egg crash (to test uncaught exceptions.");
+					throw new Exception("this is an easter egg crash (to test uncaught exceptions.)");
 				}
 					
 
@@ -1112,7 +1127,7 @@ namespace keepass2android
 
 			var changeDbButton = FindViewById<Button>(Resource.Id.change_db);
 			string label = changeDbButton.Text;
-			if (label.EndsWith("<EFBFBD>"))
+			if (label.EndsWith(""))
 				changeDbButton.Text = label.Substring(0, label.Length - 1);
 		    changeDbButton.Click += (sender, args) => GoToFileSelectActivity();
 

src/keepass2android/QuickUnlock.cs

@@ -182,6 +182,22 @@ namespace keepass2android
 					b.SetTitle(Resource.String.fingerprint_prefs);
 					b.SetMessage(btn.Tag.ToString());
 					b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+					if (_fingerprintIdentifier != null)
+					{
+						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
+						{
+							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
+							_fingerprintIdentifier?.StopListening();
+							_fingerprintIdentifier = null;
+						});
+					}
+					else
+					{
+						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
+						{
+							InitFingerprintUnlock();
+						});
+					}
 					b.Show();
 				};
 				_fingerprintPermissionGranted = true;

src/keepass2android/Resources/values-it/strings.xml

@@ -62,6 +62,8 @@
   <string name="brackets">Parentesi</string>
   <string name="cancel">Annulla</string>
   <string name="Ok">Ok</string>
+  <string name="disable_sensor">Disabilita sensore</string>
+  <string name="enable_sensor">Abilita sensore</string>
   <string name="ClearClipboard">Appunti eliminati.</string>
   <string name="clipboard_timeout">Scadenza appunti</string>
   <string name="clipboard_timeout_summary">Durata degli appunti dopo la copia di nome utente o password</string>

src/keepass2android/Resources/values/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">Feedback</string>
@@ -67,6 +67,8 @@
 	<string name="brackets">Brackets</string>
   <string name="cancel">Cancel</string>
   <string name="Ok">Ok</string>
+  <string name="disable_sensor">Disable sensor</string>
+  <string name="enable_sensor">Enable sensor</string>
   <string name="ClearClipboard">Clipboard cleared.</string>