From 223490d281f03e5fae2a0d07c35210255f8d20a4 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Mon, 11 Nov 2019 00:57:46 -0800
Subject: [PATCH] Fixed Lag for auto manga bg for downloaded chapters

---
 .../ui/reader/viewer/pager/PagerPageHolder.kt | 24 ++++++++++++-------
 .../tachiyomi/util/CoroutinesExtensions.kt    |  1 -
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
index e29f53caec..160cfbb85c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -6,7 +6,6 @@ import android.graphics.BitmapFactory
 import android.graphics.PointF
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.os.Build
 import android.view.GestureDetector
 import android.view.Gravity
 import android.view.MotionEvent
@@ -34,14 +33,18 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressBar
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.ZoomType
-import eu.kanade.tachiyomi.util.*
+import eu.kanade.tachiyomi.util.ImageUtil
+import eu.kanade.tachiyomi.util.dpToPx
+import eu.kanade.tachiyomi.util.gone
+import eu.kanade.tachiyomi.util.launchUI
+import eu.kanade.tachiyomi.util.visible
 import eu.kanade.tachiyomi.widget.ViewPagerAdapter
-import kotlinx.coroutines.async
+import kotlinx.coroutines.Dispatchers.Default
+import kotlinx.coroutines.withContext
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.injectLazy
 import java.io.InputStream
 import java.util.concurrent.TimeUnit
 
@@ -259,10 +262,7 @@ class PagerPageHolder(
                             bytesStream.close()
 
                             launchUI {
-                                val image = async { BitmapFactory.decodeByteArray(bytesArray, 0,
-                                    bytesArray.size) }
-                                imageView.background = ImageUtil.autoSetBackground(image
-                                    .await())
+                                imageView.background = setBG(bytesArray)
                                 page.bg = imageView.background
                             }
                         }
@@ -283,6 +283,14 @@ class PagerPageHolder(
             .subscribe({}, {})
     }
 
+    private suspend fun setBG(bytesArray: ByteArray): Drawable {
+        return withContext(Default) {
+            ImageUtil.autoSetBackground(BitmapFactory.decodeByteArray(
+                bytesArray, 0, bytesArray.size
+            ))
+        }
+    }
+
     /**
      * Called when the page has an error.
      */
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/CoroutinesExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/CoroutinesExtensions.kt
index 013f6e3033..729418d0b7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/CoroutinesExtensions.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/CoroutinesExtensions.kt
@@ -10,7 +10,6 @@ import kotlin.coroutines.EmptyCoroutineContext
 
 fun launchUI(block: suspend CoroutineScope.() -> Unit): Job =
     GlobalScope.launch(Dispatchers.Main,CoroutineStart.DEFAULT,block)
-// .DEFAULT, null, block)
 
 fun launchNow(block: suspend CoroutineScope.() -> Unit): Job =
     GlobalScope.launch(Dispatchers.Main,CoroutineStart.UNDISPATCHED,block)