From 37674503438f93f037e2fc6ce90a2a3e7412ebad Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Sat, 12 Dec 2020 14:14:05 +0100
Subject: [PATCH] allow to disable check for secure screen to solve #1501

---
 src/keepass2android/NoSecureDisplayActivity.cs      | 13 +++++++++++++
 .../Resources/layout/no_secure_display_layout.axml  |  5 ++++-
 src/keepass2android/Utils/Util.cs                   |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/keepass2android/NoSecureDisplayActivity.cs b/src/keepass2android/NoSecureDisplayActivity.cs
index d01091fe..99e0180a 100644
--- a/src/keepass2android/NoSecureDisplayActivity.cs
+++ b/src/keepass2android/NoSecureDisplayActivity.cs
@@ -7,6 +7,7 @@ using Android.App;
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Android.Preferences;
 using Android.Runtime;
 using Android.Support.V7.App;
 using Android.Views;
@@ -34,6 +35,18 @@ namespace keepass2android
             {
                 AppSettingsActivity.Launch(this);
             };
+            FindViewById<Button>(Resource.Id.disable_secure_screen_check).Click += (sender, args) =>
+            {
+                var prefs = PreferenceManager.GetDefaultSharedPreferences(Application.Context);
+                prefs.Edit()
+                    .PutBoolean("no_secure_display_check", true)
+                    .Commit();
+                Finish();
+            };
+            FindViewById<Button>(Resource.Id.btn_close).Click += (sender, args) =>
+            {
+                Finish();
+            };
 
             var toolbar = FindViewById<AndroidX.AppCompat.Widget.Toolbar>(Resource.Id.mytoolbar);
 
diff --git a/src/keepass2android/Resources/layout/no_secure_display_layout.axml b/src/keepass2android/Resources/layout/no_secure_display_layout.axml
index 1dfd8257..f6e2613e 100644
--- a/src/keepass2android/Resources/layout/no_secure_display_layout.axml
+++ b/src/keepass2android/Resources/layout/no_secure_display_layout.axml
@@ -21,5 +21,8 @@
     android:layout_height="wrap_content" />
 	<Button android:id="@+id/btn_goto_settings" android:text="@string/IconVisibilityInfo_Android8_btnSettings" android:layout_width="match_parent"
     android:layout_height="wrap_content" />
-
+  <Button android:id="@+id/disable_secure_screen_check" android:text="@string/disable_secure_screen_check" android:layout_width="match_parent"
+          android:layout_height="wrap_content" />
+  <Button android:id="@+id/btn_close" android:text="@string/menu_close" android:layout_width="match_parent"
+          android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/src/keepass2android/Utils/Util.cs b/src/keepass2android/Utils/Util.cs
index 3c740fe5..13bf9a24 100644
--- a/src/keepass2android/Utils/Util.cs
+++ b/src/keepass2android/Utils/Util.cs
@@ -608,9 +608,9 @@ namespace keepass2android
 
 	    public static void MakeSecureDisplay(Activity context)
 	    {
-	        if (SecureDisplayConfigured(context))
-	        {
-	            var hasUnsecureDisplay = HasUnsecureDisplay(context);
+	        if (SecureDisplayConfigured(context) && PreferenceManager.GetDefaultSharedPreferences(context).GetBoolean("no_secure_display_check", false))
+            {
+                var hasUnsecureDisplay = HasUnsecureDisplay(context);
 	            if (hasUnsecureDisplay)
 	            {
 	                var intent = new Intent(context, typeof(NoSecureDisplayActivity));