From e58741afd931d051b28f3ed7726bb477708267b8 Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:09:07 +0200
Subject: [PATCH] Fixed showing note picker before unlocking the app (#46)

---
 .../org/fossify/notes/activities/MainActivity.kt       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 bb09cb04..2813d203 100644
--- a/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/notes/activities/MainActivity.kt
@@ -116,9 +116,6 @@ class MainActivity : SimpleActivity() {
         checkIntents(intent)
 
         storeStateVariables()
-        if (config.showNotePicker && savedInstanceState == null && hasNoIntent) {
-            displayOpenNoteDialog()
-        }
 
         wasInit = true
 
@@ -127,6 +124,10 @@ class MainActivity : SimpleActivity() {
 
         mIsPasswordProtectionPending = config.isAppPasswordProtectionOn
 
+        if (config.showNotePicker && savedInstanceState == null && hasNoIntent && !mIsPasswordProtectionPending) {
+            displayOpenNoteDialog()
+        }
+
         if (savedInstanceState == null) {
             binding.viewPager.beGoneIf(mIsPasswordProtectionPending)
             if (mIsPasswordProtectionPending && !mWasProtectionHandled) {
@@ -134,6 +135,9 @@ class MainActivity : SimpleActivity() {
                     mWasProtectionHandled = it
                     if (it) {
                         mIsPasswordProtectionPending = false
+                        if (config.showNotePicker && savedInstanceState == null && hasNoIntent) {
+                            displayOpenNoteDialog()
+                        }
                         binding.viewPager.beVisible()
                     } else {
                         finish()