From 85ae4ed2e21f2805717903d7305986207896fe37 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Thu, 22 Apr 2021 21:25:18 -0400
Subject: [PATCH] Removing setting the smart bg in the httppageloader

This relates to #759 and should potentially fix it, but we'll see
---
 .../ui/reader/loader/HttpPageLoader.kt          | 15 ---------------
 .../ui/reader/viewer/pager/PagerPageHolder.kt   | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
index bc97aca2aa..951c7d329b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
@@ -1,15 +1,12 @@
 package eu.kanade.tachiyomi.ui.reader.loader
 
-import android.graphics.BitmapFactory
 import eu.kanade.tachiyomi.data.cache.ChapterCache
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
-import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerPageHolder
 import eu.kanade.tachiyomi.util.lang.plusAssign
-import eu.kanade.tachiyomi.util.system.ImageUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -240,18 +237,6 @@ class HttpPageLoader(
                 }
             }
             .doOnNext {
-                val readerTheme = preferences.readerTheme().get()
-                if (readerTheme >= 2) {
-                    val stream = chapterCache.getImageFile(imageUrl).inputStream()
-                    val image = BitmapFactory.decodeStream(stream)
-                    page.bg = ImageUtil.autoSetBackground(
-                        image,
-                        readerTheme == 2,
-                        preferences.context
-                    )
-                    page.bgType = PagerPageHolder.getBGType(readerTheme, preferences.context)
-                    stream.close()
-                }
                 page.stream = { chapterCache.getImageFile(imageUrl).inputStream() }
                 page.status = Page.READY
             }
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 e624b4a041..b42342467b 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,6 +6,7 @@ import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.PointF
+import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.view.GestureDetector
 import android.view.Gravity
@@ -50,6 +51,7 @@ import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
+import timber.log.Timber
 import uy.kohesive.injekt.injectLazy
 import java.io.InputStream
 import java.util.concurrent.TimeUnit
@@ -374,9 +376,18 @@ class PagerPageHolder(
                             bytesStream.close()
 
                             launchUI {
-                                imageView.background = setBG(bytesArray)
-                                page.bg = imageView.background
-                                page.bgType = getBGType(viewer.config.readerTheme, context) + item.hashCode()
+                                try {
+                                    imageView.background = setBG(bytesArray)
+                                } catch (e: Exception) {
+                                    Timber.e(e.localizedMessage)
+                                    imageView.background = ColorDrawable(Color.WHITE)
+                                } finally {
+                                    page.bg = imageView.background
+                                    page.bgType = getBGType(
+                                        viewer.config.readerTheme,
+                                        context
+                                    ) + item.hashCode()
+                                }
                             }
                         }
                     } else {