From a60f45ce31b5486e817b6615b8db1efb4fa34b31 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 20 Mar 2025 12:06:13 +0800
Subject: [PATCH] The timeout was changed from 30s to 15s

---
 .../java/com/v2ray/ang/handler/AngConfigManager.kt     |  2 +-
 .../java/com/v2ray/ang/handler/SpeedtestManager.kt     |  2 +-
 .../main/java/com/v2ray/ang/ui/UserAssetActivity.kt    |  4 ++--
 .../app/src/main/java/com/v2ray/ang/util/HttpUtil.kt   | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
index 10e28b4c..27061810 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
@@ -420,7 +420,7 @@ object AngConfigManager {
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
-                HttpUtil.getUrlContentWithUserAgent(url, 30000, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, 15000, httpPort)
             } catch (e: Exception) {
                 Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
                 //e.printStackTrace()
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
index 6ac62c20..d607f0e5 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
@@ -135,7 +135,7 @@ object SpeedtestManager {
         var result: String
         var elapsed = -1L
 
-        val conn = HttpUtil.createProxyConnection(SettingsManager.getDelayTestUrl(), port, 30000, 30000) ?: return Pair(elapsed, "")
+        val conn = HttpUtil.createProxyConnection(SettingsManager.getDelayTestUrl(), port, 15000, 15000) ?: return Pair(elapsed, "")
         try {
             val start = SystemClock.elapsedRealtime()
             val code = conn.responseCode
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
index e2335c16..cf196a96 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
@@ -206,9 +206,9 @@ class UserAssetActivity : BaseActivity() {
         var resultCount = 0
         lifecycleScope.launch(Dispatchers.IO) {
             assets.forEach {
-                var result = downloadGeo(it.second, 30000, httpPort)
+                var result = downloadGeo(it.second, 15000, httpPort)
                 if (!result) {
-                    result = downloadGeo(it.second, 30000, 0)
+                    result = downloadGeo(it.second, 15000, 0)
                 }
                 if (result)
                     resultCount++
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
index dc0ab7da..2f5e506c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
@@ -50,7 +50,7 @@ object HttpUtil {
      * @throws IOException If an I/O error occurs.
      */
     @Throws(IOException::class)
-    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 30000, httpPort: Int = 0): String {
+    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 15000, httpPort: Int = 0): String {
         var currentUrl = url
         var redirects = 0
         val maxRedirects = 3
@@ -88,16 +88,16 @@ object HttpUtil {
      *
      * @param urlStr The target URL address.
      * @param port The port of the proxy server.
-     * @param connectTimeout The connection timeout in milliseconds (default is 30000 ms).
-     * @param readTimeout The read timeout in milliseconds (default is 30000 ms).
+     * @param connectTimeout The connection timeout in milliseconds (default is 15000 ms).
+     * @param readTimeout The read timeout in milliseconds (default is 15000 ms).
      * @param needStream Whether the connection needs to support streaming.
      * @return Returns a configured HttpURLConnection object, or null if it fails.
      */
     fun createProxyConnection(
         urlStr: String,
         port: Int,
-        connectTimeout: Int = 30000,
-        readTimeout: Int = 30000,
+        connectTimeout: Int = 15000,
+        readTimeout: Int = 15000,
         needStream: Boolean = false
     ): HttpURLConnection? {