up 1.10.7

Update AndroidLibXrayLite
Improved update checking and prompts in case of abnormality
2025-06-19 14:40:47 +08:00 · 2025-06-19 14:40:11 +08:00 · 2025-06-19 14:40:07 +08:00 · 2025-06-18 16:17:28 +08:00 · 2025-06-17 13:43:03 +08:00 · 2025-06-15 09:46:30 +08:00
103 changed files with 2390 additions and 1448 deletions
--- a/.github/workflows/fastlane.yml
+++ b/.github/workflows/fastlane.yml
@@ -13,4 +13,4 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - name: Validate Fastlane Supply Metadata
-        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.0.0
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.1.0
--- a/2
+++ b/2
--- a/README.md
+++ b/README.md
@@ -3,16 +3,12 @@
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)

 [![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.1.20-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.1.21-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)

-<a href="https://play.google.com/store/apps/details?id=com.v2ray.ang">
-<img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
-</a>
-
 ### Telegram Channel
 [github_2dust](https://t.me/github_2dust)

@@ -21,7 +17,7 @@ A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-cor
 #### Geoip and Geosite
 - geoip.dat and geosite.dat files are in `Android/data/com.v2ray.ang/files/assets` (path may differ on some Android device)
 - download feature will get enhanced version in this [repo](https://github.com/Loyalsoldier/v2ray-rules-dat) (Note it need a working proxy)
- latest official [domain list](https://github.com/v2fly/domain-list-community) and [ip list](https://github.com/v2fly/geoip) can be imported manually
+- latest official [domain list](https://github.com/Loyalsoldier/v2ray-rules-dat) and [ip list](https://github.com/Loyalsoldier/geoip) can be imported manually
 - possible to use third party dat file in the same folder, like [h2y](https://guide.v2fly.org/routing/sitedata.html#%E5%A4%96%E7%BD%AE%E7%9A%84%E5%9F%9F%E5%90%8D%E6%96%87%E4%BB%B6)

 ### More in our [wiki](https://github.com/2dust/v2rayNG/wiki)
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
        applicationId = "com.v2ray.ang"
        minSdk = 21
        targetSdk = 35
-        versionCode = 643
-        versionName = "1.9.43"
+        versionCode = 657
+        versionName = "1.10.7"
        multiDexEnabled = true

        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -144,6 +144,9 @@
                <data android:host="install-sub" />
            </intent-filter>
        </activity>
+        <activity
+            android:name=".ui.CheckUpdateActivity"
+            android:exported="false" />
        <activity
            android:name=".ui.AboutActivity"
            android:exported="false" />
--- a/V2rayNG/app/src/main/assets/custom_routing_black
+++ b/V2rayNG/app/src/main/assets/custom_routing_black
@@ -20,13 +20,6 @@
    "port": "443",
    "network": "udp"
  },
-  {
-    "remarks": "阻断广告",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
  {
    "remarks": "绕过局域网IP",
    "outboundTag": "direct",
--- a/V2rayNG/app/src/main/assets/custom_routing_global
+++ b/V2rayNG/app/src/main/assets/custom_routing_global
@@ -5,13 +5,6 @@
    "port": "443",
    "network": "udp"
  },
-  {
-    "remarks": "阻断广告",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
  {
    "remarks": "绕过局域网IP",
    "outboundTag": "direct",
--- a/V2rayNG/app/src/main/assets/custom_routing_white
+++ b/V2rayNG/app/src/main/assets/custom_routing_white
@@ -13,13 +13,6 @@
    "port": "443",
    "network": "udp"
  },
-  {
-    "remarks": "阻断广告",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
  {
    "remarks": "绕过局域网IP",
    "outboundTag": "direct",
--- a/V2rayNG/app/src/main/assets/custom_routing_white_iran
+++ b/V2rayNG/app/src/main/assets/custom_routing_white_iran
@@ -5,13 +5,6 @@
    "port": "443",
    "network": "udp"
  },
-  {
-    "remarks": "Block ads and trackers",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
  {
    "remarks": "Direct LAN IP",
    "outboundTag": "direct",
--- a/V2rayNG/app/src/main/assets/v2ray_config.json
+++ b/V2rayNG/app/src/main/assets/v2ray_config.json
@@ -97,7 +97,7 @@
  }
  ],
  "routing": {
-      "domainStrategy": "IPIfNonMatch",
+      "domainStrategy": "AsIs",
      "rules": []
  },
  "dns": {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt
@@ -39,5 +39,9 @@ class AngApplication : MultiDexApplication() {
        WorkManager.initialize(this, workManagerConfiguration)

        SettingsManager.initRoutingRulesets(this)
+
+        es.dmoral.toasty.Toasty.Config.getInstance()
+            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
+            .apply()
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
@@ -5,6 +5,7 @@ object AppConfig {

    /** The application's package name. */
    const val ANG_PACKAGE = BuildConfig.APPLICATION_ID
+    const val TAG = BuildConfig.APPLICATION_ID

    /** Directory names used in the app's file system. */
    const val DIR_ASSETS = "assets"
@@ -56,13 +57,15 @@ object AppConfig {
    const val PREF_LOGLEVEL = "pref_core_loglevel"
    const val PREF_MODE = "pref_mode"
    const val PREF_IS_BOOTED = "pref_is_booted"
+    const val PREF_CHECK_UPDATE_PRE_RELEASE = "pref_check_update_pre_release"
+    const val PREF_GEO_FILES_SOURCES = "pref_geo_files_sources"

    /** Cache keys. */
    const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
    const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"

    /** Protocol identifiers. */
-    const val PROTOCOL_FREEDOM: String = "freedom"
+    const val PROTOCOL_FREEDOM = "freedom"

    /** Broadcast actions. */
    const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
@@ -87,19 +90,20 @@ object AppConfig {
    const val DOWNLINK = "downlink"

    /** URLs for various resources. */
-    const val androidpackagenamelistUrl =
-        "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
-    const val v2rayCustomRoutingListUrl =
-        "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
-    const val v2rayNGUrl = "https://github.com/2dust/v2rayNG"
-    const val v2rayNGIssues = "$v2rayNGUrl/issues"
-    const val v2rayNGWikiMode = "$v2rayNGUrl/wiki/Mode"
-    const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md"
-    const val PromotionUrl = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
-    const val GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/"
-    const val TgChannelUrl = "https://t.me/github_2dust"
-    const val DelayTestUrl = "https://www.gstatic.com/generate_204"
-    const val DelayTestUrl2 = "https://www.google.com/generate_204"
+    const val GITHUB_URL = "https://github.com"
+    const val GITHUB_RAW_URL = "https://raw.githubusercontent.com"
+    const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download"
+    const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt"
+    const val APP_URL = "$GITHUB_URL/2dust/v2rayNG"
+    const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases"
+    const val APP_ISSUES_URL = "$APP_URL/issues"
+    const val APP_WIKI_MODE = "$APP_URL/wiki/Mode"
+    const val APP_PRIVACY_POLICY = "$GITHUB_RAW_URL/2dust/v2rayNG/master/CR.md"
+    const val APP_PROMOTION_URL = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
+    const val TG_CHANNEL_URL = "https://t.me/github_2dust"
+    const val DELAY_TEST_URL = "https://www.gstatic.com/generate_204"
+    const val DELAY_TEST_URL2 = "https://www.google.com/generate_204"
+    const val IP_API_URL = "https://speed.cloudflare.com/meta"

    /** DNS server addresses. */
    const val DNS_PROXY = "1.1.1.1"
@@ -164,19 +168,13 @@ object AppConfig {
    // Android Private DNS constants
    const val DNS_DNSPOD_DOMAIN = "dot.pub"
    const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_ONE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_DNS_COM_DOMAIN = "dns.cloudflare.com"
+    const val DNS_CLOUDFLARE_DNS_DOMAIN = "cloudflare-dns.com"
    const val DNS_GOOGLE_DOMAIN = "dns.google"
    const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
    const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"

-
-    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
-    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
-    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
-    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
-
    const val DEFAULT_PORT = 443
    const val DEFAULT_SECURITY = "auto"
    const val DEFAULT_LEVEL = 8
@@ -185,4 +183,64 @@ object AppConfig {
    const val REALITY = "reality"
    const val HEADER_TYPE_HTTP = "http"

+    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
+    val DNS_CLOUDFLARE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_CLOUDFLARE_DNS_COM_ADDRESSES = arrayListOf("104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5")
+    val DNS_CLOUDFLARE_DNS_ADDRESSES = arrayListOf("104.16.248.249", "104.16.249.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9")
+    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
+    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
+    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
+
+    //minimum list https://serverfault.com/a/304791
+    val ROUTED_IP_LIST = arrayListOf(
+        "0.0.0.0/5",
+        "8.0.0.0/7",
+        "11.0.0.0/8",
+        "12.0.0.0/6",
+        "16.0.0.0/4",
+        "32.0.0.0/3",
+        "64.0.0.0/2",
+        "128.0.0.0/3",
+        "160.0.0.0/5",
+        "168.0.0.0/6",
+        "172.0.0.0/12",
+        "172.32.0.0/11",
+        "172.64.0.0/10",
+        "172.128.0.0/9",
+        "173.0.0.0/8",
+        "174.0.0.0/7",
+        "176.0.0.0/4",
+        "192.0.0.0/9",
+        "192.128.0.0/11",
+        "192.160.0.0/13",
+        "192.169.0.0/16",
+        "192.170.0.0/15",
+        "192.172.0.0/14",
+        "192.176.0.0/12",
+        "192.192.0.0/10",
+        "193.0.0.0/8",
+        "194.0.0.0/7",
+        "196.0.0.0/6",
+        "200.0.0.0/5",
+        "208.0.0.0/4",
+        "240.0.0.0/4"
+    )
+
+    val PRIVATE_IP_LIST = arrayListOf(
+        "0.0.0.0/8",
+        "10.0.0.0/8",
+        "127.0.0.0/8",
+        "172.16.0.0/12",
+        "192.168.0.0/16",
+        "169.254.0.0/16",
+        "224.0.0.0/4"
+    )
+
+    val GEO_FILES_SOURCES = arrayListOf(
+        "Loyalsoldier/v2ray-rules-dat",
+        "runetfreedom/russia-v2ray-rules-dat",
+        "Chocolate4U/Iran-v2ray-rules"
+    )
+
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlItem.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlItem.kt
@@ -4,5 +4,6 @@ data class AssetUrlItem(
    var remarks: String = "",
    var url: String = "",
    val addedTime: Long = System.currentTimeMillis(),
-    var lastUpdated: Long = -1
+    var lastUpdated: Long = -1,
+    var locked: Boolean? = false,
 )
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/CheckUpdateResult.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/CheckUpdateResult.kt
@@ -0,0 +1,10 @@
+package com.v2ray.ang.dto
+
+data class CheckUpdateResult(
+    val hasUpdate: Boolean,
+    val latestVersion: String? = null,
+    val releaseNotes: String? = null,
+    val downloadUrl: String? = null,
+    val error: String? = null,
+    val isPreRelease: Boolean = false
+)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt
@@ -4,6 +4,6 @@ data class ConfigResult(
    var status: Boolean,
    var guid: String? = null,
    var content: String = "",
-    var domainPort: String? = null,
+    var socksPort: Int? = null,
 )

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/GitHubRelease.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/GitHubRelease.kt
@@ -0,0 +1,23 @@
+package com.v2ray.ang.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class GitHubRelease(
+    @SerializedName("tag_name")
+    val tagName: String,
+    @SerializedName("body")
+    val body: String,
+    @SerializedName("assets")
+    val assets: List<Asset>,
+    @SerializedName("prerelease")
+    val prerelease: Boolean = false,
+    @SerializedName("published_at")
+    val publishedAt: String = ""
+) {
+    data class Asset(
+        @SerializedName("name")
+        val name: String,
+        @SerializedName("browser_download_url")
+        val browserDownloadUrl: String
+    )
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt
@@ -0,0 +1,12 @@
+package com.v2ray.ang.dto
+
+data class IPAPIInfo(
+    var ip: String? = null,
+    var clientIp: String? = null,
+    var ip_addr: String? = null,
+    var query: String? = null,
+    var country: String? = null,
+    var country_name: String? = null,
+    var country_code: String? = null,
+    var countryCode: String? = null
+)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt
@@ -8,6 +8,7 @@ enum class Language(val code: String) {
    VIETNAMESE("vi"),
    RUSSIAN("ru"),
    PERSIAN("fa"),
+    ARABIC("ar"),
    BANGLA("bn"),
    BAKHTIARI("bqi-rIR");

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileLiteItem.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileLiteItem.kt
@@ -1,9 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ProfileLiteItem(
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    var remarks: String = "",
-    var server: String?,
-    var serverPort: Int?,
-)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt
@@ -11,5 +11,6 @@ data class SubscriptionItem(
    var prevProfile: String? = null,
    var nextProfile: String? = null,
    var filter: String? = null,
+    var allowInsecureUrl: Boolean = false,
 )

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
@@ -1,28 +1,17 @@
 package com.v2ray.ang.dto

-import android.text.TextUtils
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
-import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.ServersBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean
 import com.v2ray.ang.util.Utils
-import java.lang.reflect.Type

 data class V2rayConfig(
    var remarks: String? = null,
    var stats: Any? = null,
    val log: LogBean,
-    var policy: PolicyBean?,
+    var policy: PolicyBean? = null,
    val inbounds: ArrayList<InboundBean>,
    var outbounds: ArrayList<OutboundBean>,
-    var dns: DnsBean,
+    var dns: DnsBean? = null,
    val routing: RoutingBean,
    val api: Any? = null,
    val transport: Any? = null,
@@ -34,9 +23,9 @@ data class V2rayConfig(
 ) {

    data class LogBean(
-        val access: String,
-        val error: String,
-        var loglevel: String?,
+        val access: String? = null,
+        val error: String? = null,
+        var loglevel: String? = null,
        val dnsLog: Boolean? = null
    )

@@ -46,7 +35,7 @@ data class V2rayConfig(
        var protocol: String,
        var listen: String? = null,
        val settings: Any? = null,
-        val sniffing: SniffingBean?,
+        val sniffing: SniffingBean? = null,
        val streamSettings: Any? = null,
        val allocate: Any? = null
    ) {
@@ -77,50 +66,6 @@ data class V2rayConfig(
        val sendThrough: String? = null,
        var mux: MuxBean? = MuxBean(false)
    ) {
-        companion object {
-            fun create(configType: EConfigType): OutboundBean? {
-                return when (configType) {
-                    EConfigType.VMESS,
-                    EConfigType.VLESS ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                vnext = listOf(
-                                    VnextBean(
-                                        users = listOf(UsersBean())
-                                    )
-                                )
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.SHADOWSOCKS,
-                    EConfigType.SOCKS,
-                    EConfigType.HTTP,
-                    EConfigType.TROJAN,
-                    EConfigType.HYSTERIA2 ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                servers = listOf(ServersBean())
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.WIREGUARD ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                secretKey = "",
-                                peers = listOf(WireGuardBean())
-                            )
-                        )
-
-                    EConfigType.CUSTOM -> null
-                }
-            }
-        }
-
        data class OutSettingsBean(
            var vnext: List<VnextBean>? = null,
            var fragment: FragmentBean? = null,
@@ -197,7 +142,7 @@ data class V2rayConfig(

            data class WireGuardBean(
                var publicKey: String = "",
-                var preSharedKey: String = "",
+                var preSharedKey: String? = null,
                var endpoint: String = ""
            )
        }
@@ -299,7 +244,8 @@ data class V2rayConfig(
                var tcpFastOpen: Boolean? = null,
                var tproxy: String? = null,
                var mark: Int? = null,
-                var dialerProxy: String? = null
+                var dialerProxy: String? = null,
+                var domainStrategy: String? = null
            )

            data class TlsSettingsBean(
@@ -349,139 +295,6 @@ data class V2rayConfig(
                )
            }

-            fun populateTransportSettings(
-                transport: String,
-                headerType: String?,
-                host: String?,
-                path: String?,
-                seed: String?,
-                quicSecurity: String?,
-                key: String?,
-                mode: String?,
-                serviceName: String?,
-                authority: String?
-            ): String? {
-                var sni: String? = null
-                network = if (transport.isEmpty()) NetworkType.TCP.type else transport
-                when (network) {
-                    NetworkType.TCP.type -> {
-                        val tcpSetting = TcpSettingsBean()
-                        if (headerType == AppConfig.HEADER_TYPE_HTTP) {
-                            tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP
-                            if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
-                                val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
-                                requestObj.headers.Host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                requestObj.path = path.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                tcpSetting.header.request = requestObj
-                                sni = requestObj.headers.Host?.getOrNull(0)
-                            }
-                        } else {
-                            tcpSetting.header.type = "none"
-                            sni = host
-                        }
-                        tcpSettings = tcpSetting
-                    }
-
-                    NetworkType.KCP.type -> {
-                        val kcpsetting = KcpSettingsBean()
-                        kcpsetting.header.type = headerType ?: "none"
-                        if (seed.isNullOrEmpty()) {
-                            kcpsetting.seed = null
-                        } else {
-                            kcpsetting.seed = seed
-                        }
-                        if (host.isNullOrEmpty()) {
-                            kcpsetting.header.domain = null
-                        } else {
-                            kcpsetting.header.domain = host
-                        }
-                        kcpSettings = kcpsetting
-                    }
-
-                    NetworkType.WS.type -> {
-                        val wssetting = WsSettingsBean()
-                        wssetting.headers.Host = host.orEmpty()
-                        sni = host
-                        wssetting.path = path ?: "/"
-                        wsSettings = wssetting
-                    }
-
-                    NetworkType.HTTP_UPGRADE.type -> {
-                        val httpupgradeSetting = HttpupgradeSettingsBean()
-                        httpupgradeSetting.host = host.orEmpty()
-                        sni = host
-                        httpupgradeSetting.path = path ?: "/"
-                        httpupgradeSettings = httpupgradeSetting
-                    }
-
-                    NetworkType.XHTTP.type -> {
-                        val xhttpSetting = XhttpSettingsBean()
-                        xhttpSetting.host = host.orEmpty()
-                        sni = host
-                        xhttpSetting.path = path ?: "/"
-                        xhttpSettings = xhttpSetting
-                    }
-
-                    NetworkType.H2.type, NetworkType.HTTP.type -> {
-                        network = NetworkType.H2.type
-                        val h2Setting = HttpSettingsBean()
-                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                        sni = h2Setting.host.getOrNull(0)
-                        h2Setting.path = path ?: "/"
-                        httpSettings = h2Setting
-                    }
-
-//                    "quic" -> {
-//                        val quicsetting = QuicSettingBean()
-//                        quicsetting.security = quicSecurity ?: "none"
-//                        quicsetting.key = key.orEmpty()
-//                        quicsetting.header.type = headerType ?: "none"
-//                        quicSettings = quicsetting
-//                    }
-
-                    NetworkType.GRPC.type -> {
-                        val grpcSetting = GrpcSettingsBean()
-                        grpcSetting.multiMode = mode == "multi"
-                        grpcSetting.serviceName = serviceName.orEmpty()
-                        grpcSetting.authority = authority.orEmpty()
-                        grpcSetting.idle_timeout = 60
-                        grpcSetting.health_check_timeout = 20
-                        sni = authority
-                        grpcSettings = grpcSetting
-                    }
-                }
-                return sni
-            }
-
-            fun populateTlsSettings(
-                streamSecurity: String,
-                allowInsecure: Boolean,
-                sni: String?,
-                fingerprint: String?,
-                alpns: String?,
-                publicKey: String?,
-                shortId: String?,
-                spiderX: String?
-            ) {
-                security = if (streamSecurity.isEmpty()) null else streamSecurity
-                if (security == null) return
-                val tlsSetting = TlsSettingsBean(
-                    allowInsecure = allowInsecure,
-                    serverName = if (sni.isNullOrEmpty()) null else sni,
-                    fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
-                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
-                    publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
-                    shortId = if (shortId.isNullOrEmpty()) null else shortId,
-                    spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
-                )
-                if (security == AppConfig.TLS) {
-                    tlsSettings = tlsSetting
-                    realitySettings = null
-                } else if (security == AppConfig.REALITY) {
-                    tlsSettings = null
-                    realitySettings = tlsSetting
-                }
-            }
        }

        data class MuxBean(
@@ -647,6 +460,18 @@ data class V2rayConfig(
            }
            return null
        }
+
+        fun ensureSockopt(): V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean {
+            val stream = streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean().also {
+                streamSettings = it
+            }
+
+            val sockopt = stream.sockopt ?: V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean().also {
+                stream.sockopt = it
+            }
+
+            return sockopt
+        }
    }

    data class DnsBean(
@@ -723,15 +548,9 @@ data class V2rayConfig(
        return null
    }

-    fun toPrettyPrinting(): String {
-        return GsonBuilder()
-            .setPrettyPrinting()
-            .disableHtmlEscaping()
-            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
-                object : TypeToken<Double>() {}.type,
-                JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
-            )
-            .create()
-            .toJson(this)
+    fun getAllProxyOutbound(): List<OutboundBean> {
+        return outbounds.filter { outbound ->
+            EConfigType.entries.any { it.name.equals(outbound.protocol, ignoreCase = true) }
+        }
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt
@@ -196,4 +196,17 @@ inline fun <reified T : Serializable> Intent.serializable(key: String): T? = whe
 *
 * @return True if the CharSequence is not null and not empty, false otherwise.
 */
-fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty())
+fun CharSequence?.isNotNullEmpty(): Boolean = this != null && this.isNotEmpty()
+
+fun String.concatUrl(vararg paths: String): String {
+    val builder = StringBuilder(this.trimEnd('/'))
+
+    paths.forEach { path ->
+        val trimmedPath = path.trim('/')
+        if (trimmedPath.isNotEmpty()) {
+            builder.append('/').append(trimmedPath)
+        }
+    }
+
+    return builder.toString()
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -4,6 +4,7 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -18,15 +19,15 @@ open class FmtBase {
     */
    fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, String>?): String {
        val query = if (dicQuery != null)
-            ("?" + dicQuery.toList().joinToString(
+            "?" + dicQuery.toList().joinToString(
                separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) }))
+                transform = { it.first + "=" + Utils.urlEncode(it.second) })
        else ""

        val url = String.format(
            "%s@%s:%s",
            Utils.urlEncode(userInfo ?: ""),
-            Utils.getIpv6Address(config.server),
+            Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
            config.serverPort
        )

@@ -148,4 +149,9 @@ open class FmtBase {

        return dicQuery
    }
-}
+
+    fun getServerAddress(profileItem: ProfileItem): String {
+        return HttpUtil.toIdnDomain(profileItem.server.orEmpty())
+    }
+
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
@@ -4,6 +4,7 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.handler.V2rayConfigManager

 object HttpFmt : FmtBase() {
    /**
@@ -13,10 +14,10 @@ object HttpFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HTTP)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HTTP)

        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
            server.port = profileItem.serverPort.orEmpty().toInt()
            if (profileItem.username.isNotNullEmpty()) {
                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
@@ -9,6 +9,7 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -24,7 +25,7 @@ object Hysteria2Fmt : FmtBase() {
        val config = ProfileItem.create(EConfigType.HYSTERIA2)

        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()
        config.password = uri.userInfo
@@ -144,7 +145,7 @@ object Hysteria2Fmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HYSTERIA2)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2)
        return outboundBean
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
@@ -1,10 +1,13 @@
 package com.v2ray.ang.fmt

+import android.util.Log
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -33,7 +36,7 @@ object ShadowsocksFmt : FmtBase() {
        if (uri.port <= 0) return null
        if (uri.userInfo.isNullOrEmpty()) return null

-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()

@@ -82,7 +85,7 @@ object ShadowsocksFmt : FmtBase() {
                config.remarks =
                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to decode remarks in SS legacy URL", e)
            }

            result = result.substring(0, indexSplit)
@@ -129,38 +132,22 @@ object ShadowsocksFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SHADOWSOCKS)

        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
            server.port = profileItem.serverPort.orEmpty().toInt()
            server.password = profileItem.password
            server.method = profileItem.method
        }

-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
+        val sni = outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }

-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
+        outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }

        return outboundBean
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
@@ -5,6 +5,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -22,7 +23,7 @@ object SocksFmt : FmtBase() {
        if (uri.idnHost.isEmpty()) return null
        if (uri.port <= 0) return null

-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()

@@ -60,10 +61,10 @@ object SocksFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SOCKS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SOCKS)

        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
            server.port = profileItem.serverPort.orEmpty().toInt()
            if (profileItem.username.isNotNullEmpty()) {
                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
@@ -7,6 +7,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -22,7 +23,7 @@ object TrojanFmt : FmtBase() {
        val config = ProfileItem.create(EConfigType.TROJAN)

        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()
        config.password = uri.userInfo
@@ -60,38 +61,22 @@ object TrojanFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.TROJAN)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.TROJAN)

        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
            server.port = profileItem.serverPort.orEmpty().toInt()
            server.password = profileItem.password
            server.flow = profileItem.flow
        }

-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
+        val sni = outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }

-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
+        outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }

        return outboundBean
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
@@ -6,7 +6,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -26,7 +26,7 @@ object VlessFmt : FmtBase() {
        if (uri.rawQuery.isNullOrEmpty()) return null
        val queryParam = getQueryParam(uri)

-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()
        config.password = uri.userInfo
@@ -57,41 +57,23 @@ object VlessFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VLESS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VLESS)

        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = getServerAddress(profileItem)
            vnext.port = profileItem.serverPort.orEmpty().toInt()
            vnext.users[0].id = profileItem.password.orEmpty()
            vnext.users[0].encryption = profileItem.method
            vnext.users[0].flow = profileItem.flow
        }

-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-        outboundBean?.streamSettings?.xhttpSettings?.mode = profileItem.xhttpMode
-        outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra)
+        val sni = outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }

-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
+        outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }

        return outboundBean
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
@@ -11,6 +11,7 @@ import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI
@@ -33,7 +34,7 @@ object VmessFmt : FmtBase() {
        var result = str.replace(EConfigType.VMESS.protocolScheme, "")
        result = Utils.decode(result)
        if (TextUtils.isEmpty(result)) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
+            Log.w(AppConfig.TAG, "Toast decoding failed")
            return null
        }
        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
@@ -43,7 +44,7 @@ object VmessFmt : FmtBase() {
            || TextUtils.isEmpty(vmessQRCode.id)
            || TextUtils.isEmpty(vmessQRCode.net)
        ) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_incorrect_protocol")
+            Log.w(AppConfig.TAG, "Toast incorrect protocol")
            return null
        }

@@ -150,7 +151,7 @@ object VmessFmt : FmtBase() {
        if (uri.rawQuery.isNullOrEmpty()) return null
        val queryParam = getQueryParam(uri)

-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()
        config.password = uri.userInfo
@@ -168,38 +169,22 @@ object VmessFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VMESS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VMESS)

        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = getServerAddress(profileItem)
            vnext.port = profileItem.serverPort.orEmpty().toInt()
            vnext.users[0].id = profileItem.password.orEmpty()
            vnext.users[0].security = profileItem.method
        }

-        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            profileItem.network.orEmpty(),
-            profileItem.headerType,
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
+        val sni = outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }

-        outboundBean?.streamSettings?.populateTlsSettings(
-            profileItem.security.orEmpty(),
-            profileItem.insecure == true,
-            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            null,
-            null,
-            null
-        )
+        outboundBean?.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }

        return outboundBean
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
@@ -7,6 +7,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.removeWhiteSpace
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI

@@ -24,16 +25,16 @@ object WireguardFmt : FmtBase() {
        if (uri.rawQuery.isNullOrEmpty()) return null
        val queryParam = getQueryParam(uri)

-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
        config.server = uri.idnHost
        config.serverPort = uri.port.toString()

        config.secretKey = uri.userInfo.orEmpty()
-        config.localAddress = (queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4)
+        config.localAddress = queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
        config.publicKey = queryParam["publickey"].orEmpty()
-        config.preSharedKey = queryParam["presharedkey"].orEmpty()
+        config.preSharedKey = queryParam["presharedkey"]?.takeIf { it.isNotEmpty() }
        config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
-        config.reserved = (queryParam["reserved"] ?: "0,0,0")
+        config.reserved = queryParam["reserved"] ?: "0,0,0"

        return config
    }
@@ -83,7 +84,7 @@ object WireguardFmt : FmtBase() {
        config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
        config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
        config.publicKey = peerParams["publickey"].orEmpty()
-        config.preSharedKey = peerParams["presharedkey"].orEmpty()
+        config.preSharedKey = peerParams["presharedkey"]?.takeIf { it.isNotEmpty() }
        val endpoint = peerParams["endpoint"].orEmpty()
        val endpointParts = endpoint.split(":", limit = 2)
        if (endpointParts.size == 2) {
@@ -105,18 +106,18 @@ object WireguardFmt : FmtBase() {
     * @return the converted OutboundBean object, or null if conversion fails
     */
    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.WIREGUARD)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.WIREGUARD)

        outboundBean?.settings?.let { wireguard ->
            wireguard.secretKey = profileItem.secretKey
            wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
            wireguard.peers?.firstOrNull()?.let { peer ->
                peer.publicKey = profileItem.publicKey.orEmpty()
-                peer.preSharedKey = profileItem.preSharedKey.orEmpty()
+                peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
                peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
            }
            wireguard.mtu = profileItem.mtu
-            wireguard.reserved = profileItem.reserved?.split(",")?.map { it.toInt() }
+            wireguard.reserved = profileItem.reserved?.takeIf { it.isNotBlank() }?.split(",")?.filter { it.isNotBlank() }?.map { it.trim().toInt() }
        }

        return outboundBean
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
@@ -7,7 +7,9 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.*
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -42,7 +44,7 @@ object AngConfigManager {
            Utils.setClipboard(context, conf)

        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to share config to clipboard", e)
            return -1
        }
        return 0
@@ -71,7 +73,7 @@ object AngConfigManager {
            }
            return sb.lines().count()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to share non-custom configs to clipboard", e)
            return -1
        }
    }
@@ -91,7 +93,7 @@ object AngConfigManager {
            return QRCodeDecoder.createQRCode(conf)

        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to share config as QR code", e)
            return null
        }
    }
@@ -120,7 +122,7 @@ object AngConfigManager {
                return -1
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to share full content to clipboard", e)
            return -1
        }
        return 0
@@ -148,7 +150,7 @@ object AngConfigManager {
                EConfigType.HYSTERIA2 -> Hysteria2Fmt.toUri(config)
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to share config for GUID: $guid", e)
            return ""
        }
    }
@@ -203,7 +205,7 @@ object AngConfigManager {
                }
            return count
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse batch subscription", e)
        }
        return 0
    }
@@ -251,7 +253,7 @@ object AngConfigManager {
                }
            return count
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse batch config", e)
        }
        return 0
    }
@@ -287,7 +289,7 @@ object AngConfigManager {
                    return count
                }
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to parse custom config server JSON array", e)
            }

            try {
@@ -298,7 +300,7 @@ object AngConfigManager {
                MmkvManager.encodeServerRaw(key, server)
                return 1
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to parse custom config server as single config", e)
            }
            return 0
        } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
@@ -308,7 +310,7 @@ object AngConfigManager {
                MmkvManager.encodeServerRaw(key, server)
                return 1
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to parse WireGuard config file", e)
            }
            return 0
        } else {
@@ -372,7 +374,7 @@ object AngConfigManager {
                MmkvManager.setSelectServer(guid)
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse config", e)
            return -1
        }
        return 0
@@ -390,7 +392,7 @@ object AngConfigManager {
                count += updateConfigViaSub(it)
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to update config via all subscriptions", e)
            return 0
        }
        return count
@@ -413,25 +415,29 @@ object AngConfigManager {
            if (!it.second.enabled) {
                return 0
            }
-            val url = HttpUtil.idnToASCII(it.second.url)
+            val url = HttpUtil.toIdnUrl(it.second.url)
            if (!Utils.isValidUrl(url)) {
                return 0
            }
-            Log.d(AppConfig.ANG_PACKAGE, url)
+            if (!it.second.allowInsecureUrl) {
+                if (!Utils.isValidSubUrl(url)) {
+                    return 0
+                }
+            }
+            Log.i(AppConfig.TAG, url)

            var configText = try {
                val httpPort = SettingsManager.getHttpPort()
                HttpUtil.getUrlContentWithUserAgent(url, 15000, httpPort)
            } catch (e: Exception) {
-                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
-                //e.printStackTrace()
+                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error", e)
                ""
            }
            if (configText.isEmpty()) {
                configText = try {
                    HttpUtil.getUrlContentWithUserAgent(url)
                } catch (e: Exception) {
-                    e.printStackTrace()
+                    Log.e(AppConfig.TAG, "Update subscription: Failed to get URL content with user agent", e)
                    ""
                }
            }
@@ -440,7 +446,7 @@ object AngConfigManager {
            }
            return parseConfigViaSub(configText, it.first, false)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to update config via subscription", e)
            return 0
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt
@@ -3,7 +3,6 @@ package com.v2ray.ang.handler
 import android.util.Log
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
@@ -26,7 +25,7 @@ object MigrateManager {
            return false
        }
        val serverList = serverStorage.allKeys() ?: return false
-        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + serverList.count())
+        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + serverList.count())

        for (guid in serverList) {
            var configOld = decodeServerConfigOld(guid) ?: continue
@@ -43,9 +42,9 @@ object MigrateManager {
            //check and remove old
            decodeServerConfig(guid) ?: continue
            serverStorage.remove(guid)
-            Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + config.remarks)
+            Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + config.remarks)
        }
-        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-end")
+        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-end")
        return true
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt
@@ -571,7 +571,7 @@ object MmkvManager {
     * @param startOnBoot Whether to start on boot.
     */
    fun encodeStartOnBoot(startOnBoot: Boolean) {
-        MmkvManager.encodeSettings(PREF_IS_BOOTED, startOnBoot)
+        encodeSettings(PREF_IS_BOOTED, startOnBoot)
    }

    /**
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
@@ -84,7 +84,7 @@ object SettingsManager {
            resetRoutingRulesetsCommon(rulesetList)
            return true
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(ANG_PACKAGE, "Failed to reset routing rulesets", e)
            return false
        }
    }
@@ -159,7 +159,7 @@ object SettingsManager {
     * @return True if bypassing LAN, false otherwise.
     */
    fun routingRulesetsBypassLan(): Boolean {
-        val vpnBypassLan = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_BYPASS_LAN) ?: "0"
+        val vpnBypassLan = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_BYPASS_LAN) ?: "1"
        if (vpnBypassLan == "1") {
            return true
        } else if (vpnBypassLan == "2") {
@@ -167,11 +167,11 @@ object SettingsManager {
        }

        val guid = MmkvManager.getSelectServer() ?: return false
-        val config = MmkvManager.decodeServerConfig(guid) ?: return false
+        val config = decodeServerConfig(guid) ?: return false
        if (config.configType == EConfigType.CUSTOM) {
            val raw = MmkvManager.decodeServerRaw(guid) ?: return false
            val v2rayConfig = JsonUtil.fromJson(raw, V2rayConfig::class.java)
-            val exist = v2rayConfig.routing.rules.filter { it.outboundTag == TAG_DIRECT }?.any {
+            val exist = v2rayConfig.routing.rules.filter { it.outboundTag == TAG_DIRECT }.any {
                it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
            }
            return exist == true
@@ -216,7 +216,7 @@ object SettingsManager {
     * @return The ProfileItem.
     */
    fun getServerViaRemarks(remarks: String?): ProfileItem? {
-        if (remarks == null) {
+        if (remarks.isNullOrEmpty()) {
            return null
        }
        val serverList = decodeServerList()
@@ -242,7 +242,7 @@ object SettingsManager {
     * @return The HTTP port.
     */
    fun getHttpPort(): Int {
-        return getSocksPort() + (if (Utils.isXray()) 0 else 1)
+        return getSocksPort() + if (Utils.isXray()) 0 else 1
    }

    /**
@@ -265,10 +265,7 @@ object SettingsManager {
                            input.copyTo(output)
                        }
                    }
-                    Log.i(
-                        ANG_PACKAGE,
-                        "Copied from apk assets folder to ${target.absolutePath}"
-                    )
+                    Log.i(AppConfig.TAG, "Copied from apk assets folder to ${target.absolutePath}")
                }
        } catch (e: Exception) {
            Log.e(ANG_PACKAGE, "asset copy failed", e)
@@ -319,10 +316,10 @@ object SettingsManager {
     */
    fun getDelayTestUrl(second: Boolean = false): String {
        return if (second) {
-            AppConfig.DelayTestUrl2
+            AppConfig.DELAY_TEST_URL2
        } else {
            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
-                ?: AppConfig.DelayTestUrl
+                ?: AppConfig.DELAY_TEST_URL
        }
    }

@@ -343,6 +340,7 @@ object SettingsManager {
            Language.VIETNAMESE -> Locale("vi")
            Language.RUSSIAN -> Locale("ru")
            Language.PERSIAN -> Locale("fa")
+            Language.ARABIC -> Locale("ar")
            Language.BANGLA -> Locale("bn")
            Language.BAKHTIARI -> Locale("bqi", "IR")
        }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
@@ -6,8 +6,10 @@ import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.dto.IPAPIInfo
 import com.v2ray.ang.extension.responseLength
 import com.v2ray.ang.util.HttpUtil
+import com.v2ray.ang.util.JsonUtil
 import kotlinx.coroutines.isActive
 import libv2ray.Libv2ray
 import java.io.IOException
@@ -51,7 +53,7 @@ object SpeedtestManager {
        return try {
            Libv2ray.measureOutboundDelay(config, SettingsManager.getDelayTestUrl())
        } catch (e: Exception) {
-            Log.d(AppConfig.ANG_PACKAGE, "realPing: $e")
+            Log.e(AppConfig.TAG, "Failed to measure outbound delay", e)
            -1L
        }
    }
@@ -76,7 +78,7 @@ object SpeedtestManager {
                }
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to ping URL: $url", e)
        }
        return "-1ms"
    }
@@ -103,11 +105,11 @@ object SpeedtestManager {
            socket.close()
            return time
        } catch (e: UnknownHostException) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Unknown host: $url", e)
        } catch (e: IOException) {
-            Log.d(AppConfig.ANG_PACKAGE, "socketConnectTime IOException: $e")
+            Log.e(AppConfig.TAG, "socketConnectTime IOException: $e")
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to establish socket connection to $url:$port", e)
        }
        return -1
    }
@@ -152,18 +154,29 @@ object SpeedtestManager {
                )
            }
        } catch (e: IOException) {
-            Log.d(AppConfig.ANG_PACKAGE, "testConnection IOException: " + Log.getStackTraceString(e))
+            Log.e(AppConfig.TAG, "Connection test IOException", e)
            result = context.getString(R.string.connection_test_error, e.message)
        } catch (e: Exception) {
-            Log.d(AppConfig.ANG_PACKAGE, "testConnection Exception: " + Log.getStackTraceString(e))
+            Log.e(AppConfig.TAG, "Connection test Exception", e)
            result = context.getString(R.string.connection_test_error, e.message)
        } finally {
-            conn?.disconnect()
+            conn.disconnect()
        }

        return Pair(elapsed, result)
    }

+    fun getRemoteIPInfo(): String? {
+        val httpPort = SettingsManager.getHttpPort()
+        var content = HttpUtil.getUrlContent(AppConfig.IP_API_URL, 5000, httpPort) ?: return null
+
+        var ipInfo = JsonUtil.fromJson(content, IPAPIInfo::class.java) ?: return null
+        var ip = ipInfo.ip ?: ipInfo.clientIp ?: ipInfo.ip_addr ?: ipInfo.query
+        var country = ipInfo.country_code ?: ipInfo.country ?: ipInfo.countryCode
+
+        return "(${country ?: "unknown"}) $ip"
+    }
+
    /**
     * Gets the version of the V2Ray library.
     *
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt
@@ -0,0 +1,107 @@
+package com.v2ray.ang.handler
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.dto.CheckUpdateResult
+import com.v2ray.ang.dto.GitHubRelease
+import com.v2ray.ang.extension.concatUrl
+import com.v2ray.ang.util.HttpUtil
+import com.v2ray.ang.util.JsonUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
+
+object UpdateCheckerManager {
+    suspend fun checkForUpdate(includePreRelease: Boolean = false): CheckUpdateResult = withContext(Dispatchers.IO) {
+            val url = if (includePreRelease) {
+                AppConfig.APP_API_URL
+            } else {
+                AppConfig.APP_API_URL.concatUrl("latest")
+            }
+
+            var response = HttpUtil.getUrlContent(url, 5000)
+            if (response.isNullOrEmpty()) {
+                val httpPort = SettingsManager.getHttpPort()
+                response = HttpUtil.getUrlContent(url, 5000, httpPort) ?: throw IllegalStateException("Failed to get response")
+            }
+
+            val latestRelease = if (includePreRelease) {
+                JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
+                    .firstOrNull()
+                    ?: throw IllegalStateException("No pre-release found")
+            } else {
+                JsonUtil.fromJson(response, GitHubRelease::class.java)
+            }
+
+            val latestVersion = latestRelease.tagName.removePrefix("v")
+            Log.i(AppConfig.TAG, "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})")
+
+            return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
+                val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
+                CheckUpdateResult(
+                    hasUpdate = true,
+                    latestVersion = latestVersion,
+                    releaseNotes = latestRelease.body,
+                    downloadUrl = downloadUrl,
+                    isPreRelease = latestRelease.prerelease
+                )
+            } else {
+                CheckUpdateResult(hasUpdate = false)
+            }
+    }
+
+    suspend fun downloadApk(context: Context, downloadUrl: String): File? = withContext(Dispatchers.IO) {
+        try {
+            val httpPort = SettingsManager.getHttpPort()
+            val connection = HttpUtil.createProxyConnection(downloadUrl, httpPort, 10000, 10000, true)
+                ?: throw IllegalStateException("Failed to create connection")
+
+            try {
+                val apkFile = File(context.cacheDir, "update.apk")
+                Log.i(AppConfig.TAG, "Downloading APK to: ${apkFile.absolutePath}")
+
+                FileOutputStream(apkFile).use { outputStream ->
+                    connection.inputStream.use { inputStream ->
+                        inputStream.copyTo(outputStream)
+                    }
+                }
+                Log.i(AppConfig.TAG, "APK download completed")
+                return@withContext apkFile
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to download APK: ${e.message}")
+                return@withContext null
+            } finally {
+                try {
+                    connection.disconnect()
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Error closing connection: ${e.message}")
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to initiate download: ${e.message}")
+            return@withContext null
+        }
+    }
+
+    private fun compareVersions(version1: String, version2: String): Int {
+        val v1 = version1.split(".")
+        val v2 = version2.split(".")
+
+        for (i in 0 until maxOf(v1.size, v2.size)) {
+            val num1 = if (i < v1.size) v1[i].toInt() else 0
+            val num2 = if (i < v2.size) v2[i].toInt() else 0
+            if (num1 != num2) return num1 - num2
+        }
+        return 0
+    }
+
+    private fun getDownloadUrl(release: GitHubRelease, abi: String): String {
+        return release.assets.find { it.name.contains(abi) }?.browserDownloadUrl
+            ?: release.assets.firstOrNull()?.browserDownloadUrl
+            ?: throw IllegalStateException("No compatible APK found")
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt
@@ -107,7 +107,7 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
            addUpdateListener { animation ->
                val value = animation.animatedValue as Float
                viewHolder.itemView.translationX = value
-                viewHolder.itemView.alpha = (1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD))
+                viewHolder.itemView.alpha = 1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD)
            }
            interpolator = DecelerateInterpolator()
            duration = ANIMATION_DURATION
@@ -144,4 +144,4 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
        private const val SWIPE_THRESHOLD = 0.25f
        private const val ANIMATION_DURATION: Long = 200
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
@@ -35,7 +35,7 @@ class TaskerReceiver : BroadcastReceiver() {
                V2RayServiceManager.stopVService(context)
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            android.util.Log.e(AppConfig.TAG, "Error processing Tasker broadcast", e)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt
@@ -158,6 +158,7 @@ object NotificationService {
        mBuilder = null
        speedNotificationJob?.cancel()
        speedNotificationJob = null
+        mNotificationManager = null
    }

    /**
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt
@@ -2,7 +2,7 @@ package com.v2ray.ang.service

 import android.content.Context
 import android.util.Log
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -16,7 +16,7 @@ class ProcessService {
     * @param cmd The command to run.
     */
    fun runProcess(context: Context, cmd: MutableList<String>) {
-        Log.d(ANG_PACKAGE, cmd.toString())
+        Log.i(AppConfig.TAG, cmd.toString())

        try {
            val proBuilder = ProcessBuilder(cmd)
@@ -27,14 +27,14 @@ class ProcessService {

            CoroutineScope(Dispatchers.IO).launch {
                Thread.sleep(50L)
-                Log.d(ANG_PACKAGE, "runProcess check")
+                Log.i(AppConfig.TAG, "runProcess check")
                process?.waitFor()
-                Log.d(ANG_PACKAGE, "runProcess exited")
+                Log.i(AppConfig.TAG, "runProcess exited")
            }
-            Log.d(ANG_PACKAGE, process.toString())
+            Log.i(AppConfig.TAG, process.toString())

        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, e.toString(), e)
        }
    }

@@ -43,10 +43,10 @@ class ProcessService {
     */
    fun stopProcess() {
        try {
-            Log.d(ANG_PACKAGE, "runProcess destroy")
+            Log.i(AppConfig.TAG, "runProcess destroy")
            process?.destroy()
        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, "Failed to destroy process", e)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
@@ -8,6 +8,7 @@ import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
@@ -24,14 +25,13 @@ class QSTileService : TileService() {
     * @param state The state to set.
     */
    fun setState(state: Int) {
+        qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
        if (state == Tile.STATE_INACTIVE) {
            qsTile?.state = Tile.STATE_INACTIVE
            qsTile?.label = getString(R.string.app_name)
-            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
        } else if (state == Tile.STATE_ACTIVE) {
            qsTile?.state = Tile.STATE_ACTIVE
            qsTile?.label = V2RayServiceManager.getRunningServerName()
-            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
        }

        qsTile?.updateTile()
@@ -44,7 +44,11 @@ class QSTileService : TileService() {
    override fun onStartListening() {
        super.onStartListening()

-        setState(Tile.STATE_INACTIVE)
+        if (V2RayServiceManager.isRunning()) {
+            setState(Tile.STATE_ACTIVE)
+        } else {
+            setState(Tile.STATE_INACTIVE)
+        }
        mMsgReceive = ReceiveMessageHandler(this)
        val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
        ContextCompat.registerReceiver(applicationContext, mMsgReceive, mFilter, Utils.receiverFlags())
@@ -61,7 +65,7 @@ class QSTileService : TileService() {
            applicationContext.unregisterReceiver(mMsgReceive)
            mMsgReceive = null
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to unregister receiver", e)
        }

    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt
@@ -38,7 +38,7 @@ object SubscriptionUpdater {
         */
        @SuppressLint("MissingPermission")
        override suspend fun doWork(): Result {
-            Log.d(AppConfig.ANG_PACKAGE, "subscription automatic update starting")
+            Log.i(AppConfig.TAG, "subscription automatic update starting")

            val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }

@@ -56,10 +56,7 @@ object SubscriptionUpdater {
                    notificationManager.createNotificationChannel(channel)
                }
                notificationManager.notify(3, notification.build())
-                Log.d(
-                    AppConfig.ANG_PACKAGE,
-                    "subscription automatic update: ---${subItem.remarks}"
-                )
+                Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
                updateConfigViaSub(Pair(sub.first, subItem))
                notification.setContentText("Updating ${subItem.remarks}")
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
@@ -27,7 +27,7 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
     * @return The start mode.
     */
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startV2rayPoint()
+        V2RayServiceManager.startCoreLoop()
        return START_STICKY
    }

@@ -36,7 +36,7 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
     */
    override fun onDestroy() {
        super.onDestroy()
-        V2RayServiceManager.stopV2rayPoint()
+        V2RayServiceManager.stopCoreLoop()
    }

    /**
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
@@ -9,13 +9,13 @@ import android.os.Build
 import android.util.Log
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.PluginUtil
@@ -24,14 +24,14 @@ import go.Seq
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import libv2ray.CoreCallbackHandler
+import libv2ray.CoreController
 import libv2ray.Libv2ray
-import libv2ray.V2RayPoint
-import libv2ray.V2RayVPNServiceSupportsSet
 import java.lang.ref.SoftReference

 object V2RayServiceManager {

-    private val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
+    private val coreController: CoreController = Libv2ray.newCoreController(CoreCallback())
    private val mMsgReceive = ReceiveMessageHandler()
    private var currentConfig: ProfileItem? = null

@@ -39,7 +39,7 @@ object V2RayServiceManager {
        set(value) {
            field = value
            Seq.setContext(value?.get()?.getService()?.applicationContext)
-            Libv2ray.initV2Env(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
+            Libv2ray.initCoreEnv(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
        }

    /**
@@ -81,7 +81,7 @@ object V2RayServiceManager {
     * Checks if the V2Ray service is running.
     * @return True if the service is running, false otherwise.
     */
-    fun isRunning() = v2rayPoint.isRunning
+    fun isRunning() = coreController.isRunning

    /**
     * Gets the name of the currently running server.
@@ -91,10 +91,13 @@ object V2RayServiceManager {

    /**
     * Starts the context service for V2Ray.
+     * Chooses between VPN service or Proxy-only service based on user settings.
     * @param context The context from which the service is started.
     */
    private fun startContextService(context: Context) {
-        if (v2rayPoint.isRunning) return
+        if (coreController.isRunning) {
+            return
+        }
        val guid = MmkvManager.getSelectServer() ?: return
        val config = MmkvManager.decodeServerConfig(guid) ?: return
        if (config.configType != EConfigType.CUSTOM
@@ -124,18 +127,19 @@ object V2RayServiceManager {
    /**
     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
-     * Starts the V2Ray point.
+     * Starts the V2Ray core service.
     */
-    fun startV2rayPoint() {
-        val service = getService() ?: return
-        val guid = MmkvManager.getSelectServer() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
-        if (v2rayPoint.isRunning) {
-            return
+    fun startCoreLoop(): Boolean {
+        if (coreController.isRunning) {
+            return false
        }
+
+        val service = getService() ?: return false
+        val guid = MmkvManager.getSelectServer() ?: return false
+        val config = MmkvManager.decodeServerConfig(guid) ?: return false
        val result = V2rayConfigManager.getV2rayConfig(service, guid)
        if (!result.status)
-            return
+            return false

        try {
            val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
@@ -144,42 +148,52 @@ object V2RayServiceManager {
            mFilter.addAction(Intent.ACTION_USER_PRESENT)
            ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, "Failed to register broadcast receiver", e)
+            return false
        }

-        v2rayPoint.configureFileContent = result.content
-        v2rayPoint.domainName = result.domainPort
        currentConfig = config

        try {
-            v2rayPoint.runLoop(MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
+            coreController.startLoop(result.content)
        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, "Failed to start Core loop", e)
+            return false
        }

-        if (v2rayPoint.isRunning) {
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            NotificationService.showNotification(currentConfig)
-
-            PluginUtil.runPlugin(service, config, result.domainPort)
-        } else {
+        if (coreController.isRunning == false) {
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
            NotificationService.cancelNotification()
+            return false
        }
+
+        try {
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
+            NotificationService.showNotification(currentConfig)
+            NotificationService.startSpeedNotification(currentConfig)
+
+            PluginUtil.runPlugin(service, config, result.socksPort)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to startup service", e)
+            return false
+        }
+        return true
    }

    /**
-     * Stops the V2Ray point.
+     * Stops the V2Ray core service.
+     * Unregisters broadcast receivers, stops notifications, and shuts down plugins.
+     * @return True if the core was stopped successfully, false otherwise.
     */
-    fun stopV2rayPoint() {
-        val service = getService() ?: return
+    fun stopCoreLoop(): Boolean {
+        val service = getService() ?: return false

-        if (v2rayPoint.isRunning) {
+        if (coreController.isRunning) {
            CoroutineScope(Dispatchers.IO).launch {
                try {
-                    v2rayPoint.stopLoop()
+                    coreController.stopLoop()
                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, e.toString())
+                    Log.e(AppConfig.TAG, "Failed to stop V2Ray loop", e)
                }
            }
        }
@@ -190,9 +204,11 @@ object V2RayServiceManager {
        try {
            service.unregisterReceiver(mMsgReceive)
        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
        }
        PluginUtil.stopPlugin()
+
+        return true
    }

    /**
@@ -202,40 +218,52 @@ object V2RayServiceManager {
     * @return The statistics value.
     */
    fun queryStats(tag: String, link: String): Long {
-        return v2rayPoint.queryStats(tag, link)
+        return coreController.queryStats(tag, link)
    }

    /**
-     * Measures the delay for V2Ray.
+     * Measures the connection delay for the current V2Ray configuration.
+     * Tests with primary URL first, then falls back to alternative URL if needed.
+     * Also fetches remote IP information if the delay test was successful.
     */
    private fun measureV2rayDelay() {
+        if (coreController.isRunning == false) {
+            return
+        }
+
        CoroutineScope(Dispatchers.IO).launch {
            val service = getService() ?: return@launch
            var time = -1L
-            var errstr = ""
-            if (v2rayPoint.isRunning) {
-                try {
-                    time = v2rayPoint.measureDelay(SettingsManager.getDelayTestUrl())
-                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                    errstr = e.message?.substringAfter("\":") ?: "empty message"
-                }
-                if (time == -1L) {
-                    try {
-                        time = v2rayPoint.measureDelay(SettingsManager.getDelayTestUrl(true))
-                    } catch (e: Exception) {
-                        Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                        errstr = e.message?.substringAfter("\":") ?: "empty message"
-                    }
-                }
+            var errorStr = ""
+
+            try {
+                time = coreController.measureDelay(SettingsManager.getDelayTestUrl())
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to measure delay with primary URL", e)
+                errorStr = e.message?.substringAfter("\":") ?: "empty message"
            }
-            val result = if (time == -1L) {
-                service.getString(R.string.connection_test_error, errstr)
-            } else {
-                service.getString(R.string.connection_test_available, time)
+            if (time == -1L) {
+                try {
+                    time = coreController.measureDelay(SettingsManager.getDelayTestUrl(true))
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to measure delay with alternative URL", e)
+                    errorStr = e.message?.substringAfter("\":") ?: "empty message"
+                }
            }

+            val result = if (time >= 0) {
+                service.getString(R.string.connection_test_available, time)
+            } else {
+                service.getString(R.string.connection_test_error, errorStr)
+            }
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
+
+            // Only fetch IP info if the delay test was successful
+            if (time >= 0) {
+                SpeedtestManager.getRemoteIPInfo()?.let { ip ->
+                    MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, "$result\n$ip")
+                }
+            }
        }
    }

@@ -247,59 +275,53 @@ object V2RayServiceManager {
        return serviceControl?.get()?.getService()
    }

-    private class V2RayCallback : V2RayVPNServiceSupportsSet {
+    /**
+     * Core callback handler implementation for handling V2Ray core events.
+     * Handles startup, shutdown, socket protection, and status emission.
+     */
+    private class CoreCallback : CoreCallbackHandler {
+        /**
+         * Called when V2Ray core starts up.
+         * @return 0 for success, any other value for failure.
+         */
+        override fun startup(): Long {
+            return 0
+        }
+
+        /**
+         * Called when V2Ray core shuts down.
+         * @return 0 for success, any other value for failure.
+         */
        override fun shutdown(): Long {
            val serviceControl = serviceControl?.get() ?: return -1
-            // called by go
            return try {
                serviceControl.stopService()
                0
            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
+                Log.e(AppConfig.TAG, "Failed to stop service in callback", e)
                -1
            }
        }

-        override fun prepare(): Long {
-            return 0
-        }
-
-        override fun protect(l: Long): Boolean {
-            val serviceControl = serviceControl?.get() ?: return true
-            return serviceControl.vpnProtect(l.toInt())
-        }
-
        /**
-         * Called by Go to emit status.
-         * @param l The status code.
-         * @param s The status message.
-         * @return The status code.
+         * Called when V2Ray core emits status information.
+         * @param l Status code.
+         * @param s Status message.
+         * @return Always returns 0.
         */
        override fun onEmitStatus(l: Long, s: String?): Long {
            return 0
        }
-
-        /**
-         * Called by Go to set up the service.
-         * @param s The setup string.
-         * @return The status code.
-         */
-        override fun setup(s: String): Long {
-            val serviceControl = serviceControl?.get() ?: return -1
-            return try {
-                serviceControl.startService()
-                NotificationService.startSpeedNotification(currentConfig)
-                0
-            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
-                -1
-            }
-        }
    }

+    /**
+     * Broadcast receiver for handling messages sent to the service.
+     * Handles registration, service control, and screen events.
+     */
    private class ReceiveMessageHandler : BroadcastReceiver() {
        /**
         * Handles received broadcast messages.
+         * Processes service control messages and screen state changes.
         * @param ctx The context in which the receiver is running.
         * @param intent The intent being received.
         */
@@ -307,7 +329,7 @@ object V2RayServiceManager {
            val serviceControl = serviceControl?.get() ?: return
            when (intent?.getIntExtra("key", 0)) {
                AppConfig.MSG_REGISTER_CLIENT -> {
-                    if (v2rayPoint.isRunning) {
+                    if (coreController.isRunning) {
                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
                    } else {
                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_NOT_RUNNING, "")
@@ -323,12 +345,12 @@ object V2RayServiceManager {
                }

                AppConfig.MSG_STATE_STOP -> {
-                    Log.d(ANG_PACKAGE, "Stop Service")
+                    Log.i(AppConfig.TAG, "Stop Service")
                    serviceControl.stopService()
                }

                AppConfig.MSG_STATE_RESTART -> {
-                    Log.d(ANG_PACKAGE, "Restart Service")
+                    Log.i(AppConfig.TAG, "Restart Service")
                    serviceControl.stopService()
                    Thread.sleep(500L)
                    startVService(serviceControl.getService())
@@ -341,12 +363,12 @@ object V2RayServiceManager {

            when (intent?.action) {
                Intent.ACTION_SCREEN_OFF -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
+                    Log.i(AppConfig.TAG, "SCREEN_OFF, stop querying stats")
                    NotificationService.stopSpeedNotification(currentConfig)
                }

                Intent.ACTION_SCREEN_ON -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
+                    Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats")
                    NotificationService.startSpeedNotification(currentConfig)
                }
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
@@ -32,7 +32,7 @@ class V2RayTestService : Service() {
    override fun onCreate() {
        super.onCreate()
        Seq.setContext(this)
-        Libv2ray.initV2Env(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
+        Libv2ray.initCoreEnv(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
    }

    /**
@@ -81,11 +81,11 @@ class V2RayTestService : Service() {
            val delay = PluginUtil.realPingHy2(this, config)
            return delay
        } else {
-            val config = V2rayConfigManager.getV2rayConfig(this, guid)
-            if (!config.status) {
+            val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(this, guid)
+            if (!configResult.status) {
                return retFailure
            }
-            return SpeedtestManager.realPing(config.content)
+            return SpeedtestManager.realPing(configResult.content)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
@@ -18,10 +18,8 @@ import android.os.StrictMode
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.R
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.MyContextWrapper
@@ -40,6 +38,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
        private const val PRIVATE_VLAN6_CLIENT = "fc00::10:10:14:1"
        private const val PRIVATE_VLAN6_ROUTER = "fc00::10:10:14:2"
        private const val TUN2SOCKS = "libtun2socks.so"
+
    }

    private lateinit var mInterface: ParcelFileDescriptor
@@ -105,7 +104,9 @@ class V2RayVpnService : VpnService(), ServiceControl {
    }

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startV2rayPoint()
+        if (V2RayServiceManager.startCoreLoop()) {
+            startService()
+        }
        return START_STICKY
        //return super.onStartCommand(intent, flags, startId)
    }
@@ -166,7 +167,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
        val bypassLan = SettingsManager.routingRulesetsBypassLan()
        if (bypassLan) {
-            resources.getStringArray(R.array.bypass_private_ip_address).forEach {
+            AppConfig.ROUTED_IP_LIST.forEach {
                val addr = it.split('/')
                builder.addRoute(addr[0], addr[1].toInt())
            }
@@ -178,6 +179,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
            builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
            if (bypassLan) {
                builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
+                builder.addRoute("fc00::", 18) //Xray-core default FakeIPv6 Pool
            } else {
                builder.addRoute("::", 0)
            }
@@ -209,7 +211,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                    else
                        builder.addAllowedApplication(it)
                } catch (e: PackageManager.NameNotFoundException) {
-                    Log.d(ANG_PACKAGE, "setup error : --${e.localizedMessage}")
+                    Log.e(AppConfig.TAG, "Failed to configure app in VPN: ${e.localizedMessage}", e)
                }
            }
        } else {
@@ -227,7 +229,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
            try {
                connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to request default network", e)
            }
        }

@@ -245,7 +247,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
            return true
        } catch (e: Exception) {
            // non-nullable lateinit var
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
            stopV2Ray()
        }
        return false
@@ -256,6 +258,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
     * Starts the tun2socks process with the appropriate parameters.
     */
    private fun runTun2socks() {
+        Log.i(AppConfig.TAG, "Start run $TUN2SOCKS")
        val socksPort = SettingsManager.getSocksPort()
        val cmd = arrayListOf(
            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
@@ -277,7 +280,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
            cmd.add("--dnsgw")
            cmd.add("$LOOPBACK:${localDnsPort}")
        }
-        Log.d(packageName, cmd.toString())
+        Log.i(AppConfig.TAG, cmd.toString())

        try {
            val proBuilder = ProcessBuilder(cmd)
@@ -286,19 +289,19 @@ class V2RayVpnService : VpnService(), ServiceControl {
                .directory(applicationContext.filesDir)
                .start()
            Thread {
-                Log.d(packageName, "$TUN2SOCKS check")
+                Log.i(AppConfig.TAG, "$TUN2SOCKS check")
                process.waitFor()
-                Log.d(packageName, "$TUN2SOCKS exited")
+                Log.i(AppConfig.TAG, "$TUN2SOCKS exited")
                if (isRunning) {
-                    Log.d(packageName, "$TUN2SOCKS restart")
+                    Log.i(AppConfig.TAG, "$TUN2SOCKS restart")
                    runTun2socks()
                }
            }.start()
-            Log.d(packageName, process.toString())
+            Log.i(AppConfig.TAG, "$TUN2SOCKS process info : ${process.toString()}")

            sendFd()
        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
+            Log.e(AppConfig.TAG, "Failed to start $TUN2SOCKS process", e)
        }
    }

@@ -309,13 +312,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
    private fun sendFd() {
        val fd = mInterface.fileDescriptor
        val path = File(applicationContext.filesDir, "sock_path").absolutePath
-        Log.d(packageName, path)
+        Log.i(AppConfig.TAG, "LocalSocket path : $path")

        CoroutineScope(Dispatchers.IO).launch {
            var tries = 0
            while (true) try {
                Thread.sleep(50L shl tries)
-                Log.d(packageName, "sendFd tries: $tries")
+                Log.i(AppConfig.TAG, "LocalSocket sendFd tries: $tries")
                LocalSocket().use { localSocket ->
                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
@@ -323,7 +326,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                }
                break
            } catch (e: Exception) {
-                Log.d(packageName, e.toString())
+                Log.e(AppConfig.TAG, "Failed to send file descriptor, try: $tries", e)
                if (tries > 5) break
                tries += 1
            }
@@ -349,13 +352,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
        }

        try {
-            Log.d(packageName, "tun2socks destroy")
+            Log.i(AppConfig.TAG, "$TUN2SOCKS destroy")
            process.destroy()
        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
+            Log.e(AppConfig.TAG, "Failed to destroy $TUN2SOCKS process", e)
        }

-        V2RayServiceManager.stopV2rayPoint()
+        V2RayServiceManager.stopCoreLoop()

        if (isForced) {
            //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
@@ -367,8 +370,8 @@ class V2RayVpnService : VpnService(), ServiceControl {

            try {
                mInterface.close()
-            } catch (ignored: Exception) {
-                // ignored
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to close VPN interface", e)
            }
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
@@ -16,6 +16,7 @@ import com.v2ray.ang.databinding.ActivityAboutBinding
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.util.ZipUtil
@@ -34,7 +35,7 @@ class AboutActivity : BaseActivity() {
                try {
                    showFileChooser()
                } catch (e: Exception) {
-                    e.printStackTrace()
+                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
                }
            } else {
                toast(R.string.toast_permission_denied)
@@ -90,7 +91,7 @@ class AboutActivity : BaseActivity() {
                try {
                    showFileChooser()
                } catch (e: Exception) {
-                    e.printStackTrace()
+                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
                }
            } else {
                requestPermissionLauncher.launch(permission)
@@ -98,15 +99,15 @@ class AboutActivity : BaseActivity() {
        }

        binding.layoutSoureCcode.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGUrl)
+            Utils.openUri(this, AppConfig.APP_URL)
        }

        binding.layoutFeedback.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGIssues)
+            Utils.openUri(this, AppConfig.APP_ISSUES_URL)
        }

        binding.layoutOssLicenses.setOnClickListener {
-            val webView = android.webkit.WebView(this);
+            val webView = android.webkit.WebView(this)
            webView.loadUrl("file:///android_asset/open_source_licenses.html")
            android.app.AlertDialog.Builder(this)
                .setTitle("Open source licenses")
@@ -116,11 +117,11 @@ class AboutActivity : BaseActivity() {
        }

        binding.layoutTgChannel.setOnClickListener {
-            Utils.openUri(this, AppConfig.TgChannelUrl)
+            Utils.openUri(this, AppConfig.TG_CHANNEL_URL)
        }

        binding.layoutPrivacyPolicy.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGPrivacyPolicy)
+            Utils.openUri(this, AppConfig.APP_PRIVACY_POLICY)
        }

        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
@@ -169,7 +170,7 @@ class AboutActivity : BaseActivity() {
        try {
            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
        } catch (ex: android.content.ActivityNotFoundException) {
-            Log.e(AppConfig.ANG_PACKAGE, "File chooser activity not found: ${ex.message}", ex)
+            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
            toast(R.string.toast_require_file_manager)
        }
    }
@@ -192,7 +193,7 @@ class AboutActivity : BaseActivity() {
                        toastError(R.string.toast_failure)
                    }
                } catch (e: Exception) {
-                    Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e)
+                    Log.e(AppConfig.TAG, "Error during file restore", e)
                    toastError(R.string.toast_failure)
                }
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt
@@ -0,0 +1,77 @@
+package com.v2ray.ang.ui
+
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityCheckUpdateBinding
+import com.v2ray.ang.dto.CheckUpdateResult
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.extension.toastError
+import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SpeedtestManager
+import com.v2ray.ang.handler.UpdateCheckerManager
+import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.launch
+
+class CheckUpdateActivity : BaseActivity() {
+
+    private val binding by lazy { ActivityCheckUpdateBinding.inflate(layoutInflater) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+
+        title = getString(R.string.update_check_for_update)
+
+        binding.layoutCheckUpdate.setOnClickListener {
+            checkForUpdates(binding.checkPreRelease.isChecked)
+        }
+
+        binding.checkPreRelease.setOnCheckedChangeListener { _, isChecked ->
+            MmkvManager.encodeSettings(AppConfig.PREF_CHECK_UPDATE_PRE_RELEASE, isChecked)
+        }
+        binding.checkPreRelease.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_CHECK_UPDATE_PRE_RELEASE, false)
+
+        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
+            binding.tvVersion.text = it
+        }
+
+        checkForUpdates(binding.checkPreRelease.isChecked)
+    }
+
+    private fun checkForUpdates(includePreRelease: Boolean) {
+        toast(R.string.update_checking_for_update)
+
+        lifecycleScope.launch {
+            try {
+                val result = UpdateCheckerManager.checkForUpdate(includePreRelease)
+                if (result.hasUpdate) {
+                    showUpdateDialog(result)
+                } else {
+                    toastSuccess(R.string.update_already_latest_version)
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to check for updates: ${e.message}")
+                toastError(e.message ?: getString(R.string.toast_failure))
+            }
+        }
+    }
+
+    private fun showUpdateDialog(result: CheckUpdateResult) {
+        AlertDialog.Builder(this)
+            .setTitle(getString(R.string.update_new_version_found, result.latestVersion))
+            .setMessage(result.releaseNotes)
+            .setPositiveButton(R.string.update_now) { _, _ ->
+                result.downloadUrl?.let {
+                    Utils.openUri(this, it)
+                }
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
@@ -2,12 +2,14 @@ package com.v2ray.ang.ui

 import android.annotation.SuppressLint
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
@@ -68,7 +70,7 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
                }
            }
        } catch (e: IOException) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to get logcat", e)
        }
    }

@@ -89,7 +91,7 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
                }
            }
        } catch (e: IOException) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to clear logcat", e)
        }
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
@@ -1,13 +1,16 @@
 package com.v2ray.ang.ui

+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.databinding.ItemRecyclerLogcatBinding

 class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
    private var mActivity: LogcatActivity = activity

+
    override fun getItemCount() = mActivity.logsets.size

    override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
@@ -22,7 +25,7 @@ class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter
                holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Error binding log view data", e)
        }
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -9,6 +9,7 @@ import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
@@ -86,9 +87,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                    Action.IMPORT_QR_CODE_CONFIG ->
                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))

-//                    Action.IMPORT_QR_CODE_URL ->
-//                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
-
                    Action.READ_CONTENT_FROM_URI ->
                        chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
                            type = "*/*"
@@ -109,8 +107,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
    enum class Action {
        NONE,
        IMPORT_QR_CODE_CONFIG,
-
-        //IMPORT_QR_CODE_URL,
        READ_CONTENT_FROM_URI,
        POST_NOTIFICATIONS
    }
@@ -128,12 +124,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        }
    }

-//    private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-//        if (it.resultCode == RESULT_OK) {
-//            importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
-//        }
-//    }
-
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
@@ -324,7 +314,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList

    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
        R.id.import_qrcode -> {
-            importQRcode(true)
+            importQRcode()
            true
        }

@@ -378,26 +368,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            true
        }

-//        R.id.import_config_custom_clipboard -> {
-//            importConfigCustomClipboard()
-//            true
-//        }
-//
-//        R.id.import_config_custom_local -> {
-//            importConfigCustomLocal()
-//            true
-//        }
-//
-//        R.id.import_config_custom_url -> {
-//            importConfigCustomUrlClipboard()
-//            true
-//        }
-//
-//        R.id.import_config_custom_url_scan -> {
-//            importQRcode(false)
-//            true
-//        }
-
        R.id.export_all -> {
            exportAll()
            true
@@ -461,16 +431,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
    /**
     * import config from qrcode
     */
-    private fun importQRcode(forConfig: Boolean): Boolean {
+    private fun importQRcode(): Boolean {
        val permission = Manifest.permission.CAMERA
        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            if (forConfig) {
-                scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-            } else {
-                //scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
-            }
+            scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
        } else {
-            pendingAction = Action.IMPORT_QR_CODE_CONFIG//if (forConfig) Action.IMPORT_QR_CODE_CONFIG else Action.IMPORT_QR_CODE_URL
+            pendingAction = Action.IMPORT_QR_CODE_CONFIG
            requestPermissionLauncher.launch(permission)
        }
        return true
@@ -485,7 +451,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            val clipboard = Utils.getClipboard(this)
            importBatchConfig(clipboard)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to import config from clipboard", e)
            return false
        }
        return true
@@ -515,93 +481,25 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                    toastError(R.string.toast_failure)
                    binding.pbWaiting.hide()
                }
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to import batch config", e)
            }
        }
    }

+    /**
+     * import config from local config file
+     */
    private fun importConfigLocal(): Boolean {
        try {
            showFileChooser()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to import config from local file", e)
            return false
        }
        return true
    }


-//    private fun importConfigCustomClipboard()
-//            : Boolean {
-//        try {
-//            val configText = Utils.getClipboard(this)
-//            if (TextUtils.isEmpty(configText)) {
-//                toast(R.string.toast_none_data_clipboard)
-//                return false
-//            }
-//            importCustomizeConfig(configText)
-//            return true
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return false
-//        }
-//    }
-
-    /**
-     * import config from local config file
-     */
-//    private fun importConfigCustomLocal(): Boolean {
-//        try {
-//            showFileChooser()
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return false
-//        }
-//        return true
-//    }
-//
-//    private fun importConfigCustomUrlClipboard()
-//            : Boolean {
-//        try {
-//            val url = Utils.getClipboard(this)
-//            if (TextUtils.isEmpty(url)) {
-//                toast(R.string.toast_none_data_clipboard)
-//                return false
-//            }
-//            return importConfigCustomUrl(url)
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return false
-//        }
-//    }
-
-    /**
-     * import config from url
-     */
-//    private fun importConfigCustomUrl(url: String?): Boolean {
-//        try {
-//            if (!Utils.isValidUrl(url)) {
-//                toast(R.string.toast_invalid_url)
-//                return false
-//            }
-//            lifecycleScope.launch(Dispatchers.IO) {
-//                val configText = try {
-//                    HttpUtil.getUrlContentWithUserAgent(url)
-//                } catch (e: Exception) {
-//                    e.printStackTrace()
-//                    ""
-//                }
-//                launch(Dispatchers.Main) {
-//                    importCustomizeConfig(configText)
-//                }
-//            }
-//        } catch (e: Exception) {
-//            e.printStackTrace()
-//            return false
-//        }
-//        return true
-//    }
-
    /**
     * import config from sub
     */
@@ -744,36 +642,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                    importBatchConfig(input?.bufferedReader()?.readText())
                }
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to read content from URI", e)
            }
        } else {
            requestPermissionLauncher.launch(permission)
        }
    }

-//    /**
-//     * import customize config
-//     */
-//    private fun importCustomizeConfig(server: String?) {
-//        try {
-//            if (server == null || TextUtils.isEmpty(server)) {
-//                toast(R.string.toast_none_data)
-//                return
-//            }
-//            if (mainViewModel.appendCustomConfigServer(server)) {
-//                mainViewModel.reloadServerList()
-//                toastSuccess(R.string.toast_success)
-//            } else {
-//                toastError(R.string.toast_failure)
-//            }
-//            //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
-//        } catch (e: Exception) {
-//            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
-//            e.printStackTrace()
-//            return
-//        }
-//    }
-
    private fun setTestState(content: String?) {
        binding.tvTestState.text = content
    }
@@ -807,8 +682,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                Intent(this, SettingsActivity::class.java)
                    .putExtra("isRunning", mainViewModel.isRunning.value == true)
            )
-            R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
+
+            R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.APP_PROMOTION_URL)}?t=${System.currentTimeMillis()}")
            R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
+            R.id.check_for_update -> startActivity(Intent(this, CheckUpdateActivity::class.java))
            R.id.about -> startActivity(Intent(this, AboutActivity::class.java))
        }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -3,6 +3,7 @@ package com.v2ray.ang.ui
 import android.content.Intent
 import android.graphics.Color
 import android.text.TextUtils
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,6 +27,7 @@ import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.service.V2RayServiceManager
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch

@@ -187,7 +189,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                    else -> mActivity.toast("else")
                }
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Error when sharing server", e)
            }
        }.show()
    }
@@ -219,10 +221,15 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     * @param guid The server unique identifier
     */
    private fun shareFullContent(guid: String) {
-        if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) {
-            mActivity.toastSuccess(R.string.toast_success)
-        } else {
-            mActivity.toastError(R.string.toast_failure)
+        mActivity.lifecycleScope.launch(Dispatchers.IO) {
+            val result = AngConfigManager.shareFullContent2Clipboard(mActivity, guid)
+            launch(Dispatchers.Main) {
+                if (result == 0) {
+                    mActivity.toastSuccess(R.string.toast_success)
+                } else {
+                    mActivity.toastError(R.string.toast_failure)
+                }
+            }
        }
    }

@@ -299,7 +306,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                        delay(500)
                        V2RayServiceManager.startVService(mActivity)
                    } catch (e: Exception) {
-                        e.printStackTrace()
+                        Log.e(AppConfig.TAG, "Failed to restart V2Ray service", e)
                    }
                }
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
@@ -6,6 +6,7 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.Toast
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import com.v2ray.ang.AppConfig
@@ -21,15 +22,14 @@ import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.AppManagerUtil
 import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
+import es.dmoral.toasty.Toasty
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.text.Collator

 class PerAppProxyActivity : BaseActivity() {
-    private val binding by lazy {
-        ActivityBypassListBinding.inflate(layoutInflater)
-    }
+    private val binding by lazy { ActivityBypassListBinding.inflate(layoutInflater) }

    private var adapter: PerAppProxyAdapter? = null
    private var appsAll: List<AppInfo>? = null
@@ -85,6 +85,10 @@ class PerAppProxyActivity : BaseActivity() {
            MmkvManager.encodeSettings(AppConfig.PREF_BYPASS_APPS, isChecked)
        }
        binding.switchBypassApps.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS, false)
+
+        binding.layoutSwitchBypassAppsTips.setOnClickListener {
+            Toasty.info(this, R.string.summary_pref_per_app_proxy, Toast.LENGTH_LONG, true).show()
+        }
    }

    override fun onPause() {
@@ -156,7 +160,7 @@ class PerAppProxyActivity : BaseActivity() {
        toast(R.string.msg_downloading_content)
        binding.pbWaiting.show()

-        val url = AppConfig.androidpackagenamelistUrl
+        val url = AppConfig.ANDROID_PACKAGE_NAME_LIST_URL
        lifecycleScope.launch(Dispatchers.IO) {
            var content = HttpUtil.getUrlContent(url, 5000)
            if (content.isNullOrEmpty()) {
@@ -164,7 +168,7 @@ class PerAppProxyActivity : BaseActivity() {
                content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: ""
            }
            launch(Dispatchers.Main) {
-                Log.d(ANG_PACKAGE, content)
+                Log.i(AppConfig.TAG, content)
                selectProxyApp(content, true)
                toastSuccess(R.string.toast_success)
                binding.pbWaiting.hide()
@@ -205,7 +209,7 @@ class PerAppProxyActivity : BaseActivity() {
                adapter?.let { it ->
                    it.apps.forEach block@{
                        val packageName = it.packageName
-                        Log.d(ANG_PACKAGE, packageName)
+                        Log.i(AppConfig.TAG, packageName)
                        if (!inProxyApps(proxyApps, packageName, force)) {
                            adapter?.blacklist?.add(packageName)
                            println(packageName)
@@ -218,7 +222,7 @@ class PerAppProxyActivity : BaseActivity() {
                adapter?.let { it ->
                    it.apps.forEach block@{
                        val packageName = it.packageName
-                        Log.d(ANG_PACKAGE, packageName)
+                        Log.i(AppConfig.TAG, packageName)
                        if (inProxyApps(proxyApps, packageName, force)) {
                            adapter?.blacklist?.add(packageName)
                            println(packageName)
@@ -229,7 +233,7 @@ class PerAppProxyActivity : BaseActivity() {
                }
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Error selecting proxy app", e)
            return false
        }
        return true
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
@@ -4,10 +4,9 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
-import android.widget.AdapterView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
@@ -66,15 +65,9 @@ class RoutingSettingActivity : BaseActivity() {
        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)

-        val found = Utils.arrayFind(routing_domain_strategy, MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "")
-        found.let { binding.spDomainStrategy.setSelection(if (it >= 0) it else 0) }
-        binding.spDomainStrategy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-            }
-
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, routing_domain_strategy[position])
-            }
+        binding.tvDomainStrategySummary.text = getDomainStrategy()
+        binding.layoutDomainStrategy.setOnClickListener {
+            setDomainStrategy()
        }
    }

@@ -97,6 +90,22 @@ class RoutingSettingActivity : BaseActivity() {
        else -> super.onOptionsItemSelected(item)
    }

+    private fun getDomainStrategy(): String {
+        return MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: routing_domain_strategy.first()
+    }
+
+    private fun setDomainStrategy() {
+        android.app.AlertDialog.Builder(this).setItems(routing_domain_strategy.asList().toTypedArray()) { _, i ->
+            try {
+                val value = routing_domain_strategy[i]
+                MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, value)
+                binding.tvDomainStrategySummary.text = value
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to set domain strategy", e)
+            }
+        }.show()
+    }
+
    private fun importPredefined() {
        AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
@@ -110,7 +119,7 @@ class RoutingSettingActivity : BaseActivity() {
                            }
                        }
                    } catch (e: Exception) {
-                        e.printStackTrace()
+                        Log.e(AppConfig.TAG, "Failed to import predefined ruleset", e)
                    }
                }
                .setNegativeButton(android.R.string.cancel) { _, _ ->
@@ -126,7 +135,7 @@ class RoutingSettingActivity : BaseActivity() {
                val clipboard = try {
                    Utils.getClipboard(this)
                } catch (e: Exception) {
-                    e.printStackTrace()
+                    Log.e(AppConfig.TAG, "Failed to get clipboard content", e)
                    toastError(R.string.toast_failure)
                    return@setPositiveButton
                }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
@@ -21,6 +22,7 @@ import io.github.g00fy2.quickie.config.ScannerConfig

 class ScannerActivity : BaseActivity() {

+
    private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        val uri = it.data?.data
@@ -37,7 +39,7 @@ class ScannerActivity : BaseActivity() {
                    finished(text)
                }
            } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to decode QR code from file", e)
                toast(R.string.toast_decoding_failed)
            }
        }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
@@ -2,7 +2,6 @@ package com.v2ray.ang.ui

 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -14,13 +13,11 @@ import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.DEFAULT_PORT
 import com.v2ray.ang.AppConfig.PREF_ALLOW_INSECURE
 import com.v2ray.ang.AppConfig.REALITY
 import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.EConfigType
@@ -329,7 +326,7 @@ class ServerActivity : BaseActivity() {
            et_preshared_key?.text = Utils.getEditable(config.preSharedKey.orEmpty())
            et_reserved1?.text = Utils.getEditable(config.reserved ?: "0,0,0")
            et_local_address?.text = Utils.getEditable(
-                config.localAddress ?: "$WIREGUARD_LOCAL_ADDRESS_V4,$WIREGUARD_LOCAL_ADDRESS_V6"
+                config.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4
            )
            et_local_mtu?.text = Utils.getEditable(config.mtu?.toString() ?: WIREGUARD_LOCAL_MTU)
        } else if (config.configType == EConfigType.HYSTERIA2) {
@@ -422,7 +419,7 @@ class ServerActivity : BaseActivity() {
        et_public_key?.text = null
        et_reserved1?.text = Utils.getEditable("0,0,0")
        et_local_address?.text =
-            Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
+            Utils.getEditable(WIREGUARD_LOCAL_ADDRESS_V4)
        et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
        return true
    }
@@ -481,7 +478,7 @@ class ServerActivity : BaseActivity() {
        if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
            config.subscriptionId = subscriptionId.orEmpty()
        }
-        Log.d(ANG_PACKAGE, JsonUtil.toJsonPretty(config) ?: "")
+        //Log.i(AppConfig.TAG, JsonUtil.toJsonPretty(config) ?: "")
        MmkvManager.encodeServerConfig(editGuid, config)
        toastSuccess(R.string.toast_success)
        finish()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
@@ -2,11 +2,13 @@ package com.v2ray.ang.ui

 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import com.blacksquircle.ui.editorkit.utils.EditorTheme
 import com.blacksquircle.ui.language.json.JsonLanguage
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
 import com.v2ray.ang.dto.EConfigType
@@ -76,7 +78,7 @@ class ServerCustomConfigActivity : BaseActivity() {
        val profileItem = try {
            CustomFmt.parse(binding.editor.text.toString())
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse custom configuration", e)
            toast("${getString(R.string.toast_malformed_josn)} ${e.cause?.message}")
            return false
        }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
@@ -161,7 +161,7 @@ class SettingsActivity : BaseActivity() {
            }
            delayTestUrl?.setOnPreferenceChangeListener { _, any ->
                val nval = any as String
-                delayTestUrl?.summary = if (nval == "") AppConfig.DelayTestUrl else nval
+                delayTestUrl?.summary = if (nval == "") AppConfig.DELAY_TEST_URL else nval
                true
            }
            mode?.setOnPreferenceChangeListener { _, newValue ->
@@ -202,7 +202,7 @@ class SettingsActivity : BaseActivity() {
            remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
            domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
            dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
-            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl)
+            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)

            initSharedPreference()
        }
@@ -364,6 +364,6 @@ class SettingsActivity : BaseActivity() {
    }

    fun onModeHelpClicked(view: View) {
-        Utils.openUri(this, AppConfig.v2rayNGWikiMode)
+        Utils.openUri(this, AppConfig.APP_WIKI_MODE)
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt
@@ -6,6 +6,7 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubEditBinding
 import com.v2ray.ang.dto.SubscriptionItem
@@ -46,6 +47,7 @@ class SubEditActivity : BaseActivity() {
        binding.etFilter.text = Utils.getEditable(subItem.filter)
        binding.chkEnable.isChecked = subItem.enabled
        binding.autoUpdateCheck.isChecked = subItem.autoUpdate
+        binding.allowInsecureUrl.isChecked = subItem.allowInsecureUrl
        binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile)
        binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile)
        return true
@@ -77,6 +79,7 @@ class SubEditActivity : BaseActivity() {
        subItem.autoUpdate = binding.autoUpdateCheck.isChecked
        subItem.prevProfile = binding.etPreProfile.text.toString()
        subItem.nextProfile = binding.etNextProfile.text.toString()
+        subItem.allowInsecureUrl = binding.allowInsecureUrl.isChecked

        if (TextUtils.isEmpty(subItem.remarks)) {
            toast(R.string.sub_setting_remarks)
@@ -90,7 +93,9 @@ class SubEditActivity : BaseActivity() {

            if (!Utils.isValidSubUrl(subItem.url)) {
                toast(R.string.toast_insecure_url_protocol)
-                //return false
+                if (!subItem.allowInsecureUrl) {
+                    return false
+                }
            }
        }

@@ -105,19 +110,28 @@ class SubEditActivity : BaseActivity() {
     */
    private fun deleteServer(): Boolean {
        if (editSubId.isNotEmpty()) {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        MmkvManager.removeSubscription(editSubId)
-                        launch(Dispatchers.Main) {
-                            finish()
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+                AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            MmkvManager.removeSubscription(editSubId)
+                            launch(Dispatchers.Main) {
+                                finish()
+                            }
                        }
                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        // do nothing
+                    }
+                    .show()
+            } else {
+                lifecycleScope.launch(Dispatchers.IO) {
+                    MmkvManager.removeSubscription(editSubId)
+                    launch(Dispatchers.Main) {
+                        finish()
+                    }
                }
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    // do nothing
-                }
-                .show()
+            }
        }
        return true
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt
@@ -3,11 +3,14 @@ package com.v2ray.ang.ui
 import android.content.Intent
 import android.graphics.Color
 import android.text.TextUtils
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
@@ -18,6 +21,8 @@ import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.util.QRCodeDecoder
 import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch

 class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {

@@ -44,6 +49,10 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
            )
        }

+        holder.itemSubSettingBinding.layoutRemove.setOnClickListener {
+            removeSubscription(subId, position)
+        }
+
        holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
            if (!it.isPressed) return@setOnCheckedChangeListener
            subItem.enabled = isChecked
@@ -52,9 +61,11 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
        }

        if (TextUtils.isEmpty(subItem.url)) {
+            holder.itemSubSettingBinding.layoutUrl.visibility = View.GONE
            holder.itemSubSettingBinding.layoutShare.visibility = View.INVISIBLE
            holder.itemSubSettingBinding.chkEnable.visibility = View.INVISIBLE
        } else {
+            holder.itemSubSettingBinding.layoutUrl.visibility = View.VISIBLE
            holder.itemSubSettingBinding.layoutShare.visibility = View.VISIBLE
            holder.itemSubSettingBinding.chkEnable.visibility = View.VISIBLE
            holder.itemSubSettingBinding.layoutShare.setOnClickListener {
@@ -81,13 +92,39 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
                                else -> mActivity.toast("else")
                            }
                        } catch (e: Exception) {
-                            e.printStackTrace()
+                            Log.e(AppConfig.TAG, "Share subscription failed", e)
                        }
                    }.show()
            }
        }
    }

+    private fun removeSubscription(subId: String, position: Int) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+            AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    removeSubscriptionSub(subId, position)
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
+        } else {
+            removeSubscriptionSub(subId, position)
+        }
+    }
+
+    private fun removeSubscriptionSub(subId: String, position: Int) {
+        mActivity.lifecycleScope.launch(Dispatchers.IO) {
+            MmkvManager.removeSubscription(subId)
+            launch(Dispatchers.Main) {
+                notifyItemRemoved(position)
+                notifyItemRangeChanged(position, mActivity.subscriptions.size)
+                mActivity.refreshData()
+            }
+        }
+    }
+
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
        return MainViewHolder(
            ItemRecyclerSubSettingBinding.inflate(
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt
@@ -3,6 +3,7 @@ package com.v2ray.ang.ui
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -60,7 +61,7 @@ class TaskerActivity : BaseActivity() {
                }
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to initialize Tasker settings", e)

        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt
@@ -5,6 +5,7 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import androidx.lifecycle.lifecycleScope
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
@@ -54,7 +55,7 @@ class UrlSchemeActivity : BaseActivity() {
            startActivity(Intent(this, MainActivity::class.java))
            finish()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Error processing URL scheme", e)
        }
    }

@@ -62,7 +63,7 @@ class UrlSchemeActivity : BaseActivity() {
        if (uriString.isNullOrEmpty()) {
            return
        }
-        Log.d("UrlScheme", uriString)
+        Log.i(AppConfig.TAG, uriString)

        var decodedUrl = URLDecoder.decode(uriString, "UTF-8")
        val uri = Uri.parse(decodedUrl)
@@ -70,7 +71,7 @@ class UrlSchemeActivity : BaseActivity() {
            if (uri.fragment.isNullOrEmpty() && !fragment.isNullOrEmpty()) {
                decodedUrl += "#${fragment}"
            }
-            Log.d("UrlScheme-decodedUrl", decodedUrl)
+            Log.i(AppConfig.TAG, decodedUrl)
            lifecycleScope.launch(Dispatchers.IO) {
                val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
                withContext(Dispatchers.Main) {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
@@ -21,9 +21,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivitySubSettingBinding
+import com.v2ray.ang.databinding.ActivityUserAssetBinding
 import com.v2ray.ang.databinding.ItemRecyclerUserAssetBinding
 import com.v2ray.ang.dto.AssetUrlItem
+import com.v2ray.ang.extension.concatUrl
 import com.v2ray.ang.extension.toTrafficString
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
@@ -42,7 +43,7 @@ import java.text.DateFormat
 import java.util.Date

 class UserAssetActivity : BaseActivity() {
-    private val binding by lazy { ActivitySubSettingBinding.inflate(layoutInflater) }
+    private val binding by lazy { ActivityUserAssetBinding.inflate(layoutInflater) }

    val extDir by lazy { File(Utils.userAssetPath(this)) }
    val builtInGeoFiles = arrayOf("geosite.dat", "geoip.dat")
@@ -89,6 +90,11 @@ class UserAssetActivity : BaseActivity() {
        binding.recyclerView.layoutManager = LinearLayoutManager(this)
        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
        binding.recyclerView.adapter = UserAssetAdapter()
+
+        binding.tvGeoFilesSourcesSummary.text = getGeoFilesSources()
+        binding.layoutGeoFilesSources.setOnClickListener {
+            setGeoFilesSources()
+        }
    }

    override fun onResume() {
@@ -110,6 +116,22 @@ class UserAssetActivity : BaseActivity() {
        else -> super.onOptionsItemSelected(item)
    }

+    private fun getGeoFilesSources(): String {
+        return MmkvManager.decodeSettingsString(AppConfig.PREF_GEO_FILES_SOURCES) ?: AppConfig.GEO_FILES_SOURCES.first()
+    }
+
+    private fun setGeoFilesSources() {
+        AlertDialog.Builder(this).setItems(AppConfig.GEO_FILES_SOURCES.toTypedArray()) { _, i ->
+            try {
+                val value = AppConfig.GEO_FILES_SOURCES[i]
+                MmkvManager.encodeSettings(AppConfig.PREF_GEO_FILES_SOURCES, value)
+                binding.tvGeoFilesSourcesSummary.text = value
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to set geo files sources", e)
+            }
+        }.show()
+    }
+
    private fun showFileChooser() {
        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
            Manifest.permission.READ_MEDIA_IMAGES
@@ -163,7 +185,7 @@ class UserAssetActivity : BaseActivity() {
            }.also { cursor.close() }
        }
    } catch (e: Exception) {
-        e.printStackTrace()
+        Log.e(AppConfig.TAG, "Failed to get cursor name", e)
        null
    }

@@ -190,7 +212,7 @@ class UserAssetActivity : BaseActivity() {
                    .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url)
            )
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to import asset from URL", e)
            return false
        }
        return true
@@ -207,12 +229,16 @@ class UserAssetActivity : BaseActivity() {
        var resultCount = 0
        lifecycleScope.launch(Dispatchers.IO) {
            assets.forEach {
-                var result = downloadGeo(it.second, 15000, httpPort)
-                if (!result) {
-                    result = downloadGeo(it.second, 15000, 0)
+                try {
+                    var result = downloadGeo(it.second, 15000, httpPort)
+                    if (!result) {
+                        result = downloadGeo(it.second, 15000, 0)
+                    }
+                    if (result)
+                        resultCount++
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to download geo file: ${it.second.remarks}", e)
                }
-                if (result)
-                    resultCount++
            }
            withContext(Dispatchers.Main) {
                if (resultCount > 0) {
@@ -229,7 +255,7 @@ class UserAssetActivity : BaseActivity() {
    private fun downloadGeo(item: AssetUrlItem, timeout: Int, httpPort: Int): Boolean {
        val targetTemp = File(extDir, item.remarks + "_temp")
        val target = File(extDir, item.remarks)
-        //Log.d(AppConfig.ANG_PACKAGE, url)
+        Log.i(AppConfig.TAG, "Downloading geo file: ${item.remarks} from ${item.url}")

        val conn = HttpUtil.createProxyConnection(item.url, httpPort, timeout, timeout, needStream = true) ?: return false
        try {
@@ -244,10 +270,10 @@ class UserAssetActivity : BaseActivity() {
            }
            return true
        } catch (e: Exception) {
-            Log.e(AppConfig.ANG_PACKAGE, Log.getStackTraceString(e))
+            Log.e(AppConfig.TAG, "Failed to download geo file: ${item.remarks}", e)
            return false
        } finally {
-            conn?.disconnect()
+            conn.disconnect()
        }
    }

@@ -259,7 +285,8 @@ class UserAssetActivity : BaseActivity() {
                list.add(
                    Utils.getUuid() to AssetUrlItem(
                        it,
-                        AppConfig.GeoUrl + it
+                        String.format(AppConfig.GITHUB_DOWNLOAD_URL, getGeoFilesSources()).concatUrl(it),
+                        locked = true
                    )
                )
            }
@@ -310,7 +337,7 @@ class UserAssetActivity : BaseActivity() {
                holder.itemUserAssetBinding.assetProperties.text = getString(R.string.msg_file_not_found)
            }

-            if (item.second.remarks in builtInGeoFiles && item.second.url == AppConfig.GeoUrl + item.second.remarks) {
+            if (item.second.locked == true) {
                holder.itemUserAssetBinding.layoutEdit.visibility = GONE
                //holder.itemUserAssetBinding.layoutRemove.visibility = GONE
            } else {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt
@@ -2,9 +2,11 @@ package com.v2ray.ang.ui

 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityUserAssetUrlBinding
 import com.v2ray.ang.dto.AssetUrlItem
@@ -75,7 +77,11 @@ class UserAssetUrlActivity : BaseActivity() {
            // remove file associated with the asset
            val file = extDir.resolve(assetItem.remarks)
            if (file.exists()) {
-                file.delete()
+                try {
+                    file.delete()
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to delete asset file: ${file.path}", e)
+                }
            }
        } else {
            assetId = Utils.getUuid()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt
@@ -25,7 +25,7 @@ object AppManagerUtil {

                val appName = applicationInfo.loadLabel(packageManager).toString()
                val appIcon = applicationInfo.loadIcon(packageManager) ?: continue
-                val isSystemApp = (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) > 0
+                val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0

                val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
                apps.add(appInfo)
@@ -33,4 +33,8 @@ object AppManagerUtil {

            return@withContext apps
        }
-}
+
+    fun getLastUpdateTime(context: Context): Long =
+        context.packageManager.getPackageInfo(context.packageName, 0).lastUpdateTime
+
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
@@ -1,23 +1,32 @@
 package com.v2ray.ang.util

+import android.util.Log
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.util.Utils.encode
 import com.v2ray.ang.util.Utils.urlDecode
 import java.io.IOException
-import java.net.*
-import java.util.*
+import java.net.HttpURLConnection
+import java.net.IDN
+import java.net.Inet6Address
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.net.URL

 object HttpUtil {

    /**
-     * Converts a URL string to its ASCII representation.
+     * Converts the domain part of a URL string to its IDN (Punycode, ASCII Compatible Encoding) format.
     *
-     * @param str The URL string to convert.
-     * @return The ASCII representation of the URL.
+     * For example, a URL like "https://例子.中国/path" will be converted to "https://xn--fsqu00a.xn--fiqs8s/path".
+     *
+     * @param str The URL string to convert (can contain non-ASCII characters in the domain).
+     * @return The URL string with the domain part converted to ASCII-compatible (Punycode) format.
     */
-    fun idnToASCII(str: String): String {
-        val url = URI(str)
+    fun toIdnUrl(str: String): String {
+        val url = URL(str)
        val host = url.host
        val asciiHost = IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED)
        if (host != asciiHost) {
@@ -27,6 +36,67 @@ object HttpUtil {
        }
    }

+    /**
+     * Converts a Unicode domain name to its IDN (Punycode, ASCII Compatible Encoding) format.
+     * If the input is an IP address or already an ASCII domain, returns the original string.
+     *
+     * @param domain The domain string to convert (can include non-ASCII internationalized characters).
+     * @return The domain in ASCII-compatible (Punycode) format, or the original string if input is an IP or already ASCII.
+     */
+    fun toIdnDomain(domain: String): String {
+        // Return as is if it's a pure IP address (IPv4 or IPv6)
+        if (Utils.isPureIpAddress(domain)) {
+            return domain
+        }
+
+        // Return as is if already ASCII (English domain or already punycode)
+        if (domain.all { it.code < 128 }) {
+            return domain
+        }
+
+        // Otherwise, convert to ASCII using IDN
+        return IDN.toASCII(domain, IDN.ALLOW_UNASSIGNED)
+    }
+
+    /**
+     * Resolves a hostname to an IP address, returns original input if it's already an IP
+     *
+     * @param host The hostname or IP address to resolve
+     * @param ipv6Preferred Whether to prefer IPv6 addresses, defaults to false
+     * @return The resolved IP address or the original input (if it's already an IP or resolution fails)
+     */
+    fun resolveHostToIP(host: String, ipv6Preferred: Boolean = false): List<String>? {
+        try {
+            // If it's already an IP address, return it as a list
+            if (Utils.isPureIpAddress(host)) {
+                return null
+            }
+
+            // Get all IP addresses
+            val addresses = InetAddress.getAllByName(host)
+            if (addresses.isEmpty()) {
+                return null
+            }
+
+            // Sort addresses based on preference
+            val sortedAddresses = if (ipv6Preferred) {
+                addresses.sortedWith(compareByDescending { it is Inet6Address })
+            } else {
+                addresses.sortedWith(compareBy { it is Inet6Address })
+            }
+
+            val ipList = sortedAddresses.mapNotNull { it.hostAddress }
+
+            Log.i(AppConfig.TAG, "Resolved IPs for $host: ${ipList.joinToString()}")
+
+            return ipList
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to resolve host to IP", e)
+            return null
+        }
+    }
+
+
    /**
     * Retrieves the content of a URL as a string.
     *
@@ -142,7 +212,7 @@ object HttpUtil {
                )
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to create proxy connection", e)
            // If an exception occurs, close the connection and return null
            conn?.disconnect()
            return null
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt
@@ -1,5 +1,6 @@
 package com.v2ray.ang.util

+import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
@@ -8,6 +9,7 @@ import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.reflect.TypeToken
+import com.v2ray.ang.AppConfig
 import java.lang.reflect.Type

 object JsonUtil {
@@ -70,7 +72,7 @@ object JsonUtil {
        try {
            return JsonParser.parseString(src).getAsJsonObject()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse JSON string", e)
            return null
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt
@@ -3,12 +3,14 @@ package com.v2ray.ang.util
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.service.V2RayTestService
 import java.io.Serializable

 object MessageUtil {

+
    /**
     * Sends a message to the service.
     *
@@ -46,7 +48,7 @@ object MessageUtil {
            intent.putExtra("content", content)
            ctx.startService(intent)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to send message to test service", e)
        }
    }

@@ -67,7 +69,7 @@ object MessageUtil {
            intent.putExtra("content", content)
            ctx.sendBroadcast(intent)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to send message with action: $action", e)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt
@@ -3,7 +3,7 @@ package com.v2ray.ang.util
 import android.content.Context
 import android.os.SystemClock
 import android.util.Log
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.fmt.Hysteria2Fmt
@@ -13,7 +13,7 @@ import java.io.File

 object PluginUtil {
    private const val HYSTERIA2 = "libhysteria2.so"
-    private const val TAG = ANG_PACKAGE
+
    private val procService: ProcessService by lazy {
        ProcessService()
    }
@@ -23,16 +23,30 @@ object PluginUtil {
     *
     * @param context The context to use.
     * @param config The profile configuration.
-     * @param domainPort The domain and port information.
+     * @param socksPort The port information.
     */
-    fun runPlugin(context: Context, config: ProfileItem?, domainPort: String?) {
-        Log.d(TAG, "runPlugin")
+    fun runPlugin(context: Context, config: ProfileItem?, socksPort: Int?) {
+        Log.i(AppConfig.TAG, "Starting plugin execution")

-        if (config?.configType?.equals(EConfigType.HYSTERIA2) == true) {
-            val configFile = genConfigHy2(context, config, domainPort) ?: return
-            val cmd = genCmdHy2(context, configFile)
+        if (config == null) {
+            Log.w(AppConfig.TAG, "Cannot run plugin: config is null")
+            return
+        }

-            procService.runProcess(context, cmd)
+        try {
+            if (config.configType == EConfigType.HYSTERIA2) {
+                if (socksPort == null) {
+                    Log.w(AppConfig.TAG, "Cannot run plugin: socksPort is null")
+                    return
+                }
+                Log.i(AppConfig.TAG, "Running Hysteria2 plugin")
+                val configFile = genConfigHy2(context, config, socksPort) ?: return
+                val cmd = genCmdHy2(context, configFile)
+
+                procService.runProcess(context, cmd)
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Error running plugin", e)
        }
    }

@@ -51,12 +65,12 @@ object PluginUtil {
     * @return The ping delay in milliseconds, or -1 if it fails.
     */
    fun realPingHy2(context: Context, config: ProfileItem?): Long {
-        Log.d(TAG, "realPingHy2")
+        Log.i(AppConfig.TAG, "realPingHy2")
        val retFailure = -1L

        if (config?.configType?.equals(EConfigType.HYSTERIA2) == true) {
            val socksPort = Utils.findFreePort(listOf(0))
-            val configFile = genConfigHy2(context, config, "0:${socksPort}") ?: return retFailure
+            val configFile = genConfigHy2(context, config, socksPort) ?: return retFailure
            val cmd = genCmdHy2(context, configFile)

            val proc = ProcessService()
@@ -75,22 +89,20 @@ object PluginUtil {
     *
     * @param context The context to use.
     * @param config The profile configuration.
-     * @param domainPort The domain and port information.
+     * @param socksPort The port information.
     * @return The generated configuration file.
     */
-    private fun genConfigHy2(context: Context, config: ProfileItem, domainPort: String?): File? {
-        Log.d(TAG, "runPlugin $HYSTERIA2")
+    private fun genConfigHy2(context: Context, config: ProfileItem, socksPort: Int): File? {
+        Log.i(AppConfig.TAG, "runPlugin $HYSTERIA2")

-        val socksPort = domainPort?.split(":")?.last()
-            .let { if (it.isNullOrEmpty()) return null else it.toInt() }
        val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return null

        val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
-        Log.d(TAG, "runPlugin ${configFile.absolutePath}")
+        Log.i(AppConfig.TAG, "runPlugin ${configFile.absolutePath}")

        configFile.parentFile?.mkdirs()
        configFile.writeText(JsonUtil.toJson(hy2Config))
-        Log.d(TAG, JsonUtil.toJson(hy2Config))
+        Log.i(AppConfig.TAG, JsonUtil.toJson(hy2Config))

        return configFile
    }
@@ -119,10 +131,10 @@ object PluginUtil {
     */
    private fun stopHy2() {
        try {
-            Log.d(TAG, "$HYSTERIA2 destroy")
+            Log.i(AppConfig.TAG, "$HYSTERIA2 destroy")
            procService?.stopProcess()
        } catch (e: Exception) {
-            Log.d(TAG, e.toString())
+            Log.e(AppConfig.TAG, "Failed to stop Hysteria2 process", e)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
@@ -17,10 +17,12 @@ import android.webkit.URLUtil
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.BuildConfig
 import java.io.IOException
+import java.net.InetAddress
 import java.net.ServerSocket
+import java.net.URI
 import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.Locale
@@ -28,6 +30,10 @@ import java.util.UUID

 object Utils {

+    private val IPV4_REGEX =
+        Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
+    private val IPV6_REGEX = Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$")
+
    /**
     * Convert string to editable for Kotlin.
     *
@@ -46,22 +52,7 @@ object Utils {
     * @return The index of the value in the array, or -1 if not found.
     */
    fun arrayFind(array: Array<out String>, value: String): Int {
-        for (i in array.indices) {
-            if (array[i] == value) {
-                return i
-            }
-        }
-        return -1
-    }
-
-    /**
-     * Parse a string to an integer.
-     *
-     * @param str The string to parse.
-     * @return The parsed integer, or 0 if parsing fails.
-     */
-    fun parseInt(str: String): Int {
-        return parseInt(str, 0)
+        return array.indexOf(value)
    }

    /**
@@ -71,7 +62,7 @@ object Utils {
     * @param default The default value if parsing fails.
     * @return The parsed integer, or the default value if parsing fails.
     */
-    fun parseInt(str: String?, default: Int): Int {
+    fun parseInt(str: String?, default: Int = 0): Int {
        return str?.toIntOrNull() ?: default
    }

@@ -86,7 +77,7 @@ object Utils {
            val cmb = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
            cmb.primaryClip?.getItemAt(0)?.text.toString()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to get clipboard content", e)
            ""
        }
    }
@@ -103,7 +94,7 @@ object Utils {
            val clipData = ClipData.newPlainText(null, content)
            cmb.setPrimaryClip(clipData)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to set clipboard content", e)
        }
    }

@@ -124,15 +115,17 @@ object Utils {
     * @return The decoded string, or null if decoding fails.
     */
    fun tryDecodeBase64(text: String?): String? {
+        if (text.isNullOrEmpty()) return null
+
        try {
            return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8)
        } catch (e: Exception) {
-            Log.i(ANG_PACKAGE, "Parse base64 standard failed $e")
+            Log.e(AppConfig.TAG, "Failed to decode standard base64", e)
        }
        try {
            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(Charsets.UTF_8)
        } catch (e: Exception) {
-            Log.i(ANG_PACKAGE, "Parse base64 url safe failed $e")
+            Log.e(AppConfig.TAG, "Failed to decode URL-safe base64", e)
        }
        return null
    }
@@ -147,7 +140,7 @@ object Utils {
        return try {
            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to encode text to base64", e)
            ""
        }
    }
@@ -159,43 +152,38 @@ object Utils {
     * @return True if the string is a valid IP address, false otherwise.
     */
    fun isIpAddress(value: String?): Boolean {
+        if (value.isNullOrEmpty()) return false
+
        try {
-            if (value.isNullOrEmpty()) {
-                return false
-            }
-            var addr = value
-            if (addr.isEmpty() || addr.isBlank()) {
-                return false
-            }
+            var addr = value.trim()
+            if (addr.isEmpty()) return false
+
            //CIDR
-            if (addr.indexOf("/") > 0) {
+            if (addr.contains("/")) {
                val arr = addr.split("/")
-                if (arr.count() == 2 && Integer.parseInt(arr[1]) > -1) {
+                if (arr.size == 2 && arr[1].toIntOrNull() != null && arr[1].toInt() > -1) {
                    addr = arr[0]
                }
            }

-            // "::ffff:192.168.173.22"
-            // "[::ffff:192.168.173.22]:80"
+            // Handle IPv4-mapped IPv6 addresses
            if (addr.startsWith("::ffff:") && '.' in addr) {
                addr = addr.drop(7)
            } else if (addr.startsWith("[::ffff:") && '.' in addr) {
                addr = addr.drop(8).replace("]", "")
            }

-            // addr = addr.toLowerCase()
-            val octets = addr.split('.').toTypedArray()
+            val octets = addr.split('.')
            if (octets.size == 4) {
-                if (octets[3].indexOf(":") > 0) {
+                if (octets[3].contains(":")) {
                    addr = addr.substring(0, addr.indexOf(":"))
                }
                return isIpv4Address(addr)
            }

-            // Ipv6addr [2001:abc::123]:8080
            return isIpv6Address(addr)
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to validate IP address", e)
            return false
        }
    }
@@ -217,9 +205,7 @@ object Utils {
     * @return True if the string is a valid IPv4 address, false otherwise.
     */
    private fun isIpv4Address(value: String): Boolean {
-        val regV4 =
-            Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
-        return regV4.matches(value)
+        return IPV4_REGEX.matches(value)
    }

    /**
@@ -230,13 +216,10 @@ object Utils {
     */
    private fun isIpv6Address(value: String): Boolean {
        var addr = value
-        if (addr.indexOf("[") == 0 && addr.lastIndexOf("]") > 0) {
-            addr = addr.drop(1)
-            addr = addr.dropLast(addr.count() - addr.lastIndexOf("]"))
+        if (addr.startsWith("[") && addr.endsWith("]")) {
+            addr = addr.drop(1).dropLast(1)
        }
-        val regV6 =
-            Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$")
-        return regV6.matches(addr)
+        return IPV6_REGEX.matches(addr)
    }

    /**
@@ -246,10 +229,10 @@ object Utils {
     * @return True if the string is a CoreDNS address, false otherwise.
     */
    fun isCoreDNSAddress(s: String): Boolean {
-        return s.startsWith("https")
-                || s.startsWith("tcp")
-                || s.startsWith("quic")
-                || s == "localhost"
+        return s.startsWith("https") ||
+                s.startsWith("tcp") ||
+                s.startsWith("quic") ||
+                s == "localhost"
    }

    /**
@@ -259,21 +242,16 @@ object Utils {
     * @return True if the string is a valid URL, false otherwise.
     */
    fun isValidUrl(value: String?): Boolean {
-        try {
-            if (value.isNullOrEmpty()) {
-                return false
-            }
-            if (Patterns.WEB_URL.matcher(value).matches()
-                || Patterns.DOMAIN_NAME.matcher(value).matches()
-                || URLUtil.isValidUrl(value)
-            ) {
-                return true
-            }
+        if (value.isNullOrEmpty()) return false
+
+        return try {
+            Patterns.WEB_URL.matcher(value).matches() ||
+                    Patterns.DOMAIN_NAME.matcher(value).matches() ||
+                    URLUtil.isValidUrl(value)
        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
+            Log.e(AppConfig.TAG, "Failed to validate URL", e)
+            false
        }
-        return false
    }

    /**
@@ -283,8 +261,12 @@ object Utils {
     * @param uriString The URI string to open.
     */
    fun openUri(context: Context, uriString: String) {
-        val uri = uriString.toUri()
-        context.startActivity(Intent(Intent.ACTION_VIEW, uri))
+        try {
+            val uri = uriString.toUri()
+            context.startActivity(Intent(Intent.ACTION_VIEW, uri))
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to open URI", e)
+        }
    }

    /**
@@ -296,7 +278,7 @@ object Utils {
        return try {
            UUID.randomUUID().toString().replace("-", "")
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to generate UUID", e)
            ""
        }
    }
@@ -311,7 +293,7 @@ object Utils {
        return try {
            URLDecoder.decode(url, Charsets.UTF_8.toString())
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to decode URL", e)
            url
        }
    }
@@ -326,7 +308,7 @@ object Utils {
        return try {
            URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20")
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to encode URL", e)
            url
        }
    }
@@ -339,13 +321,18 @@ object Utils {
     * @return The content of the asset file as a string.
     */
    fun readTextFromAssets(context: Context?, fileName: String): String {
-        if (context == null) {
-            return ""
+        if (context == null) return ""
+
+        return try {
+            context.assets.open(fileName).use { inputStream ->
+                inputStream.bufferedReader().use { reader ->
+                    reader.readText()
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to read asset file: $fileName", e)
+            ""
        }
-        val content = context.assets.open(fileName).bufferedReader().use {
-            it.readText()
-        }
-        return content
    }

    /**
@@ -355,11 +342,15 @@ object Utils {
     * @return The path to the user asset directory.
     */
    fun userAssetPath(context: Context?): String {
-        if (context == null)
-            return ""
-        val extDir = context.getExternalFilesDir(AppConfig.DIR_ASSETS)
-            ?: return context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath
-        return extDir.absolutePath
+        if (context == null) return ""
+
+        return try {
+            context.getExternalFilesDir(AppConfig.DIR_ASSETS)?.absolutePath
+                ?: context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to get user asset path", e)
+            ""
+        }
    }

    /**
@@ -369,11 +360,15 @@ object Utils {
     * @return The path to the backup directory.
     */
    fun backupPath(context: Context?): String {
-        if (context == null)
-            return ""
-        val extDir = context.getExternalFilesDir(AppConfig.DIR_BACKUPS)
-            ?: return context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath
-        return extDir.absolutePath
+        if (context == null) return ""
+
+        return try {
+            context.getExternalFilesDir(AppConfig.DIR_BACKUPS)?.absolutePath
+                ?: context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to get backup path", e)
+            ""
+        }
    }

    /**
@@ -382,8 +377,13 @@ object Utils {
     * @return The device ID for XUDP base key.
     */
    fun getDeviceIdForXUDPBaseKey(): String {
-        val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
-        return Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
+        return try {
+            val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
+            Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to generate device ID", e)
+            ""
+        }
    }

    /**
@@ -403,11 +403,10 @@ object Utils {
     * @return The formatted IPv6 address, or the original address if not valid.
     */
    fun getIpv6Address(address: String?): String {
-        if (address == null) {
-            return ""
-        }
+        if (address.isNullOrEmpty()) return ""
+
        return if (isIpv6Address(address) && !address.contains('[') && !address.contains(']')) {
-            String.format("[%s]", address)
+            "[$address]"
        } else {
            address
        }
@@ -431,8 +430,7 @@ object Utils {
     * @return The URL string with illegal characters replaced.
     */
    fun fixIllegalUrl(str: String): String {
-        return str
-            .replace(" ", "%20")
+        return str.replace(" ", "%20")
            .replace("|", "%7C")
    }

@@ -463,12 +461,23 @@ object Utils {
     * @return True if the string is a valid subscription URL, false otherwise.
     */
    fun isValidSubUrl(value: String?): Boolean {
+        if (value.isNullOrEmpty()) return false
+
        try {
-            if (value.isNullOrEmpty()) return false
            if (URLUtil.isHttpsUrl(value)) return true
-            if (URLUtil.isHttpUrl(value) && value.contains(LOOPBACK)) return true
+            if (URLUtil.isHttpUrl(value)) {
+                if (value.contains(LOOPBACK)) return true
+
+                //Check private ip address
+                val uri = URI(fixIllegalUrl(value))
+                if (isIpAddress(uri.host)) {
+                    AppConfig.PRIVATE_IP_LIST.forEach {
+                        if (isIpInCidr(uri.host, it)) return true
+                    }
+                }
+            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to validate subscription URL", e)
        }
        return false
    }
@@ -489,7 +498,58 @@ object Utils {
     *
     * @return True if the package is Xray, false otherwise.
     */
-    fun isXray(): Boolean = (ANG_PACKAGE.startsWith("com.v2ray.ang"))
+    fun isXray(): Boolean = BuildConfig.APPLICATION_ID.startsWith("com.v2ray.ang")

+    /**
+     * Check if it is the Google Play version.
+     *
+     * @return True if the package is Google Play, false otherwise.
+     */
+    fun isGoogleFlavor(): Boolean = BuildConfig.FLAVOR == "playstore"
+
+    /**
+     * Converts an InetAddress to its long representation
+     *
+     * @param ip The InetAddress to convert
+     * @return The long representation of the IP address
+     */
+    private fun inetAddressToLong(ip: InetAddress): Long {
+        val bytes = ip.address
+        var result: Long = 0
+        for (i in bytes.indices) {
+            result = result shl 8 or (bytes[i].toInt() and 0xff).toLong()
+        }
+        return result
+    }
+
+    /**
+     * Check if an IP address is within a CIDR range
+     *
+     * @param ip The IP address to check
+     * @param cidr The CIDR notation range (e.g., "192.168.1.0/24")
+     * @return True if the IP is within the CIDR range, false otherwise
+     */
+    fun isIpInCidr(ip: String, cidr: String): Boolean {
+        try {
+            if (!isIpAddress(ip)) return false
+
+            // Parse CIDR (e.g., "192.168.1.0/24")
+            val (cidrIp, prefixLen) = cidr.split("/")
+            val prefixLength = prefixLen.toInt()
+
+            // Convert IP and CIDR's IP portion to Long
+            val ipLong = inetAddressToLong(InetAddress.getByName(ip))
+            val cidrIpLong = inetAddressToLong(InetAddress.getByName(cidrIp))
+
+            // Calculate subnet mask (e.g., /24 → 0xFFFFFF00)
+            val mask = if (prefixLength == 0) 0L else (-1L shl (32 - prefixLength))
+
+            // Check if they're in the same subnet
+            return (ipLong and mask) == (cidrIpLong and mask)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to check if IP is in CIDR", e)
+            return false
+        }
+    }
 }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt
@@ -1,5 +1,7 @@
 package com.v2ray.ang.util

+import android.util.Log
+import com.v2ray.ang.AppConfig
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileInputStream
@@ -61,7 +63,7 @@ object ZipUtil {
            zos.closeEntry()
            zos.close()
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to zip folder", e)
            return false
        }
        return true
@@ -97,7 +99,7 @@ object ZipUtil {
                }
            }
        } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to unzip file", e)
            return false
        }
        return true
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
@@ -13,7 +13,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServersCache
@@ -63,7 +62,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        getApplication<AngApplication>().unregisterReceiver(mMsgReceiver)
        tcpingTestScope.coroutineContext[Job]?.cancelChildren()
        SpeedtestManager.closeAllTcpSockets()
-        Log.i(ANG_PACKAGE, "Main ViewModel is cleared")
+        Log.i(AppConfig.TAG, "Main ViewModel is cleared")
        super.onCleared()
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
@@ -26,7 +26,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
    override fun onCleared() {
        PreferenceManager.getDefaultSharedPreferences(getApplication())
            .unregisterOnSharedPreferenceChangeListener(this)
-        Log.i(AppConfig.ANG_PACKAGE, "Settings ViewModel is cleared")
+        Log.i(AppConfig.TAG, "Settings ViewModel is cleared")
        super.onCleared()
    }

@@ -36,7 +36,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
     * @param key The key of the changed preference.
     */
    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        Log.d(AppConfig.ANG_PACKAGE, "Observe settings changed: $key")
+        Log.i(AppConfig.TAG, "Observe settings changed: $key")
        when (key) {
            AppConfig.PREF_MODE,
            AppConfig.PREF_VPN_DNS,
--- a/V2rayNG/app/src/main/res/drawable-night/ic_check_update_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable-night/ic_check_update_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1c-2.73,2.71 -2.73,7.08 0,9.79s7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29c-3.51,3.48 -9.21,3.48 -12.72,0c-3.5,-3.47 -3.53,-9.11 -0.02,-12.58s9.14,-3.47 12.65,0L21,3V10.12zM12.5,8v4.25l3.5,2.08l-0.72,1.21L11,13V8H12.5z" />
+
+</vector>
--- a/V2rayNG/app/src/main/res/drawable/ic_check_update_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_check_update_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24"
+android:viewportHeight="24">
+
+<path
+    android:fillColor="#FF000000"
+    android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1c-2.73,2.71 -2.73,7.08 0,9.79s7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29c-3.51,3.48 -9.21,3.48 -12.72,0c-3.5,-3.47 -3.53,-9.11 -0.02,-12.58s9.14,-3.47 12.65,0L21,3V10.12zM12.5,8v4.25l3.5,2.08l-0.72,1.21L11,13V8H12.5z" />
+
+</vector>
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -5,7 +5,8 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.PerAppProxyActivity">

    <com.google.android.material.progressindicator.LinearProgressIndicator
        android:id="@+id/pb_waiting"
@@ -71,6 +72,23 @@
                        android:textColor="@color/colorAccent"
                        app:theme="@style/BrandedSwitch" />

+                    <LinearLayout
+                        android:id="@+id/layout_switch_bypass_apps_tips"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center"
+                        android:padding="@dimen/padding_spacing_dp8">
+
+                        <ImageView
+                            android:layout_width="@dimen/image_size_dp24"
+                            android:layout_height="@dimen/image_size_dp24"
+                            app:srcCompat="@drawable/ic_about_24dp" />
+
+                    </LinearLayout>
+
                </LinearLayout>
            </LinearLayout>

@@ -83,7 +101,6 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:scrollbars="vertical"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        tools:context=".ui.PerAppProxyActivity" />
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" />

 </LinearLayout>
--- a/V2rayNG/app/src/main/res/layout/activity_check_update.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_check_update.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center|start"
+            android:orientation="horizontal"
+            android:padding="@dimen/padding_spacing_dp16">
+
+            <ImageView
+                android:layout_width="@dimen/image_size_dp24"
+                android:layout_height="@dimen/image_size_dp24"
+                app:srcCompat="@drawable/ic_source_code_24dp" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/check_pre_release"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:paddingStart="@dimen/padding_spacing_dp16"
+                android:text="@string/update_check_pre_release"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="@color/colorAccent"
+                app:theme="@style/BrandedSwitch" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/layout_check_update"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:gravity="center|start"
+            android:orientation="horizontal"
+            android:padding="@dimen/padding_spacing_dp16">
+
+            <ImageView
+                android:layout_width="@dimen/image_size_dp24"
+                android:layout_height="@dimen/image_size_dp24"
+                app:srcCompat="@drawable/ic_check_update_24dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="@dimen/padding_spacing_dp16"
+                android:text="@string/update_check_for_update"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="@dimen/padding_spacing_dp16">
+
+            <TextView
+                android:id="@+id/tv_version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_about"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
+
--- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
@@ -5,7 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
-    tools:context=".ui.SubSettingActivity">
+    tools:context=".ui.RoutingEditActivity">

    <LinearLayout
        android:layout_width="match_parent"
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -18,30 +18,35 @@
            android:orientation="vertical">

            <LinearLayout
+                android:id="@+id/layout_domain_strategy"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/padding_spacing_dp8"
-                android:orientation="vertical">
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center|start"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_spacing_dp16">

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:text="@string/routing_settings_domain_strategy" />
+                    android:text="@string/routing_settings_domain_strategy"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />

-                <Spinner
-                    android:id="@+id/sp_domain_strategy"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/tv_domain_strategy_summary"
+                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginTop="@dimen/padding_spacing_dp8"
-                    android:layout_marginBottom="@dimen/padding_spacing_dp8"
-                    android:entries="@array/routing_domain_strategy"
-                    android:paddingTop="@dimen/padding_spacing_dp8" />
+                    android:maxLines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/padding_spacing_dp8"
+                android:layout_margin="@dimen/padding_spacing_dp16"
                android:orientation="vertical">

                <TextView
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -5,7 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
-    tools:context=".ui.SubSettingActivity">
+    tools:context=".ui.SubEditActivity">

    <LinearLayout
        android:layout_width="match_parent"
@@ -26,7 +26,7 @@
                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:text="@string/title_server"
+                    android:text="@string/title_sub_setting"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>

@@ -138,6 +138,28 @@

            </LinearLayout>

+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:text="@string/sub_allow_insecure_url" />
+
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/allow_insecure_url"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
+                    android:paddingEnd="@dimen/padding_spacing_dp16"
+                    app:theme="@style/BrandedSwitch" />
+
+            </LinearLayout>
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
--- a/V2rayNG/app/src/main/res/layout/activity_user_asset.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_user_asset.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.UserAssetActivity">
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/pb_waiting"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="invisible"
+        app:indicatorColor="@color/color_fab_active" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/main_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/layout_geo_files_sources"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center|start"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_spacing_dp16">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/asset_geo_files_sources"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                <TextView
+                    android:id="@+id/tv_geo_files_sources_summary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/padding_spacing_dp8"
+                    android:maxLines="2"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+            </LinearLayout>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/padding_spacing_dp16"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/title_user_asset_setting"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:nestedScrollingEnabled="false"
+                tools:listitem="@layout/item_recycler_user_asset" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+
+</RelativeLayout>
--- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -15,97 +15,144 @@
        android:clickable="true"
        android:focusable="true"
        android:gravity="center"
-        android:nextFocusRight="@+id/layout_edit"
+        android:nextFocusRight="@+id/layout_share"
        android:orientation="horizontal"
        android:padding="@dimen/padding_spacing_dp8">

        <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_spacing_dp8">
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
-            <TextView
-                android:id="@+id/tv_url"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:lines="2"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:padding="@dimen/padding_spacing_dp8">
+            android:orientation="vertical">

            <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:gravity="center"
                android:orientation="horizontal">

                <LinearLayout
-                    android:id="@+id/layout_share"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:gravity="center"
+                    android:layout_weight="1"
                    android:orientation="vertical"
-                    android:padding="@dimen/padding_spacing_dp8">
+                    android:paddingStart="@dimen/padding_spacing_dp8">

-                    <ImageView
-                        android:layout_width="@dimen/image_size_dp24"
-                        android:layout_height="@dimen/image_size_dp24"
-                        app:srcCompat="@drawable/ic_share_24dp" />
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="2"
+                        android:minLines="1"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />

                </LinearLayout>

                <LinearLayout
-                    android:id="@+id/layout_edit"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
                    android:gravity="center"
-                    android:nextFocusLeft="@+id/info_container"
-                    android:orientation="vertical"
-                    android:padding="@dimen/padding_spacing_dp8">
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:id="@+id/layout_share"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center"
+                        android:nextFocusLeft="@+id/info_container"
+                        android:orientation="vertical"
+                        android:padding="@dimen/padding_spacing_dp8">
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/image_size_dp24"
+                            app:srcCompat="@drawable/ic_share_24dp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/layout_edit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:padding="@dimen/padding_spacing_dp8">
+
+                        <ImageView
+                            android:layout_width="@dimen/image_size_dp24"
+                            android:layout_height="@dimen/image_size_dp24"
+                            app:srcCompat="@drawable/ic_edit_24dp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/layout_remove"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:padding="@dimen/padding_spacing_dp8">
+
+                        <ImageView
+                            android:layout_width="@dimen/image_size_dp24"
+                            android:layout_height="@dimen/image_size_dp24"
+                            app:srcCompat="@drawable/ic_delete_24dp" />
+
+                    </LinearLayout>

-                    <ImageView
-                        android:layout_width="@dimen/image_size_dp24"
-                        android:layout_height="@dimen/image_size_dp24"
-                        app:srcCompat="@drawable/ic_edit_24dp" />

                </LinearLayout>
+
            </LinearLayout>

            <LinearLayout
-                android:layout_width="wrap_content"
+                android:id="@+id/layout_url"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/padding_spacing_dp8"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/padding_spacing_dp8"
+                android:paddingEnd="@dimen/padding_spacing_dp8">

-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/chk_enable"
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"
+                    android:paddingTop="@dimen/padding_spacing_dp8">
+
+                    <TextView
+                        android:id="@+id/tv_url"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:lines="2"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                </LinearLayout>
+
+                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    app:theme="@style/BrandedSwitch" />
+                    android:layout_marginTop="@dimen/padding_spacing_dp8"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:id="@+id/chk_enable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:theme="@style/BrandedSwitch" />
+                </LinearLayout>
+
            </LinearLayout>
+
        </LinearLayout>
+
    </LinearLayout>

-</LinearLayout>
+</LinearLayout>
--- a/V2rayNG/app/src/main/res/menu/menu_drawer.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
@@ -35,6 +35,10 @@
            android:id="@+id/logcat"
            android:icon="@drawable/ic_logcat_24dp"
            android:title="@string/title_logcat" />
+        <item
+            android:id="@+id/check_for_update"
+            android:icon="@drawable/ic_check_update_24dp"
+            android:title="@string/update_check_for_update" />
        <item
            android:id="@+id/about"
            android:icon="@drawable/ic_about_24dp"
--- a/V2rayNG/app/src/main/res/menu/menu_main.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_main.xml
@@ -56,29 +56,6 @@
                android:id="@+id/import_manually_hysteria2"
                android:title="@string/menu_item_import_config_manually_hysteria2"
                app:showAsAction="never" />
-
-            <!--            <item-->
-            <!--                android:title="@string/menu_item_import_config_custom"-->
-            <!--                app:showAsAction="ifRoom">-->
-            <!--                <menu>-->
-            <!--                    <item-->
-            <!--                        android:id="@+id/import_config_custom_clipboard"-->
-            <!--                        android:title="@string/menu_item_import_config_custom_clipboard"-->
-            <!--                        app:showAsAction="never" />-->
-            <!--                    <item-->
-            <!--                        android:id="@+id/import_config_custom_local"-->
-            <!--                        android:title="@string/menu_item_import_config_custom_local"-->
-            <!--                        app:showAsAction="never" />-->
-            <!--                    <item-->
-            <!--                        android:id="@+id/import_config_custom_url"-->
-            <!--                        android:title="@string/menu_item_import_config_custom_url"-->
-            <!--                        app:showAsAction="never" />-->
-            <!--                    <item-->
-            <!--                        android:id="@+id/import_config_custom_url_scan"-->
-            <!--                        android:title="@string/menu_item_import_config_custom_url_scan"-->
-            <!--                        app:showAsAction="never" />-->
-            <!--                </menu>-->
-            <!--            </item>-->
        </menu>
    </item>
    <item
--- a/V2rayNG/app/src/main/res/values-ar/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ar/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">الكتابة يدويًا [Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">الكتابة يدويًا [Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
-    <string name="menu_item_import_config_custom">تكوين مخصص</string>
-    <string name="menu_item_import_config_custom_clipboard">استيراد تكوين مخصص من الحافظة</string>
-    <string name="menu_item_import_config_custom_local">استيراد تكوين مخصص من الجهاز</string>
-    <string name="menu_item_import_config_custom_url">استيراد تكوين مخصص من عنوان URL</string>
-    <string name="menu_item_import_config_custom_url_scan">استيراد تكوين مخصص مسح عنوان URL</string>
    <string name="del_config_comfirm">تأكيد الحذف؟</string>
    <string name="del_invalid_config_comfirm">Please test before deleting! Confirm delete ?</string>
    <string name="server_lab_remarks">ملاحظات</string>
@@ -127,6 +122,7 @@
    <string name="title_user_asset_add_url">إضافة عنوان URL للأصل</string>
    <string name="msg_file_not_found">الملف غير موجود</string>
    <string name="msg_remark_is_duplicate">الملاحظات موجودة بالفعل</string>
+    <string name="asset_geo_files_sources">Geo files source (optional)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">جار التحميل</string>
@@ -262,9 +258,10 @@
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">تفعيل التحديث</string>
    <string name="sub_auto_update">تفعيل التحديث التلقائي</string>
-    <string name="sub_setting_pre_profile">Previous proxy remarks</string>
-    <string name="sub_setting_next_profile">Next proxy remarks</string>
-    <string name="sub_setting_pre_profile_tip">The remarks exists and is unique</string>
+    <string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
+    <string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
+    <string name="sub_setting_next_profile">Next proxy configuration remarks</string>
+    <string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
    <string name="title_sub_update">تحديث الاشتراك (أول خطوة)</string>
    <string name="title_ping_all_server">Tcping لجميع الإعدادات</string>
    <string name="title_real_ping_all_server"> اختبر جميع الإعدادات (3)</string>
@@ -314,6 +311,13 @@
    <string name="title_pref_fragment_interval">فاصل الجزء (الحد الأدنى - الحد الأقصى)</string>
    <string name="title_pref_fragment_enabled">تفعيل الجزء</string>

+    <string name="update_check_for_update">Check for update</string>
+    <string name="update_already_latest_version">Already on the latest version</string>
+    <string name="update_new_version_found">New version found: %s</string>
+    <string name="update_now">Update now</string>
+    <string name="update_check_pre_release">Check Pre-release</string>
+    <string name="update_checking_for_update">Checking for update…</string>
+
    <string-array name="share_method">
        <item>رمز استجابة سريعة (QRcode)</item>
        <item>تصدير إلى الحافظة</item>
--- a/V2rayNG/app/src/main/res/values-bn/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bn/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">ম্যানুয়ালি টাইপ করুন [Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">ম্যানুয়ালি টাইপ করুন [Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
-    <string name="menu_item_import_config_custom">কাস্টম কনফিগারেশন</string>
-    <string name="menu_item_import_config_custom_clipboard">ক্লিপবোর্ড থেকে কাস্টম কনফিগারেশন আমদানি করুন</string>
-    <string name="menu_item_import_config_custom_local">স্থানীয়ভাবে কাস্টম কনফিগারেশন আমদানি করুন</string>
-    <string name="menu_item_import_config_custom_url">URL থেকে কাস্টম কনফিগারেশন আমদানি করুন</string>
-    <string name="menu_item_import_config_custom_url_scan">কাস্টম কনফিগারেশন স্ক্যান URL আমদানি করুন</string>
    <string name="del_config_comfirm">মুছে ফেলুন নিশ্চিত করুন？</string>
    <string name="del_invalid_config_comfirm">Please test before deleting! Confirm delete ?</string>
    <string name="server_lab_remarks">মন্তব্য</string>
@@ -126,6 +121,7 @@
    <string name="title_user_asset_add_url">অ্যাসেট URL যোগ করুন</string>
    <string name="msg_file_not_found">ফাইল খুঁজে পাওয়া যায়নি</string>
    <string name="msg_remark_is_duplicate">মন্তব্য ইতিমধ্যে বিদ্যমান</string>
+    <string name="asset_geo_files_sources">Geo files source (optional)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">লোড হচ্ছে</string>
@@ -262,9 +258,10 @@
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">আপডেট সক্রিয় করুন</string>
    <string name="sub_auto_update">স্বয়ংক্রিয় আপডেট সক্রিয় করুন</string>
-    <string name="sub_setting_pre_profile">Previous proxy remarks</string>
-    <string name="sub_setting_next_profile">Next proxy remarks</string>
-    <string name="sub_setting_pre_profile_tip">The remarks exists and is unique</string>
+    <string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
+    <string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
+    <string name="sub_setting_next_profile">Next proxy configuration remarks</string>
+    <string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
    <string name="title_sub_update">সাবস্ক্রিপশন আপডেট</string>
    <string name="title_ping_all_server">সব কনফিগারেশন TCPing</string>
    <string name="title_real_ping_all_server">সব কনফিগারেশন প্রকৃত বিলম্ব</string>
@@ -313,6 +310,13 @@
    <string name="title_pref_fragment_interval">ফ্র্যাগমেন্ট ইন্টারভ্যাল (ন্যূনতম-সর্বাধিক)</string>
    <string name="title_pref_fragment_enabled">ফ্র্যাগমেন্ট সক্রিয় করুন</string>

+    <string name="update_check_for_update">Check for update</string>
+    <string name="update_already_latest_version">Already on the latest version</string>
+    <string name="update_new_version_found">New version found: %s</string>
+    <string name="update_now">Update now</string>
+    <string name="update_check_pre_release">Check Pre-release</string>
+    <string name="update_checking_for_update">Checking for update…</string>
+
    <string-array name="share_method">
        <item>QR কোড</item>
        <item>ক্লিপবোর্ডে রপ্তানি করুন</item>
--- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
@@ -7,9 +7,9 @@
    <string name="navigation_drawer_close">بستن نومگه کشاری</string>
    <string name="migration_success">مووفقیت من جاگورویی داده</string>
    <string name="migration_fail">جاگورویی داده ٱنجوم نگرؽڌ</string>
-    <string name="pull_down_to_refresh">Please pull down to refresh!</string>
+    <string name="pull_down_to_refresh">سی وانۊ کردن، بکشینس بلم!</string>

-    <!-- Notifications -->
+    <!-- Notifications -->↓
    <string name="notification_action_stop_v2ray">واڌاشتن</string>
    <string name="toast_permission_denied">گرؽڌن موجوز مومکن نؽڌ</string>
    <string name="toast_permission_denied_notification">گرؽڌن موجوز وارسۊوی مومکن نؽڌ</string>
@@ -26,7 +26,7 @@
    <string name="menu_item_del_config">پاک کردن کانفیگ</string>
    <string name="menu_item_import_config_qrcode">و من ٱووردن کانفیگ ز QRcode</string>
    <string name="menu_item_import_config_clipboard">و من ٱووردن کانفیگ ز کلیپ بورد</string>
-    <string name="menu_item_import_config_local">Import config from locally</string>
+    <string name="menu_item_import_config_local">و من ٱووردن کانفیگ ز مهلی</string>
    <string name="menu_item_import_config_manually_vmess">هؽل دستی[VMess]</string>
    <string name="menu_item_import_config_manually_vless">هؽل دستی[VLESS]</string>
    <string name="menu_item_import_config_manually_ss">هؽل دستی[Shadowsocks]</string>
@@ -35,17 +35,12 @@
    <string name="menu_item_import_config_manually_trojan">هؽل دستی[Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">هؽل دستی[Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">هؽل دستی[Hysteria2]</string>
-    <string name="menu_item_import_config_custom">کانفیگ سفارشی</string>
-    <string name="menu_item_import_config_custom_clipboard">کانفیگ سفارشین ز کلیپ بورد و من بیار</string>
-    <string name="menu_item_import_config_custom_local">کانفیگ سفارشین ز مهلی و من بیار</string>
-    <string name="menu_item_import_config_custom_url">کانفیگ سفارشین ز آدرس اینترنتی و من بیار</string>
-    <string name="menu_item_import_config_custom_url_scan">نشۊوی اینترنتی اسکن کانفیگ سفارشین بزݩ</string>
    <string name="del_config_comfirm">پاک بۊ؟</string>
    <string name="del_invalid_config_comfirm">پؽش ز پاک کردن کانفیگ نا موئتبر واجۊری کوݩ! پاک کردن کانفیگن قوۊل اکۊنی؟</string>
    <string name="server_lab_remarks">نیشتنا</string>
-    <string name="server_lab_address">آدرس</string>
+    <string name="server_lab_address">نشۊوی</string>
    <string name="server_lab_port">پورت</string>
-    <string name="server_lab_id">نوم من توری</string>
+    <string name="server_lab_id">نوم منتوری</string>
    <string name="server_lab_alterid">شناسه جایگۊزین</string>
    <string name="server_lab_security">ٱمنیت</string>
    <string name="server_lab_network">شبکه</string>
@@ -73,21 +68,21 @@
    <string name="server_lab_stream_alpn">Alpn</string>
    <string name="server_lab_allow_insecure">اجازه نا ٱمن</string>
    <string name="server_lab_sni">SNI</string>
-    <string name="server_lab_address3">آدرس</string>
+    <string name="server_lab_address3">نشۊوی</string>
    <string name="server_lab_port3">پورت</string>
    <string name="server_lab_id3">رزم</string>
    <string name="server_lab_security3">ٱمنیت</string>
    <string name="server_lab_id4">رزم (اختیاری)</string>
-    <string name="server_lab_security4">نوم من توری (اختیاری)</string>
+    <string name="server_lab_security4">نوم منتوری (اختیاری)</string>
    <string name="server_lab_encryption">رزم نگاری</string>
    <string name="server_lab_flow">جریان</string>
    <string name="server_lab_public_key">کیلیت پوی وولاتی</string>
-    <string name="server_lab_preshared_key">کیلیت رمز ناهاڌن ازاف (اختیاری)</string>
+    <string name="server_lab_preshared_key">کیلیت رزم ناهاڌن ازاف (اختیاری)</string>
    <string name="server_lab_short_id">ShortID</string>
    <string name="server_lab_spider_x">SpiderX</string>
    <string name="server_lab_secret_key">کیلیت سیخومی</string>
    <string name="server_lab_reserved">Reserved(اختیاری، وا کاما ز یک جوڌا ابۊن)</string>
-    <string name="server_lab_local_address">آدرس مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن)</string>
+    <string name="server_lab_local_address">نشۊوی مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن)</string>
    <string name="server_lab_local_mtu">Mtu(اختیاری، پؽش فرز 1420)</string>
    <string name="toast_success">وا مووفقیت ٱنجوم وابی</string>
    <string name="toast_failure">شکست خرد</string>
@@ -101,11 +96,11 @@
    <string name="server_lab_content">موئتوا</string>
    <string name="toast_none_data_clipboard">هیچ داده ای من کلیپ بورد وۊجۊڌ نڌاره</string>
    <string name="toast_invalid_url">نشۊوی اینترنتی نا موئتبر هڌ</string>
-    <string name="toast_insecure_url_protocol">آدرس اشتراک پوروتوکول نا ٱمن HTTP ن و کار مبرین</string>
+    <string name="toast_insecure_url_protocol">نشۊوی اشتراک پوروتوکول نا ٱمن HTTP ن و کار مبرین</string>
    <string name="server_lab_need_inbound">موتمعن بۊین ک پورت وۊرۊڌی وا سامووا ی جۊر هڌ</string>
    <string name="toast_malformed_josn">کانفیگ زبال نؽڌ</string>
    <string name="server_lab_request_host6">هاست(SNI)(اختیاری)</string>
-    <string name="toast_action_not_allowed">ای کار ممنۊ هڌ</string>
+    <string name="toast_action_not_allowed">ای کار ممنۊع هڌ</string>
    <string name="server_obfs_password">رزم obfs</string>
    <string name="server_lab_port_hop">پورت گوم (درگا سرورن ز نۊ هؽل اکونه)</string>
    <string name="server_lab_port_hop_interval">فاسله پورت گوم (سانیه)</string>
@@ -121,24 +116,25 @@
    <string name="menu_item_add_file">ازاف کردن فایل</string>
    <string name="menu_item_add_url">ازاف کردن لینگ</string>
    <string name="menu_item_scan_qrcode">اسکن QRcode</string>
-    <string name="title_url">آدرس اینترنتی</string>
+    <string name="title_url">نشۊوی اینترنتی</string>
    <string name="menu_item_download_file">دانلود فایلا</string>
-    <string name="title_user_asset_add_url">آدرس اینترنتی دارایین ازاف کۊنین</string>
+    <string name="title_user_asset_add_url">نشۊوی اینترنتی دارایین ازاف کۊنین</string>
    <string name="msg_file_not_found">فایلن نجوست</string>
-    <string name="msg_remark_is_duplicate">ائزارات ز زیتر بیڌسۉݩ</string>
+    <string name="msg_remark_is_duplicate">نوم ز زیتر بیڌس</string>
+    <string name="asset_geo_files_sources">بونچک فایلا جوقرافیایی (اختیاری)</string>

    <!-- PerAppProxyActivity -->
-    <string name="msg_dialog_progress">هون بار ونی بۊ</string>
+    <string name="msg_dialog_progress">هونی بار ونی بۊ</string>
    <string name="menu_item_search">پیتینیڌن</string>
    <string name="menu_item_select_all">پسند پوی</string>
-    <string name="msg_enter_keywords">رزمان بزنین</string>
+    <string name="msg_enter_keywords">رزما ن بزنین</string>
    <string name="switch_bypass_apps_mode">هالت Bypass</string>
    <string name="menu_item_select_proxy_app">پسند خوتکار پروکسی برنومه</string>
    <string name="msg_downloading_content">موئتوا هونی دانلود ابۊن</string>
    <string name="menu_item_export_proxy_app">و در کشیڌن من کلیپ بورد</string>
    <string name="menu_item_import_proxy_app">و من ٱووردن ز کلیپ بورد</string>
-    <string name="per_app_proxy_settings">Per-app settings</string>
-    <string name="per_app_proxy_settings_enable">Enable per-app</string>
+    <string name="per_app_proxy_settings">سامووا ب تفکیک برنومه</string>
+    <string name="per_app_proxy_settings_enable">ر وندن ب تفکیک برنومه</string>


    <!-- Preferences -->
@@ -152,10 +148,10 @@

    <string name="title_mux_settings">سامووا Mux</string>
    <string name="title_pref_mux_enabled">ر وندن Mux</string>
-    <string name="summary_pref_mux_enabled">زل تر، ٱما گاشڌ منپیز زی قت بۊ بارت دؽوۉداری، TCP، UDP و QUIC ن ای لم سفارشی کۊنین.</string>
+    <string name="summary_pref_mux_enabled">زل تر، ٱما گاشڌ منپیز زی قت بۊ\nمخزن ترافیک TCP وا 8 منپیز پؽش فرز، بارت دؽوۉداری UDP وو QUIC ن ای لم سفارشی کۊنین.</string>
    <string name="title_pref_mux_concurency">منپیزا TCP (تلایه منجا 1-1024)</string>
    <string name="title_pref_mux_xudp_concurency">منپیزا XUDP (تلایه منجا 1-1024)</string>
-    <string name="title_pref_mux_xudp_quic">دؽوۉداری QUIC من تونل mux</string>
+    <string name="title_pref_mux_xudp_quic">دؽوۉداری QUIC من تۊنل mux</string>
    <string-array name="mux_xudp_quic_entries">
        <item>رڌ کردن</item>
        <item>موجاز</item>
@@ -168,16 +164,16 @@
    <string name="title_pref_sniffing_enabled">ر وندن Sniffing</string>
    <string name="summary_pref_sniffing_enabled">دامنه sniff ن ز کتن امتهۉݩ کۊنین (پؽش فرز رۊشن)</string>
    <string name="title_pref_route_only_enabled">ر وندن routeOnly</string>
-    <string name="summary_pref_route_only_enabled">ز نوم دامنه sniffed تینا سی تور جوستن استفاڌه کۊنین وو آدرس مورد نزرن و عونوان آدرس IP ووردارین.</string>
+    <string name="summary_pref_route_only_enabled">ز نوم دامنه sniffed تینا سی تور جوستن استفاڌه کۊنین وو نشۊوی مۉرد نزرن و عونوان نشۊوی IP ووردارین.</string>

    <string name="title_pref_local_dns_enabled">ر وندن DNS مهلی</string>
    <string name="summary_pref_local_dns_enabled">DNS پردازشت وابیڌه و دس هسته ماژول DNS (پؽشنهاڌ ابۊ، ٱر نیاز هڌ ک جوستن تور وو ولات ٱسلین دور زنی)</string>

    <string name="title_pref_fake_dns_enabled">ر وندن DNS جئلی</string>
-    <string name="summary_pref_fake_dns_enabled">DNS مهلی آدرسا IP جئلی ن وورگنه (زل تر، ٱما گاشڌ من یقرد ز برنومیل کار نکونه)</string>
+    <string name="summary_pref_fake_dns_enabled">DNS مهلی نشۊویا IP جئلی ن وورگنه (زل تر، ٱما گاشڌ من یقرد ز برنومه یل کار نکونه)</string>

    <string name="title_pref_prefer_ipv6">ترجی IPv6</string>
-    <string name="summary_pref_prefer_ipv6">ترجی داڌن نشۊوی وو تورا IPv6</string>
+    <string name="summary_pref_prefer_ipv6">تورا IPv6 ن فعال کۊنین وو نشۊویا IPv6 ن ترجی بڌین</string>

    <string name="title_pref_remote_dns">DNS ز ر دیر (اختیاری) (udp/tcp/https/quic) (اختیاری)</string>
    <string name="summary_pref_remote_dns">DNS</string>
@@ -188,14 +184,14 @@
    <string name="title_pref_domestic_dns">DNS منی (اختیاری)</string>
    <string name="summary_pref_domestic_dns">DNS</string>

-    <string name="title_pref_dns_hosts">DNS هاست موستقیم (قالوو: دامنه: آدرس،...)</string>
-    <string name="summary_pref_dns_hosts">دامنه:آدرس،...</string>
+    <string name="title_pref_dns_hosts">DNS هاست موستقیم (قالوو: دامنه: نشۊوی،...)</string>
+    <string name="summary_pref_dns_hosts">دامنه:نشۊوی،...</string>

-    <string name="title_pref_delay_test_url">آدرس اینترنتی آزمایش تئخیر واقعی (http/https)</string>
+    <string name="title_pref_delay_test_url">نشۊوی اینترنتی آزمایش تئخیر واقعی (http/https)</string>
    <string name="summary_pref_delay_test_url">نشۊوی اینترنتی</string>

    <string name="title_pref_proxy_sharing_enabled">هشتن منپیزا ز شبکه مهلی</string>
-    <string name="summary_pref_proxy_sharing_enabled">پوی دسگایل ترن وا آدرس IP ایسا، ز ر socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز غیر موجاز جلو گری بۊ.</string>
+    <string name="summary_pref_proxy_sharing_enabled">پوی دسگایل ترن وا نشۊوی IP ایسا، ز ر socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز غیر موجاز جلو گری بۊ.</string>
    <string name="toast_warning_pref_proxysharing_short">منپیزا ز شبکه مهلی ن موجار کۊنین، موتمعن بۊین ک من ی شبکه قابل ائتماڌ هڌین.</string>

    <string name="title_pref_allow_insecure">اجازه نا ٱمن</string>
@@ -214,10 +210,10 @@
    <string name="summary_pref_start_scan_immediate">شؽواتگرن سی اسکن، زی مجال ر وندن بۊگۊشین، اندی ترین کودن اسکن کۊنین یا شؽواتی ن منه نوار ٱوزار پسند کۊنین.</string>

    <string name="title_pref_append_http_proxy">پروکسی HTTP ن و VPN ازاف کۊنین</string>
-    <string name="summary_pref_append_http_proxy">پروکسی HTTP ن موسقیمن ز (مۊرۊرگر/ی قرد ز برنومیل لادراری بیڌه)، بؽ استفاڌه ز دسگا NIC مجازی (Android 10+) استفاڌه ابۊ.</string>
+    <string name="summary_pref_append_http_proxy">پروکسی HTTP ن موسقیمن ز (مۊرۊرگر/ی قرد ز برنومه یل لادراری بیڌه)، بؽ استفاڌه ز دسگا NIC مجازی (Android 10+) استفاڌه ابۊ.</string>

-    <string name="title_pref_double_column_display">Enable double column display</string>
-    <string name="summary_pref_double_column_display">The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect.</string>
+    <string name="title_pref_double_column_display">ر وندن نشۉݩ داڌن دو سۊتۊنی</string>
+    <string name="summary_pref_double_column_display">نومگه نمایه یل من دو سۊتۊن نشۉݩ داڌه ابۊن وو چینۉ ترین موئتوا بیشتری ن سیل کۊنین. سی ر وستن وا برنومه ن ز نۊ ر ونین.</string>

    <!-- AboutActivity -->
    <string name="title_pref_feedback">فشناڌن منشڌ</string>
@@ -262,16 +258,17 @@
    <string name="sub_setting_filter">نوم موستعار فیلتر</string>
    <string name="sub_setting_enable">فعال بیڌن ورۊ کردن</string>
    <string name="sub_auto_update">فعال بیڌن ورۊ کردن خوتکار</string>
+    <string name="sub_allow_insecure_url">موجاز کردن نشۊوی HTTP نا ٱمن</string>
    <string name="sub_setting_pre_profile">نوم موستعار پروکسی دیندایی</string>
    <string name="sub_setting_next_profile">نوم موستعار پروکسی نیایی</string>
    <string name="sub_setting_pre_profile_tip">موتمعن بۊ ک نوم موستعار هڌس وو جۊرس نی</string>
    <string name="title_sub_update">ورۊ کردن اشتراک جرگه سکویی</string>
    <string name="title_ping_all_server">Tcping کانفیگا جرگه سکویی</string>
    <string name="title_real_ping_all_server">تئخیر واقعی کانفیگا جرگه سکویی</string>
-    <string name="title_user_asset_setting">Asset files</string>
-    <string name="title_sort_by_test_results">ترتیب و ری نتیجیل آزمایش</string>
+    <string name="title_user_asset_setting">فایلا بونچک جوقرافیایی</string>
+    <string name="title_sort_by_test_results">ترتیب و ری نتیجه یل آزمایش</string>
    <string name="title_filter_config">فیلتر کردن کانفیگا</string>
-    <string name="filter_config_all">پوی جرگیل</string>
+    <string name="filter_config_all">پوی جرگه یل کانفیگ</string>
    <string name="title_del_duplicate_config_count">پاک کردن %d کانفیگ تکراری</string>

    <string name="title_del_config_count">پاک کردن %d کانفیگ</string>
@@ -307,7 +304,7 @@
    <string name="connection_test_pending">منپیزن واجۊری کوݩ</string>
    <string name="connection_test_testing">هونی آزمایش ابۊ…</string>
    <string name="connection_test_testing_count">%d کانفیگ هونی آزمایش ابۊ...</string>
-    <string name="connection_test_available">مووفق بی: منپیز HTTP %dms تۊل کشی</string>
+    <string name="connection_test_available">مووفق بی: منپیز %dms تۊل کشی</string>
    <string name="connection_test_error">منپیز و اینترنتن نجوست: %s</string>
    <string name="connection_test_fail">اینترنت من دسرس نؽ</string>
    <string name="connection_test_error_status_code">کود ختا: #%d</string>
@@ -316,11 +313,18 @@

    <string name="import_subscription_success">اشتراک وا مووفقیت زفت زابی</string>
    <string name="import_subscription_failure">اشتراک زفت نوابی</string>
-    <string name="title_fragment_settings">سامووا Fragment</string>
-    <string name="title_pref_fragment_packets">Fragment Packets</string>
-    <string name="title_pref_fragment_length">Fragment Length (min-max)</string>
-    <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
-    <string name="title_pref_fragment_enabled">ر وندن Fragment</string>
+    <string name="title_fragment_settings">سامووا فرگمنت</string>
+    <string name="title_pref_fragment_packets">کتنا فرگمنت</string>
+    <string name="title_pref_fragment_length">تۊل کتنا فرگمنت (هدقل-هدکسر)</string>
+    <string name="title_pref_fragment_interval">فاسله منجا کتنا فرگمنت (هدقل-هدکسر)</string>
+    <string name="title_pref_fragment_enabled">ر وندن فرگمنت</string>
+
+    <string name="update_check_for_update">واجۊری سی ورۊ رسۊوی</string>
+    <string name="update_already_latest_version">سکو نوسخه دیندایی پۊرنیڌه هڌ</string>
+    <string name="update_new_version_found">نوسخه نۊ ن جوست: %s</string>
+    <string name="update_now">سکو ورۊ رسۊوی کۊنین</string>
+    <string name="update_check_pre_release">واجۊری نوسخه یل پؽش ز تیجنیڌن</string>
+    <string name="update_checking_for_update">ورۊ رسۊوی ن هونی واجۊری اکونه...</string>

    <string-array name="share_method">
        <item>QRcode</item>
@@ -330,10 +334,10 @@

    <string-array name="share_method_more">
        <item>QRcode</item>
-        <item>Export to clipboard</item>
-        <item>Export full configuration to clipboard</item>
-        <item>Edit</item>
-        <item>Delete</item>
+        <item>و در کشیڌن من کلیپ بورد</item>
+        <item>و در کشیڌن پوی کانفیگ من کلیپ بورد</item>
+        <item>آلشت</item>
+        <item>پاک کردن</item>
    </string-array>

    <string-array name="share_sub_method">
--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">تایپ دستی[TROJAN]</string>
    <string name="menu_item_import_config_manually_wireguard">‌تایپ دستی[WIREGUARD]</string>
    <string name="menu_item_import_config_manually_hysteria2">تایپ دستی[HYSTERIA2]</string>
-    <string name="menu_item_import_config_custom">کانفیگ سفارشی</string>
-    <string name="menu_item_import_config_custom_clipboard">کانفیگ سفارشی را از کلیپ ‌بورد وارد کنید</string>
-    <string name="menu_item_import_config_custom_local">کانفیگ سفارشی را به صورت محلی وارد کنید</string>
-    <string name="menu_item_import_config_custom_url">کانفیگ سفارشی را از طریق نشانی اینترنتی وارد کنید</string>
-    <string name="menu_item_import_config_custom_url_scan">نشانی اینترنتی اسکن کانفیگ سفارشی را وارد کنید</string>
    <string name="del_config_comfirm">حذف شود؟</string>
    <string name="del_invalid_config_comfirm">لطفا قبل از حذف کانفیگ نامعتبر بررسی کنید! حذف کانفیگ را تایید می کنید؟</string>
    <string name="server_lab_remarks">ملاحظات</string>
@@ -124,6 +119,7 @@
    <string name="title_user_asset_add_url">آدرس اینترنتی را اضافه کنید</string>
    <string name="msg_file_not_found">فایل پیدا نشد</string>
    <string name="msg_remark_is_duplicate">نام قبلاً وجود دارد</string>
+    <string name="asset_geo_files_sources">منبع فایل های جغرافیایی (اختیاری)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">بارگذاری</string>
@@ -175,7 +171,7 @@
    <string name="summary_pref_fake_dns_enabled">دی ان اس محلی آدرس های آیپی جعلی را بر می گرداند (سریع تر می باشد و تاخیر را کاهش می دهد اما ممکن است برای برخی از برنامه ها کار نکند)</string>

    <string name="title_pref_prefer_ipv6">ترجیح دادن IPV6</string>
-    <string name="summary_pref_prefer_ipv6">ترجیح دادن نشانی و مسیر های IPv6</string>
+    <string name="summary_pref_prefer_ipv6">مسیرهای IPv6 را فعال کنید و آدرس‌های IPv6 را ترجیح دهید</string>

    <string name="title_pref_remote_dns">DNS از راه دور (اختیاری) (udp/tcp/https/quic)</string>
    <string name="summary_pref_remote_dns">DNS</string>
@@ -259,13 +255,14 @@
    <string name="sub_setting_filter">نام مستعار فیلتر</string>
    <string name="sub_setting_enable">فعال کردن به‌روزرسانی</string>
    <string name="sub_auto_update">فعال سازی به‌روزرسانی خودکار</string>
+    <string name="sub_allow_insecure_url">مجاز کردن آدرس HTTP ناامن</string>
    <string name="sub_setting_pre_profile">نام مستعار پروکسی قبلی</string>
    <string name="sub_setting_next_profile">نام مستعار پروکسی بعدی</string>
    <string name="sub_setting_pre_profile_tip">لطفاً مطمئن شوید که نام مستعار وجود دارد و منحصر به فرد است</string>
    <string name="title_sub_update">به‌روزرسانی گروه فعلی اشتراک</string>
    <string name="title_ping_all_server">TCPING کانفیگ های گروه فعلی</string>
    <string name="title_real_ping_all_server">تاخیر واقعی کانفیگ های گروه فعلی</string>
-    <string name="title_user_asset_setting">Asset files</string>
+    <string name="title_user_asset_setting">فایل های منبع جغرافیایی</string>
    <string name="title_sort_by_test_results">مرتب‌ سازی بر اساس نتایج آزمایش</string>
    <string name="title_filter_config">فیلتر کردن کانفیگ‌ها</string>
    <string name="filter_config_all">همه گروه‌های اشتراک</string>
@@ -304,7 +301,7 @@
    <string name="connection_test_pending">اتصال را بررسی کنید</string>
    <string name="connection_test_testing">در حال آزمایش...</string>
    <string name="connection_test_testing_count">تست کردن %d کانفیگ…</string>
-    <string name="connection_test_available">موفقیت: اتصال HTTP %dms طول کشید</string>
+    <string name="connection_test_available">موفقیت: اتصال %dms طول کشید</string>
    <string name="connection_test_error">اتصال به اینترنت شناسایی نشد: %s</string>
    <string name="connection_test_fail">اینترنت در دسترس نیست</string>
    <string name="connection_test_error_status_code">کد خطا: #%d</string>
@@ -319,6 +316,13 @@
    <string name="title_pref_fragment_interval">فاصله بین بسته های فرگمنت (حداقل-حداکثر)</string>
    <string name="title_pref_fragment_enabled">فعال کردن فرگمنت</string>

+    <string name="update_check_for_update">بررسی به روز رسانی</string>
+    <string name="update_already_latest_version">در حال حاضر آخرین نسخه نصب شده است</string>
+    <string name="update_new_version_found">نسخه جدید پیدا شد: %s</string>
+    <string name="update_now">اکنون به روز رسانی کنید</string>
+    <string name="update_check_pre_release">بررسی نسخه پیش از انتشار</string>
+    <string name="update_checking_for_update">در حال بررسی برای به‌روزرسانی…</string>
+
    <string-array name="share_method">
        <item>QRcode</item>
        <item>خروجی گرفتن در کلیپ‌ بورد</item>
--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">Ручной ввод Trojan</string>
    <string name="menu_item_import_config_manually_wireguard">Ручной ввод WireGuard</string>
    <string name="menu_item_import_config_manually_hysteria2">Ручной ввод Hysteria2</string>
-    <string name="menu_item_import_config_custom">Другой профиль</string>
-    <string name="menu_item_import_config_custom_clipboard">Импорт из буфера обмена</string>
-    <string name="menu_item_import_config_custom_local">Импорт из файла</string>
-    <string name="menu_item_import_config_custom_url">Импорт из URL</string>
-    <string name="menu_item_import_config_custom_url_scan">Импорт сканированием URL</string>
    <string name="del_config_comfirm">Подтверждаете удаление?</string>
    <string name="del_invalid_config_comfirm">Выполните проверку перед удалением! Подтверждаете удаление?</string>
    <string name="server_lab_remarks">Название</string>
@@ -126,6 +121,7 @@
    <string name="title_user_asset_add_url">Добавить URL ресурса</string>
    <string name="msg_file_not_found">Файл не найден</string>
    <string name="msg_remark_is_duplicate">Название уже существует</string>
+    <string name="asset_geo_files_sources">Источник геофайлов (необязательно)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">Загрузка…</string>
@@ -176,7 +172,7 @@
    <string name="summary_pref_fake_dns_enabled">Локальная DNS возвращает поддельные IP-адреса (быстрее, но может не работать с некоторыми приложениями)</string>

    <string name="title_pref_prefer_ipv6">Предпочитать IPv6</string>
-    <string name="summary_pref_prefer_ipv6">Предпочитать IPv6-адреса и маршрутизацию</string>
+    <string name="summary_pref_prefer_ipv6">Использовать маршрутизацию IPv6 предпочитать IPv6-адреса</string>

    <string name="title_pref_remote_dns">Удалённая DNS (UDP/TCP/HTTPS/QUIC) (необязательно)</string>
    <string name="summary_pref_remote_dns">DNS</string>
@@ -261,13 +257,14 @@
    <string name="sub_setting_filter">Название фильтра</string>
    <string name="sub_setting_enable">Использовать обновление</string>
    <string name="sub_auto_update">Использовать автообновление</string>
-    <string name="sub_setting_pre_profile">Название предыдущего прокси</string>
-    <string name="sub_setting_next_profile">Название следующего прокси</string>
-    <string name="sub_setting_pre_profile_tip">Название должно существовать и быть уникальным</string>
+    <string name="sub_allow_insecure_url">Разрешать незащищённые HTTP-адреса</string>
+    <string name="sub_setting_pre_profile">Предыдущая конфигурация прокси</string>
+    <string name="sub_setting_next_profile">Следующая конфигурация прокси</string>
+    <string name="sub_setting_pre_profile_tip">Конфигурация должна быть уникальной</string>
    <string name="title_sub_update">Обновить подписку группы</string>
    <string name="title_ping_all_server">Проверка профилей группы</string>
    <string name="title_real_ping_all_server">Время отклика профилей группы</string>
-    <string name="title_user_asset_setting">Asset files</string>
+    <string name="title_user_asset_setting">Файлы ресурсов</string>
    <string name="title_sort_by_test_results">Сортировка по результатам теста</string>
    <string name="title_filter_config">Фильтр групп</string>
    <string name="filter_config_all">Все группы</string>
@@ -306,7 +303,7 @@
    <string name="connection_test_pending">Проверить подключение</string>
    <string name="connection_test_testing">Проверка…</string>
    <string name="connection_test_testing_count">Проверка профилей (%d)</string>
-    <string name="connection_test_available">Успешно: HTTP-соединение заняло %d мс</string>
+    <string name="connection_test_available">Успешно: соединение заняло %d мс</string>
    <string name="connection_test_error">Сбой проверки интернет-соединения: %s</string>
    <string name="connection_test_fail">Интернет недоступен</string>
    <string name="connection_test_error_status_code">Код ошибки: #%d</string>
@@ -321,6 +318,13 @@
    <string name="title_pref_fragment_interval">Интервал фрагментов (от - до)</string>
    <string name="title_pref_fragment_enabled">Использовать фрагментирование</string>

+    <string name="update_check_for_update">Проверить обновление</string>
+    <string name="update_already_latest_version">Установлена последняя версия</string>
+    <string name="update_new_version_found">Найдена новая версия: %s</string>
+    <string name="update_now">Обновить</string>
+    <string name="update_check_pre_release">Искать предварительный выпуск</string>
+    <string name="update_checking_for_update">Проверка обновления…</string>
+
    <string-array name="share_method">
        <item>QR-код</item>
        <item>Экспорт в буфер обмена</item>
--- a/V2rayNG/app/src/main/res/values-vi/strings.xml
+++ b/V2rayNG/app/src/main/res/values-vi/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">Nhập thủ công [Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">Nhập thủ công [WireGuard]</string>
    <string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
-    <string name="menu_item_import_config_custom">Nâng cao / Cấu hình tùy chỉnh</string>
-    <string name="menu_item_import_config_custom_clipboard">Nhập cấu hình tùy chỉnh từ Clipboard</string>
-    <string name="menu_item_import_config_custom_local">Nhập cấu hình tùy chỉnh từ Tệp</string>
-    <string name="menu_item_import_config_custom_url">Nhập cấu hình tùy chỉnh từ URL</string>
-    <string name="menu_item_import_config_custom_url_scan">Nhập cấu hình tùy chỉnh quét URL</string>
    <string name="del_config_comfirm">Xác nhận xóa?</string>
    <string name="del_invalid_config_comfirm">Please test before deleting! Confirm delete ?</string>
    <string name="server_lab_remarks">Tên cấu hình</string>
@@ -124,6 +119,7 @@
    <string name="title_user_asset_add_url">Thêm URL nội dung</string>
    <string name="msg_file_not_found">Không tìm thấy tập tin!</string>
    <string name="msg_remark_is_duplicate">Nhận xét đã tồn tại!</string>
+    <string name="asset_geo_files_sources">Geo files source (optional)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">Đang tải...</string>
@@ -262,9 +258,10 @@
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">Sử dụng gói đăng ký này</string>
    <string name="sub_auto_update">Bật tự động cập nhật</string>
-    <string name="sub_setting_pre_profile">Previous proxy remarks</string>
-    <string name="sub_setting_next_profile">Next proxy remarks</string>
-    <string name="sub_setting_pre_profile_tip">The remarks exists and is unique</string>
+    <string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
+    <string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
+    <string name="sub_setting_next_profile">Next proxy configuration remarks</string>
+    <string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
    <string name="title_sub_update">Cập nhật các gói đăng ký</string>
    <string name="title_ping_all_server">Ping tất cả máy chủ</string>
    <string name="title_real_ping_all_server">Kiểm tra HTTP tất cả máy chủ</string>
@@ -309,6 +306,19 @@
    <string name="import_subscription_success">Nhập gói đăng ký thành công!</string>
    <string name="import_subscription_failure">Nhập gói đăng ký không thành công!</string>

+    <string name="title_fragment_settings">Fragment Settings</string>
+    <string name="title_pref_fragment_packets">Fragment Packets</string>
+    <string name="title_pref_fragment_length">Fragment Length (min-max)</string>
+    <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
+    <string name="title_pref_fragment_enabled">Enable Fragment</string>
+
+    <string name="update_check_for_update">Check for update</string>
+    <string name="update_already_latest_version">Already on the latest version</string>
+    <string name="update_new_version_found">New version found: %s</string>
+    <string name="update_now">Update now</string>
+    <string name="update_check_pre_release">Check Pre-release</string>
+    <string name="update_checking_for_update">Checking for update…</string>
+
    <string-array name="share_method">
        <item>Xuất ra mã QR (Chụp màn hình để lưu)</item>
        <item>Sao chép vào Clipboard</item>
@@ -340,12 +350,6 @@
        <item>Sáng</item>
        <item>Tối</item>
    </string-array>
-    <string name="title_fragment_settings">Fragment Settings</string>
-    <string name="title_pref_fragment_packets">Fragment Packets</string>
-    <string name="title_pref_fragment_length">Fragment Length (min-max)</string>
-    <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
-    <string name="title_pref_fragment_enabled">Enable Fragment</string>
-
    <string-array name="vpn_bypass_lan">
        <item>Follow config</item>
        <item>Bypass</item>
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">手动输入 [Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">手动输入 [Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">手动输入 [Hysteria2]</string>
-    <string name="menu_item_import_config_custom">自定义配置</string>
-    <string name="menu_item_import_config_custom_clipboard">从剪贴板导入自定义配置</string>
-    <string name="menu_item_import_config_custom_local">从本地导入自定义配置</string>
-    <string name="menu_item_import_config_custom_url">剪贴板 URL 导入自定义配置</string>
-    <string name="menu_item_import_config_custom_url_scan">扫描 URL 导入自定义配置</string>
    <string name="del_config_comfirm">确认删除？</string>
    <string name="del_invalid_config_comfirm">删除前请先测试！确认删除？</string>
    <string name="server_lab_remarks">别名 (remarks)</string>
@@ -124,6 +119,7 @@
    <string name="title_user_asset_add_url">添加资产网址</string>
    <string name="msg_file_not_found">文件未找到</string>
    <string name="msg_remark_is_duplicate">备注已经存在</string>
+    <string name="asset_geo_files_sources">Geo 文件来源 (可选)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">正在加载</string>
@@ -259,9 +255,10 @@
    <string name="sub_setting_filter">别名正则过滤</string>
    <string name="sub_setting_enable">启用更新</string>
    <string name="sub_auto_update">启用自动更新</string>
-    <string name="sub_setting_pre_profile">前置代理别名</string>
-    <string name="sub_setting_next_profile">落地代理別名</string>
-    <string name="sub_setting_pre_profile_tip">请确保别名存在并唯一</string>
+    <string name="sub_allow_insecure_url">允许不安全的 HTTP 地址</string>
+    <string name="sub_setting_pre_profile">前置代理配置文件别名</string>
+    <string name="sub_setting_next_profile">落地代理配置文件別名</string>
+    <string name="sub_setting_pre_profile_tip">请确保配置文件别名存在并唯一</string>
    <string name="title_sub_update">更新当前组订阅</string>
    <string name="title_ping_all_server">测试当前组配置 Tcping</string>
    <string name="title_real_ping_all_server">测试当前组配置真连接</string>
@@ -313,6 +310,13 @@
    <string name="title_pref_fragment_interval">分片间隔（最小 - 最大）</string>
    <string name="title_pref_fragment_enabled">启用分片（Fragment）</string>

+    <string name="update_check_for_update">检查更新</string>
+    <string name="update_already_latest_version">目前已是最新版本</string>
+    <string name="update_new_version_found">发现新版本: %s</string>
+    <string name="update_now">立即更新</string>
+    <string name="update_check_pre_release">检查 Pre-release</string>
+    <string name="update_checking_for_update">正在检查更新中…</string>
+
    <string-array name="share_method">
        <item>二维码</item>
        <item>导出至剪贴板</item>
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -35,11 +35,6 @@
    <string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">手動鍵入 [Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">手動鍵入 [Hysteria2]</string>
-    <string name="menu_item_import_config_custom">自訂設定</string>
-    <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂設定</string>
-    <string name="menu_item_import_config_custom_local">從本地匯入自訂設定</string>
-    <string name="menu_item_import_config_custom_url">從 URL 匯入自訂設定</string>
-    <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂設定</string>
    <string name="del_config_comfirm">確定刪除？</string>
    <string name="del_invalid_config_comfirm">刪除前請先測試！確認刪除？</string>
    <string name="server_lab_remarks">備註</string>
@@ -124,6 +119,7 @@
    <string name="title_user_asset_add_url">新增資產網址</string>
    <string name="msg_file_not_found">文件未找到</string>
    <string name="msg_remark_is_duplicate">備註已經存在</string>
+    <string name="asset_geo_files_sources">Geo 檔案來源 (可選)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">載入</string>
@@ -260,9 +256,10 @@
    <string name="sub_setting_filter">別名正規過濾</string>
    <string name="sub_setting_enable">啟用更新</string>
    <string name="sub_auto_update">啟用自動更新</string>
-    <string name="sub_setting_pre_profile">前置代理别名</string>
-    <string name="sub_setting_next_profile">落地代理別名</string>
-    <string name="sub_setting_pre_profile_tip">请确保别名存在并唯一</string>
+    <string name="sub_allow_insecure_url">允許不安全的 HTTP 位址</string>
+    <string name="sub_setting_pre_profile">前置代理設定檔别名</string>
+    <string name="sub_setting_next_profile">落地代理設定檔別名</string>
+    <string name="sub_setting_pre_profile_tip">请确保設定檔别名存在并唯一</string>
    <string name="title_sub_update">更新目前群組訂閱</string>
    <string name="title_ping_all_server">偵測目前群組設定 Tcping</string>
    <string name="title_real_ping_all_server">偵測目前群組設定真延遲</string>
@@ -313,6 +310,13 @@
    <string name="title_pref_fragment_interval">分片間隔（最小-最大）</string>
    <string name="title_pref_fragment_enabled">啟用分片（Fragment）</string>

+    <string name="update_check_for_update">檢查更新</string>
+    <string name="update_already_latest_version">当前已是最新版本</string>
+    <string name="update_new_version_found">發現新版本: %s</string>
+    <string name="update_now">立即更新</string>
+    <string name="update_check_pre_release">檢查 Pre-release</string>
+    <string name="update_checking_for_update">正在檢查更新中…</string>
+
    <string-array name="share_method">
        <item>QR Code</item>
        <item>匯出至剪貼簿</item>
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -124,43 +124,6 @@
        <item>xtls-rprx-vision-udp443</item>
    </string-array>

-
-    <!-- minimum list https://serverfault.com/a/304791 -->
-    <string-array name="bypass_private_ip_address" translatable="false">
-        <item>0.0.0.0/5</item>
-        <item>8.0.0.0/7</item>
-        <item>11.0.0.0/8</item>
-        <item>12.0.0.0/6</item>
-        <item>16.0.0.0/4</item>
-        <item>32.0.0.0/3</item>
-        <item>64.0.0.0/2</item>
-        <item>128.0.0.0/3</item>
-        <item>160.0.0.0/5</item>
-        <item>168.0.0.0/6</item>
-        <item>172.0.0.0/12</item>
-        <item>172.32.0.0/11</item>
-        <item>172.64.0.0/10</item>
-        <item>172.128.0.0/9</item>
-        <item>173.0.0.0/8</item>
-        <item>174.0.0.0/7</item>
-        <item>176.0.0.0/4</item>
-        <item>192.0.0.0/9</item>
-        <item>192.128.0.0/11</item>
-        <item>192.160.0.0/13</item>
-        <item>192.169.0.0/16</item>
-        <item>192.170.0.0/15</item>
-        <item>192.172.0.0/14</item>
-        <item>192.176.0.0/12</item>
-        <item>192.192.0.0/10</item>
-        <item>193.0.0.0/8</item>
-        <item>194.0.0.0/7</item>
-        <item>196.0.0.0/6</item>
-        <item>200.0.0.0/5</item>
-        <item>208.0.0.0/4</item>
-        <item>240.0.0.0/4</item>
-    </string-array>
-
-
    <string-array name="language_select" translatable="false">
        <item>auto</item>
        <item>English</item>
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -36,11 +36,6 @@
    <string name="menu_item_import_config_manually_trojan">Type manually[Trojan]</string>
    <string name="menu_item_import_config_manually_wireguard">Type manually[Wireguard]</string>
    <string name="menu_item_import_config_manually_hysteria2">Type manually[Hysteria2]</string>
-    <string name="menu_item_import_config_custom">Custom config</string>
-    <string name="menu_item_import_config_custom_clipboard">Import custom config from Clipboard</string>
-    <string name="menu_item_import_config_custom_local">Import custom config from locally</string>
-    <string name="menu_item_import_config_custom_url">Import custom config from URL</string>
-    <string name="menu_item_import_config_custom_url_scan">Import custom config scan URL</string>
    <string name="del_config_comfirm">Confirm delete ?</string>
    <string name="del_invalid_config_comfirm">Please test before deleting! Confirm delete ?</string>
    <string name="server_lab_remarks">remarks</string>
@@ -127,6 +122,7 @@
    <string name="title_user_asset_add_url">Add asset URL</string>
    <string name="msg_file_not_found">File not found</string>
    <string name="msg_remark_is_duplicate">The remarks already exists</string>
+    <string name="asset_geo_files_sources">Geo files source (optional)</string>

    <!-- PerAppProxyActivity -->
    <string name="msg_dialog_progress">Loading</string>
@@ -178,7 +174,7 @@
    <string name="summary_pref_fake_dns_enabled">Local DNS returns fake IP addresses (faster, but it may not work for some apps)</string>

    <string name="title_pref_prefer_ipv6">Prefer IPv6</string>
-    <string name="summary_pref_prefer_ipv6">Prefer IPv6 addresses and routes</string>
+    <string name="summary_pref_prefer_ipv6">Enable IPv6 routes and Prefer IPv6 addresses</string>

    <string name="title_pref_remote_dns">Remote DNS (udp/tcp/https/quic)(Optional)</string>
    <string name="summary_pref_remote_dns">DNS</string>
@@ -263,9 +259,10 @@
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">Enable update</string>
    <string name="sub_auto_update">Enable automatic update</string>
-    <string name="sub_setting_pre_profile">Previous proxy remarks</string>
-    <string name="sub_setting_next_profile">Next proxy remarks</string>
-    <string name="sub_setting_pre_profile_tip">The remarks exists and is unique</string>
+    <string name="sub_allow_insecure_url">Allow insecure HTTP address</string>
+    <string name="sub_setting_pre_profile">Previous proxy configuration remarks</string>
+    <string name="sub_setting_next_profile">Next proxy configuration remarks</string>
+    <string name="sub_setting_pre_profile_tip">The configuration remarks exists and is unique</string>
    <string name="title_sub_update">Update current group subscription</string>
    <string name="title_ping_all_server">Tcping current group configuration</string>
    <string name="title_real_ping_all_server">Real delay current group configuration</string>
@@ -308,7 +305,7 @@
    <string name="connection_test_pending">Check Connectivity</string>
    <string name="connection_test_testing">Testing…</string>
    <string name="connection_test_testing_count">Testing %d configurations…</string>
-    <string name="connection_test_available">Success: HTTP connection took %dms</string>
+    <string name="connection_test_available">Success: Connection took %dms</string>
    <string name="connection_test_error">Fail to detect internet connection: %s</string>
    <string name="connection_test_fail">Internet Unavailable</string>
    <string name="connection_test_error_status_code">Error code: #%d</string>
@@ -323,6 +320,13 @@
    <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
    <string name="title_pref_fragment_enabled">Enable Fragment</string>

+    <string name="update_check_for_update">Check for update</string>
+    <string name="update_already_latest_version">Already on the latest version</string>
+    <string name="update_new_version_found">New version found: %s</string>
+    <string name="update_now">Update now</string>
+    <string name="update_check_pre_release">Check Pre-release</string>
+    <string name="update_checking_for_update">Checking for update…</string>
+
    <string-array name="share_method">
        <item>QRcode</item>
        <item>Export to clipboard</item>
--- a/V2rayNG/app/src/main/res/xml/network_security_config.xml
+++ b/V2rayNG/app/src/main/res/xml/network_security_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config xmlns:tools="http://schemas.android.com/tools">
-    <base-config>
+    <base-config cleartextTrafficPermitted="true">
        <trust-anchors>
            <certificates src="system" />
            <certificates
--- a/V2rayNG/app/src/main/res/xml/pref_settings.xml
+++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml
@@ -19,6 +19,11 @@
        android:title="@string/title_pref_is_booted" />

    <PreferenceCategory android:title="@string/title_vpn_settings">
+        <CheckBoxPreference
+                android:key="pref_prefer_ipv6"
+                android:summary="@string/summary_pref_prefer_ipv6"
+                android:title="@string/title_pref_prefer_ipv6" />
+
        <CheckBoxPreference
            android:key="pref_per_app_proxy"
            android:summary="@string/summary_pref_per_app_proxy"
@@ -51,7 +56,7 @@
            android:title="@string/title_pref_vpn_dns" />

        <ListPreference
-            android:defaultValue="0"
+            android:defaultValue="1"
            android:entries="@array/vpn_bypass_lan"
            android:entryValues="@array/vpn_bypass_lan_value"
            android:key="pref_vpn_bypass_lan"
@@ -170,11 +175,6 @@
        android:title="@string/title_advanced"
        app:initialExpandedChildrenCount="0">

-        <CheckBoxPreference
-            android:key="pref_prefer_ipv6"
-            android:summary="@string/summary_pref_prefer_ipv6"
-            android:title="@string/title_pref_prefer_ipv6" />
-
        <CheckBoxPreference
            android:defaultValue="false"
            android:key="pref_proxy_sharing_enabled"
--- a/V2rayNG/app/src/test/java/com/v2ray/ang/HttpUtilTest.kt
+++ b/V2rayNG/app/src/test/java/com/v2ray/ang/HttpUtilTest.kt
@@ -0,0 +1,41 @@
+package com.v2ray.ang
+
+import com.v2ray.ang.util.HttpUtil
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class HttpUtilTest {
+
+    @Test
+    fun testIdnToASCII() {
+        // Regular URL remains unchanged
+        val regularUrl = "https://example.com/path"
+        assertEquals(regularUrl, HttpUtil.toIdnUrl(regularUrl))
+
+        // Non-ASCII URL converts to ASCII (Punycode)
+        val nonAsciiUrl = "https://例子.测试/path"
+        val expectedNonAscii = "https://xn--fsqu00a.xn--0zwm56d/path"
+        assertEquals(expectedNonAscii, HttpUtil.toIdnUrl(nonAsciiUrl))
+
+        // Mixed URL only converts the host part
+        val mixedUrl = "https://例子.com/测试"
+        val expectedMixed = "https://xn--fsqu00a.com/测试"
+        assertEquals(expectedMixed, HttpUtil.toIdnUrl(mixedUrl))
+
+        // URL with Basic Authentication using regular domain
+        val basicAuthUrl = "https://user:password@example.com/path"
+        assertEquals(basicAuthUrl, HttpUtil.toIdnUrl(basicAuthUrl))
+
+        // URL with Basic Authentication using non-ASCII domain
+        val basicAuthNonAscii = "https://user:password@例子.测试/path"
+        val expectedBasicAuthNonAscii = "https://user:password@xn--fsqu00a.xn--0zwm56d/path"
+        assertEquals(expectedBasicAuthNonAscii, HttpUtil.toIdnUrl(basicAuthNonAscii))
+
+        // URL with non-ASCII username and password
+        val nonAsciiAuth = "https://用户:密码@example.com/path"
+        // Basic auth credentials should remain unchanged as they're percent-encoded separately
+        assertEquals(nonAsciiAuth, HttpUtil.toIdnUrl(nonAsciiAuth))
+    }
+
+
+}
--- a/V2rayNG/app/src/test/java/com/v2ray/ang/AngUnitTest.kt
+++ b/V2rayNG/app/src/test/java/com/v2ray/ang/AngUnitTest.kt
@@ -11,7 +11,7 @@ import org.junit.Test
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
-class AngUnitTest {
+class UtilsTest {

    @Test
    fun test_parseInt() {
@@ -45,4 +45,18 @@ class AngUnitTest {
        assertTrue(Utils.isIpAddress("240e:1234:abcd:12::/64"))
    }

+    @Test
+    fun test_IsIpInCidr() {
+        assertTrue(Utils.isIpInCidr("192.168.1.1", "192.168.1.0/24"))
+        assertTrue(Utils.isIpInCidr("192.168.1.254", "192.168.1.0/24"))
+        assertFalse(Utils.isIpInCidr("192.168.2.1", "192.168.1.0/24"))
+
+        assertTrue(Utils.isIpInCidr("10.0.0.0", "10.0.0.0/8"))
+        assertTrue(Utils.isIpInCidr("10.255.255.255", "10.0.0.0/8"))
+        assertFalse(Utils.isIpInCidr("11.0.0.0", "10.0.0.0/8"))
+
+        assertFalse(Utils.isIpInCidr("invalid-ip", "192.168.1.0/24"))
+        assertFalse(Utils.isIpInCidr("192.168.1.1", "invalid-cidr"))
+    }
+
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
2dust	94cc72d2b9	up 1.10.7	2025-06-19 14:40:47 +08:00
2dust	f68c353715	Update AndroidLibXrayLite	2025-06-19 14:40:11 +08:00
2dust	e077c18108	Improved update checking and prompts in case of abnormality	2025-06-19 14:40:07 +08:00
Ural Khamitov	1a5e105212	Fix blinking QSTile when QS panel is opening (#4676 )	2025-06-18 16:17:28 +08:00
DHR60	e0881caab4	Fix missing sockopt.domainStrategy (#4673 ) * Fix missing sockopt.domainStrategy * Fix	2025-06-17 13:43:03 +08:00
DHR60	7219425258	Cloudflare DNS Hosts (#4661 )	2025-06-15 09:46:30 +08:00
2dust	51eabe5440	up 1.10.6	2025-06-14 14:27:09 +08:00
2dust	6f0b3ce990	Update AndroidLibXrayLite	2025-06-14 14:26:37 +08:00
2dust	69e27ed3bb	Fix log for plugin	2025-06-14 14:26:33 +08:00
patterniha	fff6ab30e6	Xray-core default FakeIPv6 Pool should not bypass and should route (#4649 ) * Update V2RayVpnService.kt * Update V2RayVpnService.kt * Update AppConfig.kt	2025-06-14 13:59:59 +08:00
2dust	fdb67a86f4	up 1.10.5	2025-06-08 09:26:36 +08:00
2dust	ea088376ac	Update AndroidLibXrayLite	2025-06-08 09:25:46 +08:00
2dust	52332d960e	Update libs.versions.toml	2025-06-07 11:20:41 +08:00
2dust	3ead542e2b	VPN bypass LAN By default	2025-06-07 11:20:37 +08:00
2dust	9d1f98ff34	Fix non-English domain https://github.com/2dust/v2rayNG/issues/4626 `f305e26a39`	2025-05-31 14:03:52 +08:00
2dust	f305e26a39	Fix the parsing problem of non-English domain https://github.com/2dust/v2rayNG/issues/4626	2025-05-31 11:12:57 +08:00
2dust	aa47fba20d	up 1.10.4	2025-05-25 11:06:15 +08:00
Hossein Abaspanah	69c5bbfd3d	Improved Luri Bakhtiari Translation (#4600 )	2025-05-25 10:12:52 +08:00
Pk-web6936	90ed02804c	Update Persian translate (#4607 )	2025-05-25 10:12:45 +08:00
Hossein Abaspanah	822c1de79c	Update Luri Bakhtiari translation (#4610 )	2025-05-25 10:12:39 +08:00
solokot	d910b93525	Update Russian translation (#4611 )	2025-05-25 10:12:29 +08:00
Pk-web6936	7e6b1c247b	Update kotlin version to 2.1.21 (#4583 ) * Update kotlin version to 2.1.21 * Update kotlin version to 2.1.21	2025-05-23 16:58:03 +08:00
2dust	f3f2b7fab5	Added delete function to subscription group list, secondary confirmation with settings	2025-05-23 16:17:38 +08:00
2dust	e6f260da76	Added the check update entry to the main interface drawer menu https://github.com/2dust/v2rayNG/issues/4599	2025-05-23 14:34:55 +08:00
2dust	55bc2bf934	up 1.10.3	2025-05-17 12:01:34 +08:00
2dust	f22454da5d	Update AndroidLibXrayLite	2025-05-17 11:48:15 +08:00
2dust	4a87549fa7	Update README.md	2025-05-15 10:58:52 +08:00
2dust	d447adc97f	Fix https://github.com/2dust/v2rayN/discussions/7268	2025-05-11 18:07:26 +08:00
2dust	3773962b64	up 1.10.2	2025-05-07 10:47:50 +08:00
2dust	be0a2506ce	Update AndroidLibXrayLite	2025-05-07 10:44:19 +08:00
2dust	7f9cb8dfdd	Check upgrade function is visible	2025-05-07 10:14:14 +08:00
2dust	71a5b6e480	Update AndroidLibXrayLite	2025-05-04 17:49:02 +08:00
2dust	02e53ced50	Update AndroidLibXrayLite	2025-04-30 14:49:02 +08:00
2dust	42c27a5e7e	Update hysteria	2025-04-30 14:48:59 +08:00
2dust	af04bbcf87	up 1.10.1	2025-04-30 14:35:48 +08:00
2dust	9bedfe8a7b	Bug fix https://github.com/2dust/v2rayNG/issues/4555	2025-04-30 08:31:51 +08:00
2dust	2fdf684ee7	Fix https://github.com/2dust/v2rayNG/issues/4548	2025-04-28 15:30:16 +08:00
2dust	5b79951da7	up 1.10.0	2025-04-24 10:33:23 +08:00
2dust	06aa680d45	Update libs.versions.toml	2025-04-24 10:26:03 +08:00
Hossein Abaspanah	cdb9b1811c	Update Luri Bakhtiari translation (#4535 )	2025-04-24 10:11:20 +08:00
solokot	0fc1f2f5d3	Update Russian translation (#4534 )	2025-04-24 10:11:10 +08:00
Pk-web6936	ef1bb3dd34	Update Persian translation (#4533 )	2025-04-24 10:11:02 +08:00
2dust	1bca321d3f	Temporarily add option to allow insecure HTTP subscription address https://github.com/2dust/v2rayNG/issues/4526	2025-04-23 10:05:49 +08:00
solokot	247e2b3ba3	Update Russian translation (#4532 )	2025-04-22 10:36:23 +08:00
2dust	41fd2b0cfb	Fix	2025-04-22 10:36:10 +08:00
Hossein Abaspanah	72da42ee40	Update Luri Bakhtiari translation (#4524 )	2025-04-20 09:33:01 +08:00
AmirHossein Abdolmotallebi	c130d55e8f	Update V2rayConfig.kt (#4522 )	2025-04-20 09:32:52 +08:00
Pk-web6936	5ae84f7eac	Update Persian translate (#4518 ) https://github.com/2dust/v2rayNG/pull/4507	2025-04-20 09:31:50 +08:00
patterniha	df5ea251e1	move Prefer_IPv6 settings (#4507 )	2025-04-19 15:35:20 +08:00
2dust	8890d9f004	Organize and optimize the code of V2rayConfigManager	2025-04-19 11:38:02 +08:00
2dust	4fcb3f9d06	Refactor ConfigResult	2025-04-19 10:24:15 +08:00
2dust	5bf7c98cd3	Refactor outbound related code	2025-04-18 20:02:55 +08:00
2dust	46bc1a49df	Refactor reference code with libv2ray remove protect	2025-04-18 17:20:21 +08:00
2dust	21175f41ec	Update AndroidLibXrayLite	2025-04-18 17:19:40 +08:00
DHR60	864c63987e	Adds domain strategy option to sockopt (#4511 ) * Adds domain strategy option to sockopt * Simplifies sockopt handling in V2Ray config	2025-04-18 16:49:51 +08:00
DHR60	4ac0547e22	Resolves hostnames in config (#4508 ) * Removes IP resolution and resolves in config * Resolves hostnames to multiple IPs for DNS * Improves custom config handling	2025-04-18 14:12:14 +08:00
2dust	12a9ee262c	Revert "Update gradle.properties" This reverts commit `56e33e6cdd`.	2025-04-18 10:24:54 +08:00
2dust	cfa9c19c94	Clean code	2025-04-18 10:22:44 +08:00
2dust	56e33e6cdd	Update gradle.properties	2025-04-18 10:22:17 +08:00
2dust	02421072c1	Merge branch 'master' of https://github.com/2dust/v2rayNG	2025-04-17 16:41:04 +08:00
2dust	b862a0dc65	Update AndroidLibXrayLite	2025-04-17 16:40:53 +08:00
Pk-web6936	1f25d6a000	Update dependencies (#4504 ) * Update libs.versions.toml * Update libs.versions.toml	2025-04-17 16:29:56 +08:00
2dust	e1def0616a	Refactor the Outbound transport and tls in the configuration file	2025-04-17 15:23:57 +08:00
2dust	83fd6efc17	Resolve remote host names in the configuration file to IP addresses	2025-04-17 14:08:45 +08:00
2dust	f0c0e2e83a	Refactor reference code with libv2ray	2025-04-17 10:41:30 +08:00
Pk-web6936	6ca3eb769e	Update dependencies (#4485 ) * Update libs.versions.toml * Update libs.versions.toml * Update libs.versions.toml * Update libs.versions.toml * Update libs.versions.toml * Update libs.versions.toml	2025-04-16 20:06:44 +08:00
2dust	963d24ab66	Optimize and improve `38193b5621`	2025-04-16 15:09:49 +08:00
2dust	cfd81441fa	Update libs.versions.toml	2025-04-15 20:44:03 +08:00
ᡠᠵᡠᡳ ᡠᠵᡠ ᠮᠠᠨᡩ᠋ᠠᠨ	4084ae2938	Updating PRIVATE_IP_LIST (#4498 )	2025-04-15 19:21:25 +08:00
kore kas nadar	3f9bc098ec	Update Luri Bakhtiari translation (#4497 )	2025-04-15 19:21:17 +08:00
Pk-web6936	9cb28ed969	Update Persian translate (#4495 ) `38193b5621`	2025-04-15 14:14:13 +08:00
DHR60	773ddc5373	Fix wg chain proxy (#4496 ) * Fix handle null streamSettings in WireGuard chained proxy * Allows null preshared key for WireGuard * remove WIREGUARD_LOCAL_ADDRESS_V6 * Considers WireGuard outbound for domain port	2025-04-14 20:42:02 +08:00
2dust	38193b5621	Added IP display in connection test https://github.com/2dust/v2rayNG/issues/4489	2025-04-14 14:15:25 +08:00
solokot	358713a2a3	Update Russian translation (#4484 )	2025-04-11 09:19:02 +08:00
2dust	5b9f24c1f0	up 1.9.46	2025-04-09 14:41:11 +08:00
2dust	c47c2c3666	Code clean	2025-04-09 14:35:05 +08:00
2dust	49f7c3e7d7	Added tips for per app proxy	2025-04-09 14:34:27 +08:00
2dust	423e5de2c6	Fix https://github.com/2dust/v2rayNG/issues/4473	2025-04-09 11:55:43 +08:00
kore kas nadar	3e3387e63e	Update Luri Bakhtiari translation (#4477 )	2025-04-09 10:50:47 +08:00
solokot	debddace8b	Update Russian translation (#4476 )	2025-04-09 10:50:33 +08:00
Pk-web6936	160b412e0a	Update Persian translate (#4475 )	2025-04-09 10:50:23 +08:00
2dust	0f3e0a0ea2	Optimize and improve RoutingSettingActivity	2025-04-09 10:47:35 +08:00
2dust	c4cf90e807	Optimize and improve UserAssetActivity	2025-04-09 10:46:21 +08:00
2dust	5db46e81b7	Bug fix https://github.com/2dust/v2rayNG/issues/4474	2025-04-09 10:08:56 +08:00
2dust	1ef80a3a96	Refactor AppConfig const	2025-04-08 21:05:34 +08:00
2dust	a46d9d0d2a	Fix tools:context	2025-04-08 21:03:29 +08:00
2dust	7b80536e1e	Added GEO files sources settings in asset settings https://github.com/2dust/v2rayNG/issues/4440	2025-04-08 19:31:26 +08:00
2dust	5733ecf20e	Add some unit test	2025-04-07 17:06:29 +08:00
ᡠᠵᡠᡳ ᡠᠵᡠ ᠮᠠᠨᡩ᠋ᠠᠨ	eae33b61cf	Restoring some IP ranges removed in `b4c833b` (#4469 )	2025-04-07 16:55:59 +08:00
2dust	9e55b525f1	Bug fix https://github.com/2dust/v2rayNG/issues/4468	2025-04-07 16:15:06 +08:00
2dust	678b3cb505	Allow private IP to use HTTP protocol https://github.com/2dust/v2rayNG/issues/4460	2025-04-07 16:00:56 +08:00
2dust	b4c833b039	Refactoring of private IP lists	2025-04-06 19:42:01 +08:00
2dust	597bd021b8	Bug fix	2025-04-06 14:22:47 +08:00
2dust	ba03118a43	Code clean	2025-04-06 14:22:30 +08:00
kore kas nadar	82148408b0	Improved Luri Bakhtiari Translation (#4465 ) * Improved Luri Bakhtiari Translation * Improved Luri Bakhtiari Translation	2025-04-06 14:09:49 +08:00
kore kas nadar	042900e065	Update Luri Bakhtiari translation (#4463 )	2025-04-06 10:19:20 +08:00
kore kas nadar	874fccc351	Update Luri Bakhtiari translation (#4455 )	2025-04-04 10:35:39 +08:00
2dust	14f36872e7	If it is the Google Play version, the update check will not be displayed within 2 days after update.	2025-04-03 17:30:29 +08:00
solokot	3b6ad3052a	Update Russian translation (#4451 )	2025-04-03 15:39:55 +08:00
Pk-web6936	194fc6b6ed	Update Persian Translation (#4449 ) * Update Persian Translation * Update strings.xml * Update strings.xml	2025-04-03 15:39:47 +08:00
Pk-web6936	0275ad54ac	Delete Unnecessary () around expression (#4447 ) * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression * Delete Unnecessary () around expression Delete Unnecessary () around expression	2025-04-03 10:20:59 +08:00
2dust	7ca4044467	Added check for updates	2025-04-01 17:24:59 +08:00
2dust	1672494ee9	1.9.45	2025-04-01 10:26:59 +08:00
2dust	bbbbc72d22	Update AndroidLibXrayLite	2025-04-01 10:26:45 +08:00
2dust	1e7f49b756	up 1.9.44	2025-03-30 19:14:55 +08:00
2dust	ac4c0f7ee1	Optimize and improve Log	2025-03-30 19:05:35 +08:00
2dust	6cc91b1a89	Optimize and improve log Use Log.e() instead of e.printStackTrace()	2025-03-30 17:40:36 +08:00
2dust	45facff41d	Optimize and improve Utils	2025-03-30 16:28:14 +08:00
2dust	ee703e6c95	Remove ads rules from default routing rules	2025-03-30 11:18:39 +08:00
hhhkkmk	87213c34a6	Revert "Optimization (#4426 )" (#4437 ) This reverts commit `d111328541`.	2025-03-29 18:06:09 +08:00
solokot	73a7c76183	Update Russian translation (#4435 )	2025-03-29 18:05:43 +08:00
Pk-web6936	ed5282f2b3	Update dependencies (#4432 ) * Update libs.versions.toml Update agp * Update validate-fastlane-supply-metadata Update validate-fastlane-supply-metadata	2025-03-29 10:47:09 +08:00
Pk-web6936	390c657047	Switch to Loyalsoldier's v2ray-rules-dat (#4431 ) https://github.com/2dust/AndroidLibXrayLite/pull/132/files	2025-03-29 10:46:49 +08:00
Pk-web6936	7071072862	Fix Arabic Language (#4430 ) * Fix Arabic Language * Fix Arabic Language Fix Arabic Language	2025-03-29 10:46:29 +08:00
Pk-web6936	d111328541	Optimization (#4426 ) * Optimization Add security flags to CFLAGS and LDFLAGS. Use local variables instead of global variables. Clean up and simplify the script. * Optimizition Add security flags to CFLAGS and LDFLAGS. Simplify and organize the file. Makefile * Optimization Add security flags to CFLAGS and LDFLAGS. Use local variables instead of global variables. Clean up and simplify the script. * Optimization	2025-03-29 10:44:21 +08:00
Pk-web6936	76cb2aaf46	Update Persian translate (#4424 )	2025-03-29 10:44:03 +08:00
2dust	7ff1397163	Optimize the test true delay function When testing, remove unnecessary configurations such as dns and routing to reduce resource usage, except for custom configurations.	2025-03-29 10:43:25 +08:00