From c163ad42a63a245328c746a9ca28314ef2d7405d Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sat, 5 Aug 2023 16:28:32 +0800
Subject: [PATCH] Remove experimental status of Cloudflare bypass

---
 app/src/main/java/com/hippo/ehviewer/EhApplication.kt        | 4 +---
 app/src/main/java/com/hippo/ehviewer/Settings.kt             | 1 -
 .../java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt    | 5 -----
 app/src/main/res/values-zh-rCN/strings.xml                   | 2 --
 app/src/main/res/values/strings.xml                          | 2 --
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
index d5c34db38..69aa2b43e 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
+++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt
@@ -168,9 +168,7 @@ class EhApplication : Application(), ImageLoaderFactory {
                     dns(AsyncDns.toDns(AndroidAsyncDns.IPv4, AndroidAsyncDns.IPv6))
                 }
                 chunker { alwaysReadResponseBody(false) }
-                if (Settings.bypassCloudflare) {
-                    addInterceptor(CloudflareInterceptor(appCtx))
-                }
+                addInterceptor(CloudflareInterceptor(appCtx))
             }
         }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index eb0b57de4..6f1f42428 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -63,7 +63,6 @@ object Settings : DataStorePreferences(null) {
     var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
     var downloadOriginImage by boolPref("download_origin_image", false)
     var enableQuic by boolPref("enable_quic", true)
-    var bypassCloudflare by boolPref("bypass_cloudflare", false)
     var thumbSizeDp by intPref("thumb_size_", 120)
     var recentFavCat by intPref("recent_fav_cat", FavListUrlBuilder.FAV_CAT_LOCAL)
     var defaultFavSlot by intPref("default_favorite_slot", -2)
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
index 670f96f8a..1326a3086 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt
@@ -131,11 +131,6 @@ fun AdvancedScreen() {
                 summary = stringResource(id = R.string.settings_advanced_enable_quic_summary),
                 value = Settings::enableQuic,
             )
-            SwitchPreference(
-                title = stringResource(id = R.string.settings_advanced_bypass_cloudflare),
-                summary = stringResource(id = R.string.settings_advanced_bypass_cloudflare_summary),
-                value = Settings::bypassCloudflare,
-            )
             SwitchPreference(
                 title = stringResource(id = R.string.preload_thumb_aggressively),
                 value = Settings::preloadThumbAggressively,
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b20b277ad..605503cc1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -375,8 +375,6 @@
     <string name="settings_advanced_app_language_title">App 界面语言</string>
     <string name="settings_advanced_enable_quic">[实验性] QUIC 支持</string>
     <string name="settings_advanced_enable_quic_summary">启用 QUIC 协议支持（需要重启应用）</string>
-    <string name="settings_advanced_bypass_cloudflare">[实验性] 绕过 Cloudflare</string>
-    <string name="settings_advanced_bypass_cloudflare_summary">若持续遇到 403 错误可尝试此项（需要重启应用）</string>
     <string name="settings_advanced_export_data">导出数据</string>
     <string name="settings_advanced_export_data_summary">保存数据至外置存储器，例如下载列表，快速搜索列表</string>
     <string name="settings_advanced_export_data_to">已导出数据至 %s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88c1e814f..9b16486fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -419,8 +419,6 @@
     <string name="settings_advanced_app_language_title">App language</string>
     <string name="settings_advanced_enable_quic">[Experimental] QUIC support</string>
     <string name="settings_advanced_enable_quic_summary">Enable QUIC protocol support (App restart required)</string>
-    <string name="settings_advanced_bypass_cloudflare">[Experimental] Bypass Cloudflare</string>
-    <string name="settings_advanced_bypass_cloudflare_summary">Try this if you keep getting 403 error (App restart required)</string>
     <string name="settings_advanced_export_data">Export data</string>
     <string name="settings_advanced_export_data_summary">Save data like download list, quick search list, to external storage</string>
     <string name="settings_advanced_export_data_to">Exported data to %s</string>