From ef2123422c5e90524c0e339ea45b75135d1a538b Mon Sep 17 00:00:00 2001
From: Marco Dalla Libera <info@marcodallalibera.it>
Date: Mon, 12 Aug 2019 15:09:13 +0200
Subject: [PATCH 1/4] IMPROVED UNDERSCREEN FINGERPRINT, ISSUE #831

Improved underscreen fingerprint as request in issue #831 by giving the users
the ability to disable the sensor in the PasswordActivity. Now pressing the
fingerprint icon opens up a dialog that has the option to enable/disable the
sensor.
I added two new strings to the resources (enable sensor - disable sensor) and
already translated them to italian.
---
 src/keepass2android/PasswordActivity.cs       | 28 +++++++++++++++----
 .../Resources/values-it/strings.xml           |  2 ++
 .../Resources/values/strings.xml              |  4 ++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 12777d88..69eab3e2 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -904,10 +904,28 @@ namespace keepass2android
 					AlertDialog.Builder b = new AlertDialog.Builder(this);
 					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.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+                        b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
+                        {
+                            btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
+                            _fingerprintDec?.StopListening();
+                            _fingerprintDec = null;
+                        });
+                    }
+                    else
+                    {
+                        b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+                        b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
+                        {
+                            InitFingerprintUnlock();
+                        });
+                    }
 					b.Show();
 				};
-				_fingerprintPermissionGranted = true;
+                _fingerprintPermissionGranted = true;
 			}
 		}
 
@@ -919,7 +937,7 @@ namespace keepass2android
 			edit.Commit();
 		}
 
-		
+
 		public void OnFingerprintError(string message)
 		{
 			var btn = FindViewById<ImageButton>(Resource.Id.fingerprintbtn);
@@ -999,7 +1017,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 +1130,7 @@ namespace keepass2android
 
 			var changeDbButton = FindViewById<Button>(Resource.Id.change_db);
 			string label = changeDbButton.Text;
-			if (label.EndsWith("…"))
+			if (label.EndsWith("�"))
 				changeDbButton.Text = label.Substring(0, label.Length - 1);
 		    changeDbButton.Click += (sender, args) => GoToFileSelectActivity();
 
diff --git a/src/keepass2android/Resources/values-it/strings.xml b/src/keepass2android/Resources/values-it/strings.xml
index 2ab39f83..e31f68df 100644
--- a/src/keepass2android/Resources/values-it/strings.xml
+++ b/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>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 26b77e08..06211d9a 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -67,10 +67,12 @@
 	<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>
     
   
-  
+
   <string name="clipboard_timeout">Clipboard timeout</string>
   <string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
   <string name="copy_username">Select to copy username to clipboard</string>

From 0970f0659a2b3cc2ca92fad23cfe8b7f6407d606 Mon Sep 17 00:00:00 2001
From: Marco Dalla Libera <info@marcodallalibera.it>
Date: Mon, 12 Aug 2019 15:31:45 +0200
Subject: [PATCH 2/4] Fixed wrong indentation in files.

---
 src/keepass2android/PasswordActivity.cs       | 37 +++++++++----------
 .../Resources/values/strings.xml              |  6 +--
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 69eab3e2..3e288ad2 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -907,25 +907,25 @@ namespace keepass2android
 
 					if (_fingerprintDec != null)
 					{
-                        b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
-                        b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
-                        {
-                            btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
-                            _fingerprintDec?.StopListening();
-                            _fingerprintDec = null;
-                        });
-                    }
-                    else
-                    {
-                        b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
-                        b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
-                        {
-                            InitFingerprintUnlock();
-                        });
-                    }
+						b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
+						{
+							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
+							_fingerprintDec?.StopListening();
+							_fingerprintDec = null;
+						});
+					}
+					else
+					{
+						b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
+						{
+							InitFingerprintUnlock();
+						});
+					}
 					b.Show();
 				};
-                _fingerprintPermissionGranted = true;
+				_fingerprintPermissionGranted = true;
 			}
 		}
 
@@ -937,7 +937,6 @@ namespace keepass2android
 			edit.Commit();
 		}
 
-
 		public void OnFingerprintError(string message)
 		{
 			var btn = FindViewById<ImageButton>(Resource.Id.fingerprintbtn);
@@ -1130,7 +1129,7 @@ namespace keepass2android
 
 			var changeDbButton = FindViewById<Button>(Resource.Id.change_db);
 			string label = changeDbButton.Text;
-			if (label.EndsWith("�"))
+			if (label.EndsWith(""))
 				changeDbButton.Text = label.Substring(0, label.Length - 1);
 		    changeDbButton.Click += (sender, args) => GoToFileSelectActivity();
 
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 06211d9a..ae35da65 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/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,8 +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="disable_sensor">Disable sensor</string>
+  <string name="enable_sensor">Enable sensor</string>
   <string name="ClearClipboard">Clipboard cleared.</string>
     
   

From 409c3eec55d7c1a76a777486804011833ff12c78 Mon Sep 17 00:00:00 2001
From: Marco Dalla Libera <info@marcodallalibera.it>
Date: Thu, 15 Aug 2019 10:44:03 +0200
Subject: [PATCH 3/4] Added underscreen fingerprint improvement to
 QuickUnlockActivity.

---
 src/keepass2android/QuickUnlock.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android/QuickUnlock.cs
index 61557499..99e5d96d 100644
--- a/src/keepass2android/QuickUnlock.cs
+++ b/src/keepass2android/QuickUnlock.cs
@@ -181,7 +181,25 @@ namespace keepass2android
 					AlertDialog.Builder b = new AlertDialog.Builder(this);
 					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.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
+						{
+							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
+							_fingerprintIdentifier?.StopListening();
+							_fingerprintIdentifier = null;
+						});
+					}
+					else
+					{
+						b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
+						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
+						{
+							InitFingerprintUnlock();
+						});
+					}
 					b.Show();
 				};
 				_fingerprintPermissionGranted = true;

From 5f90628d2df50daa9fc11cde2b73d8464dc104ca Mon Sep 17 00:00:00 2001
From: Marco Dalla Libera <info@marcodallalibera.it>
Date: Thu, 15 Aug 2019 14:45:24 +0200
Subject: [PATCH 4/4] Improved code by using a single call to
 setPositiveButton.

The positive button is always the same so there's no need to use two different
calls, I just brought one outside the if statement. It was an artifact left
from a previous test where I was changing both of the buttons.
---
 src/keepass2android/PasswordActivity.cs | 4 +---
 src/keepass2android/QuickUnlock.cs      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 3e288ad2..86c15664 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -904,10 +904,9 @@ namespace keepass2android
 					AlertDialog.Builder b = new AlertDialog.Builder(this);
 					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.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
 						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
 						{
 							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
@@ -917,7 +916,6 @@ namespace keepass2android
 					}
 					else
 					{
-						b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
 						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
 						{
 							InitFingerprintUnlock();
diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android/QuickUnlock.cs
index 99e5d96d..cf82a393 100644
--- a/src/keepass2android/QuickUnlock.cs
+++ b/src/keepass2android/QuickUnlock.cs
@@ -181,10 +181,9 @@ namespace keepass2android
 					AlertDialog.Builder b = new AlertDialog.Builder(this);
 					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.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
 						b.SetNegativeButton(Resource.String.disable_sensor, (senderAlert, alertArgs) =>
 						{
 							btn.SetImageResource(Resource.Drawable.ic_fingerprint_error);
@@ -194,7 +193,6 @@ namespace keepass2android
 					}
 					else
 					{
-						b.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => ((Dialog)o).Dismiss());
 						b.SetNegativeButton(Resource.String.enable_sensor, (senderAlert, alertArgs) =>
 						{
 							InitFingerprintUnlock();