From b02813f30a8ef937746edac983a9ec2d002e46d4 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Thu, 21 May 2020 00:38:25 -0400
Subject: [PATCH] Fix MangaAllInOneHolder lazy vars

---
 .../tachiyomi/ui/manga/MangaAllInOneController.kt   | 10 ----------
 .../tachiyomi/ui/manga/MangaAllInOneHolder.kt       | 13 ++++++++++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
index 9eeb2b8b0..18a3f25d2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt
@@ -17,7 +17,6 @@ import androidx.core.graphics.drawable.DrawableCompat
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
-import com.google.gson.Gson
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.SelectableAdapter
 import eu.kanade.tachiyomi.R
@@ -61,7 +60,6 @@ import eu.kanade.tachiyomi.util.view.snack
 import eu.kanade.tachiyomi.util.view.visible
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
-import java.text.DateFormat
 import java.util.Date
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CancellationException
@@ -156,20 +154,12 @@ class MangaAllInOneController :
 
     private var lastClickPosition = -1
 
-    private val dateFormat: DateFormat by lazy {
-        preferences.dateFormat()
-    }
-
     private var initialLoad: Boolean = true
 
     // EXH -->
     val smartSearchConfig: SourceController.SmartSearchConfig? = args.getParcelable(SMART_SEARCH_CONFIG_EXTRA)
 
     override val coroutineContext: CoroutineContext = Job() + Dispatchers.Main
-
-    private val gson: Gson by injectLazy()
-
-    private val sourceManager: SourceManager by injectLazy()
     // EXH <--
 
     val fromSource = args.getBoolean(FROM_SOURCE_EXTRA, false)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
index 53f969923..21144e950 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.manga
 import android.content.Context
 import android.view.View
 import androidx.core.content.ContextCompat
-import androidx.core.view.accessibility.AccessibilityEventCompat.setAction
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.google.gson.Gson
 import eu.kanade.tachiyomi.R
@@ -11,7 +10,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
-import eu.kanade.tachiyomi.data.preference.PreferenceKeys.dateFormat
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
@@ -24,8 +23,8 @@ import eu.kanade.tachiyomi.util.view.snack
 import eu.kanade.tachiyomi.util.view.visible
 import eu.kanade.tachiyomi.util.view.visibleIf
 import exh.MERGED_SOURCE_ID
-import exh.debug.DebugFunctions.sourceManager
 import exh.util.setChipsExtended
+import java.text.DateFormat
 import java.text.DecimalFormat
 import java.util.Date
 import kotlinx.android.synthetic.main.manga_all_in_one_header.backdrop
@@ -73,8 +72,16 @@ class MangaAllInOneHolder(
     smartSearchConfig: SourceController.SmartSearchConfig? = null
 ) : BaseFlexibleViewHolder(view, adapter) {
 
+    private val preferences: PreferencesHelper by injectLazy()
+
     private val gson: Gson by injectLazy()
 
+    private val dateFormat: DateFormat by lazy {
+        preferences.dateFormat()
+    }
+
+    private val sourceManager: SourceManager by injectLazy()
+
     init {
         val presenter = adapter.delegate.mangaPresenter()