From f5e9bf2459436f4ead5c86438c41aebc3fac1e89 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Fri, 10 Mar 2023 23:11:02 +0800
Subject: [PATCH] Revert "Workaround for massive thumb requests delay post
 request for (adding favourite, get torrent list etc.)"

This reverts commit 0a9d7c556048db8bd7350e99f6dba070efd9278c.
---
 .../main/java/com/hippo/ehviewer/EhApplication.kt    | 12 ++++--------
 .../main/java/com/hippo/ehviewer/client/EhEngine.kt  |  2 +-
 .../java/com/hippo/ehviewer/spider/SpiderQueen.kt    |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index fd7cfa670..10f5bc4bf 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -217,7 +217,7 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
         @JvmStatic
         val ehProxySelector by lazy { EhProxySelector() }
 
-        private fun buildOneOkHttpClient(): OkHttpClient.Builder {
+        val nonCacheOkHttpClient by lazy {
             val builder = OkHttpClient.Builder()
                 .cookieJar(EhCookieStore)
                 .dns(EhDns)
@@ -233,16 +233,12 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor
                 builder.sslSocketFactory(EhSSLSocketFactory, trustManager)
                 builder.proxy(Proxy.NO_PROXY)
             }
-            return builder
-        }
-
-        val nonCacheOkHttpClient by lazy {
-            buildOneOkHttpClient().build()
+            builder.build()
         }
 
         // Never use this okhttp client to download large blobs!!!
-        val plainTextOkHttpClient by lazy {
-            buildOneOkHttpClient().cache(
+        val okHttpClient by lazy {
+            nonCacheOkHttpClient.newBuilder().cache(
                 Cache(
                     application.cacheDir.toOkioPath() / "http_cache",
                     20L * 1024L * 1024L,
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
index ea40635a6..06e23c37f 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt
@@ -67,7 +67,7 @@ import org.jsoup.Jsoup
 import java.io.File
 import kotlin.math.ceil
 
-private val okHttpClient = EhApplication.plainTextOkHttpClient
+private val okHttpClient = EhApplication.okHttpClient
 private val MEDIA_TYPE_JSON: MediaType = "application/json; charset=utf-8".toMediaType()
 private const val TAG = "EhEngine"
 private const val MAX_REQUEST_SIZE = 25
diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
index 2e66eac1e..a40729989 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.kt
@@ -20,7 +20,7 @@ import android.util.Log
 import androidx.annotation.IntDef
 import androidx.collection.LongSparseArray
 import androidx.collection.set
-import com.hippo.ehviewer.EhApplication.Companion.plainTextOkHttpClient
+import com.hippo.ehviewer.EhApplication.Companion.okHttpClient as plainTextOkHttpClient
 import com.hippo.ehviewer.GetText
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings