From 3eb99a4bf511040a97aaaa6af650f62601466b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Wed, 24 Mar 2021 22:41:28 +0100
Subject: [PATCH] [App] Change companion values to lateinit.

---
 .../java/pl/szczodrzynski/edziennik/App.kt    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index 0bc6f2e0..8fac3da3 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -51,8 +51,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     companion object {
         @Volatile
         lateinit var db: AppDb
-        val config: Config by lazy { Config(db) }
-        var profile: Profile by mutableLazy { Profile(0, 0, 0, "") }
+        lateinit var config: Config
+        lateinit var profile: Profile
         val profileId
             get() = profile.id
 
@@ -106,7 +106,7 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .readTimeout(30, TimeUnit.SECONDS)
         builder.installHttpsSupport(this)
 
-        if (devMode || BuildConfig.DEBUG) {
+        if (devMode) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
@@ -158,23 +158,25 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .errorActivity(CrashActivity::class.java)
                 .apply()
         Iconics.init(applicationContext)
+
+        // initialize companion object values
         App.db = AppDb(this)
-        Themes.themeInt = config.ui.theme
-        devMode = config.debugMode
-        MHttp.instance().customOkHttpClient(http)
+        App.config = Config(App.db)
+        App.profile = Profile(0, 0, 0, "")
+        debugMode = BuildConfig.DEBUG
+        devMode = config.debugMode || debugMode
 
         if (!profileLoadById(config.lastProfileId)) {
             db.profileDao().firstId?.let { profileLoadById(it) }
         }
 
+        MHttp.instance().customOkHttpClient(http)
+
+        Themes.themeInt = config.ui.theme
         config.ui.language?.let {
             setLanguage(it)
         }
 
-        debugMode = BuildConfig.DEBUG
-        if (BuildConfig.DEBUG)
-            devMode = true
-
         Signing.getCert(this)
 
         launch {
@@ -183,7 +185,6 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
 
                 if (config.devModePassword != null)
                     checkDevModePassword()
-                devMode = debugMode || config.debugMode
 
                 if (config.sync.enabled)
                     SyncWorker.scheduleNext(this@App, false)