From a21ba04e95bf976332cca8c69e2e80bf46c16fa9 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 2 Oct 2023 19:50:13 +0800
Subject: [PATCH] Initialize Settings as early as possible

---
 app/src/main/java/com/hippo/ehviewer/EhApplication.kt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index 69aa2b43e..8b317d2d6 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -51,7 +51,6 @@ import com.hippo.ehviewer.util.isAtLeastQ
 import com.hippo.ehviewer.util.isCronetSupported
 import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor
 import eu.kanade.tachiyomi.util.lang.launchIO
-import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.launch
 import moe.tarsin.kt.unreachable
 import okhttp3.AsyncDns
@@ -65,6 +64,10 @@ private val lifecycleScope = lifecycle.coroutineScope
 
 class EhApplication : Application(), ImageLoaderFactory {
     override fun onCreate() {
+        // Initialize Settings on first access
+        lifecycleScope.launchIO {
+            AppCompatDelegate.setDefaultNightMode(Settings.theme)
+        }
         lifecycle.addObserver(lockObserver)
         val handler = Thread.getDefaultUncaughtExceptionHandler()
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
@@ -80,12 +83,6 @@ class EhApplication : Application(), ImageLoaderFactory {
         System.loadLibrary("ehviewer")
         System.loadLibrary("ehviewer_rust")
         ReadableTime.initialize(this)
-        lifecycleScope.launchIO {
-            val theme = Settings.theme
-            withUIContext {
-                AppCompatDelegate.setDefaultNightMode(theme)
-            }
-        }
         lifecycleScope.launchIO {
             launchIO {
                 migrateCookies()