From a39bc1182aaad7c5f10a34e368b848898d5c77e4 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 7 Mar 2023 10:04:27 +0800
Subject: [PATCH] Fix normal preview set load

---
 .../java/com/hippo/ehviewer/client/EhCacheKeyFactory.kt  | 7 ++++++-
 app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt     | 9 ---------
 app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt  | 4 +---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhCacheKeyFactory.kt b/app/src/main/java/com/hippo/ehviewer/client/EhCacheKeyFactory.kt
index 5c99f5312..fae28f875 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhCacheKeyFactory.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhCacheKeyFactory.kt
@@ -15,12 +15,17 @@
  */
 package com.hippo.ehviewer.client
 
+private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
+private const val URL_PREFIX_THUMB_EX = "https://exhentai.org/"
+
 object EhCacheKeyFactory {
     fun getImageKey(gid: Long, index: Int): String {
         return "image:$gid:$index"
     }
 
     fun getImageKey(url: String): String {
-        return url.removePrefix(EhUrl.URL_PREFIX_THUMB_E).removePrefix(EhUrl.URL_PREFIX_THUMB_EX)
+        return url.removePrefix(URL_PREFIX_THUMB_E)
+            .removePrefix(URL_PREFIX_THUMB_EX)
+            .removePrefix("t/")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
index 878f451c8..ac165cd96 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/EhUrl.kt
@@ -51,8 +51,6 @@ object EhUrl {
     const val ORIGIN_EX = REFERER_EX
     const val REFERER_E = "https://$DOMAIN_E"
     const val ORIGIN_E = REFERER_E
-    const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
-    const val URL_PREFIX_THUMB_EX = "https://exhentai.org/t/"
 
     val host: String
         get() = when (Settings.gallerySite) {
@@ -127,13 +125,6 @@ object EhUrl {
             else -> URL_WATCHED_E
         }
 
-    val thumbUrlPrefix: String
-        get() = when (Settings.gallerySite) {
-            SITE_E -> URL_PREFIX_THUMB_E
-            SITE_EX -> URL_PREFIX_THUMB_EX
-            else -> URL_PREFIX_THUMB_E
-        }
-
     fun getGalleryDetailUrl(gid: Long, token: String?): String {
         return getGalleryDetailUrl(gid, token, 0, false)
     }
diff --git a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt
index d8fa79ae5..e3f8bf320 100644
--- a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt
+++ b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt
@@ -3,12 +3,10 @@ package com.hippo.ehviewer.coil
 import android.content.Context
 import coil.request.ImageRequest
 import com.hippo.ehviewer.client.EhCacheKeyFactory
-import com.hippo.ehviewer.client.EhUrl
 
 fun ImageRequest.Builder.ehUrl(url: String) = apply {
     val key = EhCacheKeyFactory.getImageKey(url)
-    val realUrl = EhUrl.thumbUrlPrefix + key
-    data(realUrl)
+    data(url)
     memoryCacheKey(key)
     diskCacheKey(key)
 }