From c6b3aec1afb0aab4983a79bb4b8dd218fe5c60d5 Mon Sep 17 00:00:00 2001
From: Dude so hot <djohn@fbi.gov>
Date: Tue, 29 Oct 2024 23:25:12 +0800
Subject: [PATCH] Fix build

---
 app/src/main/kotlin/com/hippo/ehviewer/Settings.kt        | 6 ++++++
 app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt | 2 +-
 app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt     | 7 ++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt
index 3b1233b84..cd842ab5c 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt
@@ -210,6 +210,9 @@ object Settings : DataStorePreferences(null) {
     val showNavigationOverlayOnStart = boolPref("reader_navigation_overlay_on_start", false)
     val stripExtraneousAds = boolPref("strip_extraneous_ads", false)
 
+    val userAgent
+        get() = if (desktopSite) CHROME_USER_AGENT else CHROME_MOBILE_USER_AGENT
+
     init {
         if ("CN" == Locale.getDefault().country) {
             edit {
@@ -251,3 +254,6 @@ object Settings : DataStorePreferences(null) {
         }
     }
 }
+
+private const val CHROME_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Safari/537.36"
+private const val CHROME_MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Mobile Safari/537.36"
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt b/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
index d4633e360..2810e2ef0 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/coil/Extensions.kt
@@ -18,9 +18,9 @@ fun ImageRequest.Builder.ehUrl(info: GalleryInfo) = apply {
 
 fun ImageRequest.Builder.ehPreview(preview: GalleryPreview) = with(preview) {
     data(url)
+    if (preview is V2GalleryPreview) size(Size.ORIGINAL)
     memoryCacheKey(imageKey)
     diskCacheKey(imageKey)
-    if (preview is V2GalleryPreview) size(Size.ORIGINAL)
 }
 
 fun ImageRequest.Builder.justDownload() = apply {
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt b/app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt
index e28aa266e..308d8ed16 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ktor/Common.kt
@@ -1,7 +1,6 @@
 package com.hippo.ehviewer.ktor
 
-import com.hippo.ehviewer.BuildConfig
-import com.hippo.ehviewer.Settings.desktopSite
+import com.hippo.ehviewer.Settings.userAgent
 import com.hippo.ehviewer.client.EhCookieStore
 import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.HttpClientEngineConfig
@@ -14,8 +13,6 @@ import io.ktor.http.HttpHeaders
 
 private const val CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
 private const val CHROME_ACCEPT_LANGUAGE = "en-US,en;q=0.5"
-private const val CHROME_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Safari/537.36"
-private const val CHROME_MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${BuildConfig.CHROME_VERSION}.0.0.0 Mobile Safari/537.36"
 
 fun <T : HttpClientEngineConfig> HttpClientConfig<T>.configureCommon() = apply {
     install(HttpCookies) {
@@ -25,7 +22,7 @@ fun <T : HttpClientEngineConfig> HttpClientConfig<T>.configureCommon() = apply {
         requestTimeoutMillis = 10_000
     }
     install(UserAgent) {
-        agent = if (desktopSite) CHROME_USER_AGENT else CHROME_MOBILE_USER_AGENT
+        agent = userAgent
     }
     defaultRequest {
         header(HttpHeaders.Accept, CHROME_ACCEPT)