Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b60b7f4307 | ||
|
|
e4ca04a096 | ||
|
|
d0f7ecec44 |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.v2ray.ang"
|
||||
minSdk = 21
|
||||
targetSdk = 35
|
||||
versionCode = 604
|
||||
versionName = "1.9.10"
|
||||
versionCode = 605
|
||||
versionName = "1.9.11"
|
||||
multiDexEnabled = true
|
||||
splits {
|
||||
abi {
|
||||
|
||||
@@ -36,7 +36,7 @@ object MigrateManager {
|
||||
|
||||
//check and remove old
|
||||
decodeServerConfig(guid) ?: continue
|
||||
serverStorage.remove(guid)
|
||||
//serverStorage.remove(guid)
|
||||
Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + config.remarks)
|
||||
}
|
||||
Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-end")
|
||||
|
||||
@@ -334,9 +334,7 @@ object V2rayConfigManager {
|
||||
servers.add(
|
||||
V2rayConfig.DnsBean.ServersBean(
|
||||
address = remoteDns.first(),
|
||||
port = 53,
|
||||
domains = proxyDomain,
|
||||
expectIPs = null
|
||||
)
|
||||
)
|
||||
}
|
||||
@@ -350,7 +348,6 @@ object V2rayConfigManager {
|
||||
servers.add(
|
||||
V2rayConfig.DnsBean.ServersBean(
|
||||
address = domesticDns.first(),
|
||||
port = 53,
|
||||
domains = directDomain,
|
||||
expectIPs = if (isCnRoutingMode) geoipCn else null,
|
||||
skipFallback = true
|
||||
|
||||
@@ -65,7 +65,7 @@ object V2RayServiceManager {
|
||||
if (v2rayPoint.isRunning) return
|
||||
val guid = MmkvManager.getSelectServer() ?: return
|
||||
val config = MmkvManager.decodeServerConfig(guid) ?: return
|
||||
if (!Utils.isValidUrl(config.server) && !Utils.isValidUrl(config.server)) return
|
||||
if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) return
|
||||
// val result = V2rayConfigUtil.getV2rayConfig(context, guid)
|
||||
// if (!result.status) return
|
||||
|
||||
|
||||
@@ -159,8 +159,11 @@ object Utils {
|
||||
/**
|
||||
* is ip address
|
||||
*/
|
||||
fun isIpAddress(value: String): Boolean {
|
||||
fun isIpAddress(value: String?): Boolean {
|
||||
try {
|
||||
if (value.isNullOrEmpty()) {
|
||||
return false
|
||||
}
|
||||
var addr = value
|
||||
if (addr.isEmpty() || addr.isBlank()) {
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user