From f117abd4834ebfc5d9bb22db9fd8c64b93cf3981 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 16 Aug 2023 23:26:15 +0800
Subject: [PATCH] Revert "Add option for QUIC support"

This reverts commit 861c05db
---
 app/src/main/java/com/hippo/ehviewer/Settings.kt             | 1 -
 .../java/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt    | 5 -----
 app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt     | 4 +---
 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/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index 6f1f42428..4cde64a0b 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -62,7 +62,6 @@ object Settings : DataStorePreferences(null) {
     var blackDarkTheme by boolPref("black_dark_theme", false).observed { updateWhenAmoledModeChanges() }
     var preloadThumbAggressively by boolPref("preload_thumb_aggressively", false)
     var downloadOriginImage by boolPref("download_origin_image", false)
-    var enableQuic by boolPref("enable_quic", true)
     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 1326a3086..f7a18d2be 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
@@ -126,11 +126,6 @@ fun AdvancedScreen() {
                 entryValueRes = R.array.app_language_entry_values,
                 value = Settings::language,
             )
-            SwitchPreference(
-                title = stringResource(id = R.string.settings_advanced_enable_quic),
-                summary = stringResource(id = R.string.settings_advanced_enable_quic_summary),
-                value = Settings::enableQuic,
-            )
             SwitchPreference(
                 title = stringResource(id = R.string.preload_thumb_aggressively),
                 value = Settings::preloadThumbAggressively,
diff --git a/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
index 6b1770cd2..fa3a73c18 100644
--- a/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
+++ b/app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt
@@ -1,6 +1,4 @@
 package com.hippo.ehviewer.util
 
-import com.hippo.ehviewer.Settings
-
 val isCronetSupported: Boolean
-    get() = Settings.enableQuic && isAtLeastQ
+    get() = isAtLeastQ
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 46b92593f..7a21c6906 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -376,8 +376,6 @@
     <string name="settings_advanced_dump_logcat_to">已保存日志至 %s</string>
     <string name="settings_advanced_read_cache_size">阅读缓存大小</string>
     <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_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 8eee01959..161e15fab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -420,8 +420,6 @@
     <string name="settings_advanced_dump_logcat_to">Logcat dumped to %s</string>
     <string name="settings_advanced_read_cache_size">Read cache size</string>
     <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_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>