Fix thumbnail resolution setting not working

app/src/main/kotlin/com/hippo/ehviewer/client/EhCacheKeyFactory.kt

@@ -19,10 +19,9 @@ import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.data.GalleryPreview
 import com.hippo.ehviewer.client.data.NormalGalleryPreview
 
+// Normal Preview: https://*.hath.network/cm/[timed token]/[gid]-[index].jpg
 // ExHentai Large Preview: https://s.exhentai.org/t/***
-// ExHentai Normal Preview: https://*.hath.network/cm/[timed token]/[gid]-[index].jpg
-// EHentai Normal Preview: https://ehgt.org/m/[permanent token]/[gid]-[index].jpg
-// EHentai Large Preview: https://ehgt.org/***
+// E-Hentai Large Preview: https://ehgt.org/***
 
 private const val URL_PREFIX_THUMB_E = "https://ehgt.org/"
 private const val URL_PREFIX_THUMB_EX = "https://s.exhentai.org/t/"
@@ -44,7 +43,7 @@ val GalleryPreview.imageKey
     }
 
 val GalleryInfo.thumbUrl
-    get() = thumbPrefix + thumbKey!!
+    get() = thumbPrefix + EhUtils.handleThumbUrlResolution(thumbKey!!)
 
 private val thumbPrefix
     get() = if (EhUtils.isExHentai) URL_PREFIX_THUMB_EX else URL_PREFIX_THUMB_E

app/src/main/kotlin/com/hippo/ehviewer/client/EhUtils.kt

@@ -172,10 +172,7 @@ object EhUtils {
         return title.substringBeforeLast('|').trim().ifEmpty { null }
     }
 
-    fun handleThumbUrlResolution(url: String?): String? {
-        if (null == url) {
-            return null
-        }
+    fun handleThumbUrlResolution(url: String): String {
         val resolution = when (Settings.thumbResolution) {
             0 -> return url
             1 -> "250"

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryApiParser.kt

@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.client.parser
 
 import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.GalleryInfo
 import com.hippo.ehviewer.client.getThumbKey
 import com.hippo.ehviewer.client.parseAs
@@ -32,7 +31,7 @@ object GalleryApiParser {
                 title = item.title.unescapeXml()
                 titleJpn = item.titleJpn.unescapeXml()
                 category = getCategory(item.category)
-                thumbKey = getThumbKey(handleThumbUrlResolution(item.thumb)!!)
+                thumbKey = getThumbKey(item.thumb)
                 uploader = item.uploader?.unescapeXml()
                 posted = ParserUtils.formatDate(item.posted * 1000)
                 rating = item.rating

app/src/main/kotlin/com/hippo/ehviewer/client/parser/GalleryDetailParser.kt

@@ -21,7 +21,6 @@ import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhFilter
 import com.hippo.ehviewer.client.EhUtils
 import com.hippo.ehviewer.client.EhUtils.getCategory
-import com.hippo.ehviewer.client.EhUtils.handleThumbUrlResolution
 import com.hippo.ehviewer.client.data.BaseGalleryInfo
 import com.hippo.ehviewer.client.data.GalleryComment
 import com.hippo.ehviewer.client.data.GalleryCommentList
@@ -140,11 +139,7 @@ object GalleryDetailParser {
             val gm = d.getElementsByClass("gm")[0]
             // Thumb url
             gm.getElementById("gd1")?.child(0)?.attr("style")?.trim()?.let {
-                gd.thumbKey = getThumbKey(
-                    PATTERN_COVER.find(it)?.run {
-                        handleThumbUrlResolution(groupValues[3])
-                    }!!,
-                )
+                gd.thumbKey = getThumbKey(PATTERN_COVER.find(it)!!.groupValues[3])
             }
 
             gd.title = gm.getElementById("gn")?.text()?.trim()