Batyka/v2rayNG
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Bug fix

Browse Source 
https://github.com/2dust/v2rayNG/issues/3232
This commit is contained in:
2dust
2024-07-01 10:34:45 +08:00
parent a726f00f35
commit 5a5bd22073
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
View File

@@ -387,9 +387,9 @@ object AngConfigManager {
// }
fun importBatchConfig(server: String?, subid: String, append: Boolean): Int {
var count = parseBatchConfig(server, subid, append)
var count = parseBatchConfig(Utils.decode(server), subid, append)
if (count <= 0) {
count = parseBatchConfig(Utils.decode(server), subid, append)
count = parseBatchConfig(server, subid, append)
}
if (count <= 0) {
count = parseCustomConfigServer(server, subid)
@@ -577,9 +577,9 @@ object AngConfigManager {
}
private fun parseConfigViaSub(server: String?, subid: String, append: Boolean): Int {
var count = parseBatchConfig(server, subid, append)
var count = parseBatchConfig(Utils.decode(server), subid, append)
if (count <= 0) {
count = parseBatchConfig(Utils.decode(server), subid, append)
count = parseBatchConfig(server, subid, append)
}
if (count <= 0) {
count = parseCustomConfigServer(server, subid)

4
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
View File

@@ -356,7 +356,7 @@ object Utils {
}
@Throws(IOException::class)
fun getUrlContentWithCustomUserAgent(urlStr: String?, httpPort: Int = 0): String {
fun getUrlContentWithCustomUserAgent(urlStr: String?, timeout: Int = 30000, httpPort: Int = 0): String {
val url = URL(urlStr)
val conn = if (httpPort == 0) {
url.openConnection()
@@ -368,6 +368,8 @@ object Utils {
)
)
}
conn.connectTimeout = timeout
conn.readTimeout = timeout
conn.setRequestProperty("Connection", "close")
conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
url.userInfo?.let {