From 5d5cc22020d7dcdf8f1da24078611236254202e7 Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Fri, 16 Sep 2022 19:34:46 +0700
Subject: [PATCH] Fix always-on app lock on cold start (#8018)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
---
 app/src/main/java/eu/kanade/tachiyomi/App.kt             | 4 ++++
 .../tachiyomi/ui/base/delegate/SecureActivityDelegate.kt | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index e15b1b438..4e6544e0f 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -210,6 +210,10 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
         }.build()
     }
 
+    override fun onCreate(owner: LifecycleOwner) {
+        SecureActivityDelegate.onApplicationCreated()
+    }
+
     private fun addAnalytics() {
         if (syDebugVersion != "0") {
             Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
index 6e82c7713..7fca13c54 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
@@ -46,6 +46,15 @@ interface SecureActivityDelegate {
         const val LOCK_ALL_DAYS = 0x7F
         // SY <--
 
+        fun onApplicationCreated() {
+            val lockDelay = Injekt.get<PreferencesHelper>().lockAppAfter().get()
+            if (lockDelay == 0) {
+                // Restore always active app lock
+                // Delayed lock will be restored later on activity resume
+                lockState = LockState.ACTIVE
+            }
+        }
+
         fun onApplicationStopped() {
             val preferences = Injekt.get<PreferencesHelper>()
             if (!preferences.useAuthenticator().get()) return