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

Write remarks when pasting subscription link

Browse Source 
https://github.com/2dust/v2rayNG/issues/2845
This commit is contained in:
2dust
2024-02-16 09:52:10 +08:00
parent 327ba57088
commit e1960f5aff
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,7 +486,7 @@ object AngConfigManager {
allowInsecure: Boolean allowInsecure: Boolean
): Boolean { ): Boolean {
return runCatching { return runCatching {
val uri = URI(uriString) val uri = URI(Utils.fixIllegalUrl(uriString))
check(uri.scheme == "vmess") check(uri.scheme == "vmess")
val (_, protocol, tlsStr, uuid, alterId) = val (_, protocol, tlsStr, uuid, alterId) =
Regex("(tcp|http|ws|kcp|quic|grpc)(\\+tls)?:([0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12})") Regex("(tcp|http|ws|kcp|quic|grpc)(\\+tls)?:([0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12})")

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

@@ -6,6 +6,7 @@ import com.v2ray.ang.dto.AssetUrlItem
import com.v2ray.ang.dto.ServerAffiliationInfo import com.v2ray.ang.dto.ServerAffiliationInfo
import com.v2ray.ang.dto.ServerConfig import com.v2ray.ang.dto.ServerConfig
import com.v2ray.ang.dto.SubscriptionItem import com.v2ray.ang.dto.SubscriptionItem
import java.net.URI
object MmkvManager { object MmkvManager {
const val ID_MAIN = "MAIN" const val ID_MAIN = "MAIN"
@@ -121,8 +122,9 @@ object MmkvManager {
return 0 return 0
} }
} }
val uri = URI(Utils.fixIllegalUrl(url))
val subItem = SubscriptionItem() val subItem = SubscriptionItem()
subItem.remarks = "import sub" subItem.remarks = Utils.urlDecode(uri.fragment ?: "import sub")
subItem.url = url subItem.url = url
subStorage?.encode(Utils.getUuid(), Gson().toJson(subItem)) subStorage?.encode(Utils.getUuid(), Gson().toJson(subItem))
return 1 return 1