From 7964cfa88cbf0d3d71a9bdd47aebefd588c1a52a Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Mon, 17 Mar 2025 01:14:30 +0530
Subject: [PATCH] Setup full-screen app lock

See https://github.com/FossifyOrg/Notes/issues/97
---
 .../fossify/notes/activities/MainActivity.kt  | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
index aebdb5eb..ab06ff0d 100644
--- a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
@@ -83,9 +83,6 @@ class MainActivity : SimpleActivity() {
 
     private val binding by viewBinding(ActivityMainBinding::inflate)
 
-    private var mIsPasswordProtectionPending = false
-    private var mWasProtectionHandled = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
         super.onCreate(savedInstanceState)
@@ -116,35 +113,14 @@ class MainActivity : SimpleActivity() {
         checkIntents(intent)
 
         storeStateVariables()
+        if (config.showNotePicker && savedInstanceState == null && hasNoIntent) {
+            displayOpenNoteDialog()
+        }
 
         wasInit = true
 
         checkAppOnSDCard()
         setupSearchButtons()
-
-        mIsPasswordProtectionPending = config.isAppPasswordProtectionOn
-
-        if (config.showNotePicker && savedInstanceState == null && hasNoIntent && !mIsPasswordProtectionPending) {
-            displayOpenNoteDialog()
-        }
-
-        if (savedInstanceState == null) {
-            binding.viewPager.beGoneIf(mIsPasswordProtectionPending)
-            if (mIsPasswordProtectionPending && !mWasProtectionHandled) {
-                handleAppPasswordProtection {
-                    mWasProtectionHandled = it
-                    if (it) {
-                        mIsPasswordProtectionPending = false
-                        if (config.showNotePicker && savedInstanceState == null && hasNoIntent) {
-                            displayOpenNoteDialog()
-                        }
-                        binding.viewPager.beVisible()
-                    } else {
-                        finish()
-                    }
-                }
-            }
-        }
     }
 
     override fun onResume() {
@@ -299,11 +275,13 @@ class MainActivity : SimpleActivity() {
                 if (it) {
                     mAdapter?.saveAllFragmentTexts()
                 }
+                appLockManager.lock()
                 super.onBackPressed()
             }
         } else if (isSearchActive) {
             closeSearch()
         } else {
+            appLockManager.lock()
             super.onBackPressed()
         }
     }