From 702be0ed43f9764b6c61134f0775f4da8f6e56cc Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 23 Oct 2023 22:04:49 +0800
Subject: [PATCH] Use eh API as well if `forceEhThumb` is enabled

---
 .../main/kotlin/com/hippo/ehviewer/client/EhUrl.kt   | 12 ++++++++----
 app/src/main/res/values-zh-rCN/strings.xml           |  4 ++--
 app/src/main/res/values/strings.xml                  |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt
index f428de2e7..96a187ef8 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/client/EhUrl.kt
@@ -64,10 +64,14 @@ object EhUrl {
         }
 
     val apiUrl: String
-        get() = when (Settings.gallerySite) {
-            SITE_E -> API_E
-            SITE_EX -> API_EX
-            else -> API_E
+        get() = if (Settings.forceEhThumb) {
+            API_E
+        } else {
+            when (Settings.gallerySite) {
+                SITE_E -> API_E
+                SITE_EX -> API_EX
+                else -> API_E
+            }
         }
 
     val referer: String
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 85bd46583..a3d33fdb7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -329,8 +329,8 @@
     <string name="settings_eh_thumb_resolution">缩略图分辨率</string>
     <string name="settings_eh_thumb_resolution_summary">%s，指定分辨率可能使获取缩略图失败</string>
     <string name="settings_eh_thumb_resolution_auto">自动</string>
-    <string name="settings_eh_force_eh_thumb">强制使用 e-hentai 缩略图服务器</string>
-    <string name="settings_eh_force_eh_thumb_summary">若 exhentai 缩略图加载失败可尝试此项</string>
+    <string name="settings_eh_force_eh_thumb">强制使用 e-hentai 缩略图/API服务器</string>
+    <string name="settings_eh_force_eh_thumb_summary">若 exhentai 加载失败可尝试此项</string>
     <string name="settings_eh_show_jpn_title">显示日文标题</string>
     <string name="settings_eh_show_jpn_title_summary">需同时在 EHentai 网站设置中启用 Japanese Title</string>
     <string name="settings_eh_show_gallery_pages">显示画廊页数</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe828ffd1..884e06a66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -371,8 +371,8 @@
     <string name="settings_eh_thumb_resolution">Thumb resolution</string>
     <string name="settings_eh_thumb_resolution_summary">Currently %s. Certain resolutions might cause getting thumb failed</string>
     <string name="settings_eh_thumb_resolution_auto">Auto</string>
-    <string name="settings_eh_force_eh_thumb">Force e-hentai thumb server</string>
-    <string name="settings_eh_force_eh_thumb_summary">Try this if you have trouble loading thumbs from exhentai</string>
+    <string name="settings_eh_force_eh_thumb">Force e-hentai thumb/API server</string>
+    <string name="settings_eh_force_eh_thumb_summary">Try this if you have trouble loading from exhentai</string>
     <string name="settings_eh_show_jpn_title">Show Japanese title</string>
     <string name="settings_eh_show_jpn_title_summary">Require enabling Japanese Title in Settings on EHentai website</string>
     <string name="settings_eh_show_gallery_pages">Show gallery pages</string>