Update libs.versions.toml

Reasonable app sorting order (#4869 )
2025-08-25 18:39:00 +08:00 · 2025-08-25 18:32:15 +08:00 · 2025-08-25 17:49:24 +08:00 · 2025-08-17 11:15:48 +08:00 · 2025-08-17 10:22:04 +08:00 · 2025-08-17 09:41:41 +08:00
50 changed files with 804 additions and 304 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:

    steps:
    - name: Checkout code
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5
      with:
        submodules: 'recursive'
        fetch-depth: '0'
@@ -31,31 +31,31 @@ jobs:
    - name: Install NDK
      run: |
        echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
-          --channel=3 \
-          --install "ndk;29.0.13113456"
-        echo "NDK_HOME=$ANDROID_HOME/ndk/29.0.13113456" >> $GITHUB_ENV
+          --channel=0 \
+          --install "ndk;28.2.13676358"
+        echo "NDK_HOME=$ANDROID_HOME/ndk/28.2.13676358" >> $GITHUB_ENV
        sed -i '10i\
        \
-            ndkVersion = "29.0.13113456"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
+            ndkVersion = "28.2.13676358"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts

    - name: Restore cached libtun2socks
      id: cache-libtun2socks-restore
      uses: actions/cache/restore@v4
      with:
        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}

    - name: Build libtun2socks
      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
      run: |
        bash compile-tun2socks.sh
-
+    
    - name: Save libtun2socks
      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
      uses: actions/cache/save@v4
      with:
        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}

    - name: Copy libtun2socks
      run: |
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,7 @@
 [submodule "libancillary"]
 	path = libancillary
 	url = https://github.com/shadowsocks/libancillary
+[submodule "hev-socks5-tunnel"]
+	path = hev-socks5-tunnel
+	url = https://github.com/heiher/hev-socks5-tunnel
+	branch = master
--- a/2
+++ b/2
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 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.21-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.0-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)
--- 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 = 659
-        versionName = "1.10.9"
+        versionCode = 669
+        versionName = "1.10.19"
        multiDexEnabled = true

        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
@@ -27,6 +27,7 @@ object AppConfig {
    const val PREF_VPN_DNS = "pref_vpn_dns"
    const val PREF_VPN_BYPASS_LAN = "pref_vpn_bypass_lan"
    const val PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX = "pref_vpn_interface_address_config_index"
+    const val PREF_VPN_MTU = "pref_vpn_mtu"
    const val PREF_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
    const val PREF_ROUTING_RULESET = "pref_routing_ruleset"
    const val PREF_MUX_ENABLED = "pref_mux_enabled"
@@ -62,6 +63,9 @@ object AppConfig {
    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"
+    const val PREF_USE_HEV_TUNNEL = "pref_use_hev_tunnel"
+    const val PREF_HEV_TUNNEL_LOGLEVEL = "pref_hev_tunnel_loglevel"
+    const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout"

    /** Cache keys. */
    const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
@@ -87,6 +91,8 @@ object AppConfig {
    const val TAG_DIRECT = "direct"
    const val TAG_BLOCKED = "block"
    const val TAG_FRAGMENT = "fragment"
+    const val TAG_DNS = "dns-module"
+    const val TAG_DOMESTIC_DNS = "domestic-dns"

    /** Network-related constants. */
    const val UPLINK = "uplink"
@@ -163,6 +169,10 @@ object AppConfig {

    /** Give a good name to this, IDK*/
    const val VPN = "VPN"
+    const val VPN_MTU = 1500
+
+    /** hev-sock5-tunnel read-write-timeout value */
+    const val HEVTUN_RW_TIMEOUT = "300000"

    // Google API rule constants
    const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
@@ -44,6 +44,7 @@ data class ProfileItem(
    var publicKey: String? = null,
    var shortId: String? = null,
    var spiderX: String? = null,
+    var mldsa65Verify: String? = null,

    var secretKey: String? = null,
    var preSharedKey: String? = null,
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
@@ -245,7 +245,14 @@ data class V2rayConfig(
                var tproxy: String? = null,
                var mark: Int? = null,
                var dialerProxy: String? = null,
-                var domainStrategy: String? = null
+                var domainStrategy: String? = null,
+                var happyEyeballs: happyEyeballsBean? = null,
+                )
+            data class happyEyeballsBean(
+                var prioritizeIPv6: Boolean? = null,
+                var maxConcurrentTry: Int? = 4,
+                var tryDelayMs: Int? = 250, // ms
+                var interleave: Int? = null,
            )

            data class TlsSettingsBean(
@@ -264,7 +271,8 @@ data class V2rayConfig(
                val show: Boolean = false,
                var publicKey: String? = null,
                var shortId: String? = null,
-                var spiderX: String? = null
+                var spiderX: String? = null,
+                var mldsa65Verify: String? = null
            )

            data class QuicSettingBean(
@@ -489,6 +497,7 @@ data class V2rayConfig(
            var expectIPs: List<String>? = null,
            val clientIp: String? = null,
            val skipFallback: Boolean? = null,
+            val tag: String? = null,
        )
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -83,6 +83,7 @@ open class FmtBase {
        config.publicKey = queryParam["pbk"]
        config.shortId = queryParam["sid"]
        config.spiderX = queryParam["spx"]
+        config.mldsa65Verify = queryParam["pqv"]
        config.flow = queryParam["flow"]
    }

@@ -101,6 +102,7 @@ open class FmtBase {
        config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
        config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
        config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
+        config.mldsa65Verify.let { if (it.isNotNullEmpty()) dicQuery["pqv"] = it.orEmpty() }
        config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }

        val networkType = NetworkType.fromString(config.network)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/NotificationManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/NotificationManager.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.handler

 import android.app.Notification
 import android.app.NotificationChannel
@@ -12,12 +12,10 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toSpeedString
-import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.ui.MainActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -27,7 +25,7 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlin.math.min

-object NotificationService {
+object NotificationManager {
    private const val NOTIFICATION_ID = 1
    private const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
    private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
@@ -50,7 +48,7 @@ object NotificationService {
        lastQueryTime = System.currentTimeMillis()
        var lastZeroSpeed = false
        val outboundTags = currentConfig?.getAllOutboundTags()
-        outboundTags?.remove(TAG_DIRECT)
+        outboundTags?.remove(AppConfig.TAG_DIRECT)

        speedNotificationJob = CoroutineScope(Dispatchers.IO).launch {
            while (isActive) {
@@ -66,15 +64,15 @@ object NotificationService {
                        proxyTotal += up + down
                    }
                }
-                val directUplink = V2RayServiceManager.queryStats(TAG_DIRECT, AppConfig.UPLINK)
-                val directDownlink = V2RayServiceManager.queryStats(TAG_DIRECT, AppConfig.DOWNLINK)
+                val directUplink = V2RayServiceManager.queryStats(AppConfig.TAG_DIRECT, AppConfig.UPLINK)
+                val directDownlink = V2RayServiceManager.queryStats(AppConfig.TAG_DIRECT, AppConfig.DOWNLINK)
                val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
                if (!zeroSpeed || !lastZeroSpeed) {
                    if (proxyTotal == 0L) {
                        appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
                    }
                    appendSpeedString(
-                        text, TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
+                        text, AppConfig.TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
                        directDownlink / sinceLastQueryInSeconds
                    )
                    updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
@@ -102,12 +100,12 @@ object NotificationService {
        val contentPendingIntent = PendingIntent.getActivity(service, NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent, flags)

        val stopV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
-        stopV2RayIntent.`package` = ANG_PACKAGE
+        stopV2RayIntent.`package` = AppConfig.ANG_PACKAGE
        stopV2RayIntent.putExtra("key", AppConfig.MSG_STATE_STOP)
        val stopV2RayPendingIntent = PendingIntent.getBroadcast(service, NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent, flags)

        val restartV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
-        restartV2RayIntent.`package` = ANG_PACKAGE
+        restartV2RayIntent.`package` = AppConfig.ANG_PACKAGE
        restartV2RayIntent.putExtra("key", AppConfig.MSG_STATE_RESTART)
        val restartV2RayPendingIntent = PendingIntent.getBroadcast(service, NOTIFICATION_PENDING_INTENT_RESTART_V2RAY, restartV2RayIntent, flags)

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/PluginServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/PluginServiceManager.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler

 import android.content.Context
 import android.os.SystemClock
@@ -7,11 +7,12 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.fmt.Hysteria2Fmt
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.service.ProcessService
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.Utils
 import java.io.File

-object PluginUtil {
+object PluginServiceManager {
    private const val HYSTERIA2 = "libhysteria2.so"

    private val procService: ProcessService by lazy {
@@ -137,4 +138,4 @@ object PluginUtil {
            Log.e(AppConfig.TAG, "Failed to stop Hysteria2 process", e)
        }
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
@@ -370,4 +370,11 @@ object SettingsManager {
        val selectedIndex = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX, "0")?.toInt()
        return VpnInterfaceAddressConfig.getConfigByIndex(selectedIndex ?: 0)
    }
+
+    /**
+     * Get the VPN MTU from settings, defaulting to AppConfig.VPN_MTU.
+     */
+    fun getVpnMtu(): Int {
+        return Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_MTU), AppConfig.VPN_MTU)
+    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SubscriptionUpdater.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SubscriptionUpdater.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.handler

 import android.annotation.SuppressLint
 import android.app.NotificationChannel
@@ -11,11 +11,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
-import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
-import com.v2ray.ang.handler.AngConfigManager.updateConfigViaSub
-import com.v2ray.ang.handler.MmkvManager

 object SubscriptionUpdater {

@@ -24,7 +20,7 @@ object SubscriptionUpdater {

        private val notificationManager = NotificationManagerCompat.from(applicationContext)
        private val notification =
-            NotificationCompat.Builder(applicationContext, SUBSCRIPTION_UPDATE_CHANNEL)
+            NotificationCompat.Builder(applicationContext, AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
                .setWhen(0)
                .setTicker("Update")
                .setContentTitle(context.getString(R.string.title_pref_auto_update_subscription))
@@ -46,18 +42,18 @@ object SubscriptionUpdater {
                val subItem = sub.second

                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    notification.setChannelId(SUBSCRIPTION_UPDATE_CHANNEL)
+                    notification.setChannelId(AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
                    val channel =
                        NotificationChannel(
-                            SUBSCRIPTION_UPDATE_CHANNEL,
-                            SUBSCRIPTION_UPDATE_CHANNEL_NAME,
+                            AppConfig.SUBSCRIPTION_UPDATE_CHANNEL,
+                            AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME,
                            NotificationManager.IMPORTANCE_MIN
                        )
                    notificationManager.createNotificationChannel(channel)
                }
                notificationManager.notify(3, notification.build())
                Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
-                updateConfigViaSub(Pair(sub.first, subItem))
+                AngConfigManager.updateConfigViaSub(Pair(sub.first, subItem))
                notification.setContentText("Updating ${subItem.remarks}")
            }
            notificationManager.cancel(3)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt
@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.handler

 import android.app.Service
 import android.content.BroadcastReceiver
@@ -13,12 +13,11 @@ 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.service.ServiceControl
+import com.v2ray.ang.service.V2RayProxyOnlyService
+import com.v2ray.ang.service.V2RayVpnService
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
+import com.v2ray.ang.handler.PluginServiceManager
 import com.v2ray.ang.util.Utils
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
@@ -163,16 +162,16 @@ object V2RayServiceManager {

        if (coreController.isRunning == false) {
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
-            NotificationService.cancelNotification()
+            NotificationManager.cancelNotification()
            return false
        }

        try {
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            NotificationService.showNotification(currentConfig)
-            NotificationService.startSpeedNotification(currentConfig)
+            NotificationManager.showNotification(currentConfig)
+            NotificationManager.startSpeedNotification(currentConfig)

-            PluginUtil.runPlugin(service, config, result.socksPort)
+            PluginServiceManager.runPlugin(service, config, result.socksPort)
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to startup service", e)
            return false
@@ -199,14 +198,14 @@ object V2RayServiceManager {
        }

        MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_STOP_SUCCESS, "")
-        NotificationService.cancelNotification()
+        NotificationManager.cancelNotification()

        try {
            service.unregisterReceiver(mMsgReceive)
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
        }
-        PluginUtil.stopPlugin()
+        PluginServiceManager.stopPlugin()

        return true
    }
@@ -364,14 +363,14 @@ object V2RayServiceManager {
            when (intent?.action) {
                Intent.ACTION_SCREEN_OFF -> {
                    Log.i(AppConfig.TAG, "SCREEN_OFF, stop querying stats")
-                    NotificationService.stopSpeedNotification(currentConfig)
+                    NotificationManager.stopSpeedNotification(currentConfig)
                }

                Intent.ACTION_SCREEN_ON -> {
                    Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats")
-                    NotificationService.startSpeedNotification(currentConfig)
+                    NotificationManager.startSpeedNotification(currentConfig)
                }
            }
        }
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
@@ -470,27 +470,49 @@ object V2rayConfigManager {
                )
            }

-            // DNS inbound
-            val remoteDns = SettingsManager.getRemoteDnsServers()
-            if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
-                val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
-                    address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY,
-                    port = 53,
-                    network = "tcp,udp"
-                )
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL) == false) {

-                val localDnsPort = Utils.parseInt(
-                    MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT),
-                    AppConfig.PORT_LOCAL_DNS.toInt()
+                // DNS inbound
+                val remoteDns = SettingsManager.getRemoteDnsServers()
+                if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
+                    val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
+                        address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY,
+                        port = 53,
+                        network = "tcp,udp"
+                    )
+
+                    val localDnsPort = Utils.parseInt(
+                        MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT),
+                        AppConfig.PORT_LOCAL_DNS.toInt()
+                    )
+                    v2rayConfig.inbounds.add(
+                        V2rayConfig.InboundBean(
+                            tag = "dns-in",
+                            port = localDnsPort,
+                            listen = AppConfig.LOOPBACK,
+                            protocol = "dokodemo-door",
+                            settings = dnsInboundSettings,
+                            sniffing = null
+                        )
+                    )
+                }
+
+                // DNS routing tag
+                v2rayConfig.routing.rules.add(
+                    0, RulesBean(
+                        inboundTag = arrayListOf("dns-in"),
+                        outboundTag = "dns-out",
+                        domain = null
+                    )
                )
-                v2rayConfig.inbounds.add(
-                    V2rayConfig.InboundBean(
-                        tag = "dns-in",
-                        port = localDnsPort,
-                        listen = AppConfig.LOOPBACK,
-                        protocol = "dokodemo-door",
-                        settings = dnsInboundSettings,
-                        sniffing = null
+            } else {
+                //hev-socks5-tunnel dns routing
+                v2rayConfig.routing.rules.add(
+                    0, RulesBean(
+                        inboundTag = arrayListOf("socks"),
+                        outboundTag = "dns-out",
+                        port = "53",
+                        type = "field"
                    )
                )
            }
@@ -507,15 +529,6 @@ object V2rayConfigManager {
                    )
                )
            }
-
-            // DNS routing tag
-            v2rayConfig.routing.rules.add(
-                0, RulesBean(
-                    inboundTag = arrayListOf("dns-in"),
-                    outboundTag = "dns-out",
-                    domain = null
-                )
-            )
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to configure custom local DNS", e)
            return false
@@ -562,18 +575,8 @@ object V2rayConfigManager {
                        address = domesticDns.first(),
                        domains = directDomain,
                        expectIPs = if (isCnRoutingMode) geoipCn else null,
-                        skipFallback = true
-                    )
-                )
-            }
-
-            if (Utils.isPureIpAddress(domesticDns.first())) {
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        outboundTag = AppConfig.TAG_DIRECT,
-                        port = "53",
-                        ip = arrayListOf(domesticDns.first()),
-                        domain = null
+                        skipFallback = true,
+                        tag = AppConfig.TAG_DOMESTIC_DNS
                    )
                )
            }
@@ -614,20 +617,26 @@ object V2rayConfigManager {
            // DNS dns
            v2rayConfig.dns = V2rayConfig.DnsBean(
                servers = servers,
-                hosts = hosts
+                hosts = hosts,
+                tag = AppConfig.TAG_DNS
            )

            // DNS routing
-            if (Utils.isPureIpAddress(remoteDns.first())) {
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        outboundTag = AppConfig.TAG_PROXY,
-                        port = "53",
-                        ip = arrayListOf(remoteDns.first()),
-                        domain = null
-                    )
+            v2rayConfig.routing.rules.add(
+                0, RulesBean(
+                    outboundTag = AppConfig.TAG_PROXY,
+                    inboundTag = arrayListOf(AppConfig.TAG_DNS),
+                    domain = null
                )
-            }
+            )
+
+            v2rayConfig.routing.rules.add(
+                0, RulesBean(
+                    outboundTag = AppConfig.TAG_DIRECT,
+                    inboundTag = arrayListOf(AppConfig.TAG_DOMESTIC_DNS),
+                    domain = null
+                )
+            )
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to configure DNS", e)
            return false
@@ -887,6 +896,24 @@ object V2rayConfigManager {
                    )
                )
            }
+
+            if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch") {
+                v2rayConfig.routing.rules.add(
+                    RulesBean(
+                        ip = arrayListOf("0.0.0.0/0", "::/0"),
+                        balancerTag = "proxy-round",
+                        type = "field"
+                    )
+                )
+            } else {
+                v2rayConfig.routing.rules.add(
+                    RulesBean(
+                        network = "tcp,udp",
+                        balancerTag = "proxy-round",
+                        type = "field"
+                    )
+                )
+            }
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to configure balance", e)
        }
@@ -984,14 +1011,22 @@ object V2rayConfigManager {
            if (domain.isNullOrEmpty()) continue

            if (newHosts.containsKey(domain)) {
-                item.ensureSockopt().domainStrategy = if (preferIpv6) "UseIPv6v4" else "UseIPv4v6"
+                item.ensureSockopt().domainStrategy = "UseIP"
+                item.ensureSockopt().happyEyeballs = StreamSettingsBean.happyEyeballsBean(
+                    prioritizeIPv6 = preferIpv6,
+                    interleave = 2
+                )
                continue
            }

            val resolvedIps = HttpUtil.resolveHostToIP(domain, preferIpv6)
            if (resolvedIps.isNullOrEmpty()) continue

-            item.ensureSockopt().domainStrategy = if (preferIpv6) "UseIPv6v4" else "UseIPv4v6"
+            item.ensureSockopt().domainStrategy = "UseIP"
+            item.ensureSockopt().happyEyeballs = StreamSettingsBean.happyEyeballsBean(
+                prioritizeIPv6 = preferIpv6,
+                interleave = 2
+            )
            newHosts[domain] = if (resolvedIps.size == 1) {
                resolvedIps[0]
            } else {
@@ -1217,6 +1252,7 @@ object V2rayConfigManager {
        val publicKey = profileItem.publicKey
        val shortId = profileItem.shortId
        val spiderX = profileItem.spiderX
+        val mldsa65Verify = profileItem.mldsa65Verify

        streamSettings.security = if (streamSecurity.isEmpty()) null else streamSecurity
        if (streamSettings.security == null) return
@@ -1228,6 +1264,7 @@ object V2rayConfigManager {
            publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
            shortId = if (shortId.isNullOrEmpty()) null else shortId,
            spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
+            mldsa65Verify = if (mldsa65Verify.isNullOrEmpty()) null else mldsa65Verify,
        )
        if (streamSettings.security == AppConfig.TLS) {
            streamSettings.tlsSettings = tlsSetting
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager

 class BootReceiver : BroadcastReceiver() {
    /**
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager

 class TaskerReceiver : BroadcastReceiver() {

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt
@@ -10,7 +10,7 @@ import android.os.Build
 import android.widget.RemoteViews
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager

 class WidgetProvider : AppWidgetProvider() {
    /**
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
@@ -13,6 +13,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/TProxyService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/TProxyService.kt
@@ -0,0 +1,94 @@
+package com.v2ray.ang.service
+
+import android.content.Context
+import android.os.ParcelFileDescriptor
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
+import java.io.File
+
+/**
+ * Manages the tun2socks process that handles VPN traffic
+ */
+class TProxyService(
+    private val context: Context,
+    private val vpnInterface: ParcelFileDescriptor,
+    private val isRunningProvider: () -> Boolean,
+    private val restartCallback: () -> Unit
+) : Tun2SocksControl {
+    companion object {
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyStartService(configPath: String, fd: Int)
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyStopService()
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyGetStats(): LongArray?
+
+        init {
+            System.loadLibrary("hev-socks5-tunnel")
+        }
+    }
+
+    /**
+     * Starts the tun2socks process with the appropriate parameters.
+     */
+    override fun startTun2Socks() {
+        Log.i(AppConfig.TAG, "Starting HevSocks5Tunnel via JNI")
+
+        val configContent = buildConfig()
+        val configFile = File(context.filesDir, "hev-socks5-tunnel.yaml").apply {
+            writeText(configContent)
+        }
+        Log.i(AppConfig.TAG, "Config file created: ${configFile.absolutePath}")
+        Log.d(AppConfig.TAG, "Config content:\n$configContent")
+
+        try {
+            Log.i(AppConfig.TAG, "TProxyStartService...")
+            TProxyStartService(configFile.absolutePath, vpnInterface.fd)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "HevSocks5Tunnel exception: ${e.message}")
+        }
+    }
+
+    private fun buildConfig(): String {
+        val socksPort = SettingsManager.getSocksPort()
+        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
+        return buildString {
+            appendLine("tunnel:")
+            appendLine("  mtu: ${SettingsManager.getVpnMtu()}")
+            appendLine("  ipv4: ${vpnConfig.ipv4Client}")
+
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
+                appendLine("  ipv6: '${vpnConfig.ipv6Client}'")
+            }
+
+            appendLine("socks5:")
+            appendLine("  port: ${socksPort}")
+            appendLine("  address: ${AppConfig.LOOPBACK}")
+            appendLine("  udp: 'udp'")
+
+            appendLine("misc:")
+            appendLine("  read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
+            val hevTunLogLevel = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "none"
+            if (hevTunLogLevel != "none") {
+                appendLine("  log-level: $hevTunLogLevel")
+            }
+        }
+    }
+
+    /**
+     * Stops the tun2socks process
+     */
+    override fun stopTun2Socks() {
+        try {
+            Log.i(AppConfig.TAG, "TProxyStopService...")
+            TProxyStopService()
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to stop hev-socks5-tunnel", e)
+        }
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/Tun2SocksControl.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/Tun2SocksControl.kt
@@ -0,0 +1,19 @@
+package com.v2ray.ang.service
+
+/**
+ * Interface that defines the control operations for tun2socks implementations.
+ * 
+ * This interface is implemented by different tunnel solutions like:
+ */
+interface Tun2SocksControl {
+    /**
+     * Starts the tun2socks process with the appropriate parameters.
+     * This initializes the VPN tunnel and connects it to the SOCKS proxy.
+     */
+    fun startTun2Socks()
+    
+    /**
+     * Stops the tun2socks process and cleans up resources.
+     */
+    fun stopTun2Socks()
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/Tun2SocksService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/Tun2SocksService.kt
@@ -0,0 +1,128 @@
+package com.v2ray.ang.service
+
+import android.content.Context
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import android.os.ParcelFileDescriptor
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.io.File
+
+/**
+ * Manages the tun2socks process that handles VPN traffic
+ */
+class Tun2SocksService(
+    private val context: Context,
+    private val vpnInterface: ParcelFileDescriptor,
+    private val isRunningProvider: () -> Boolean,
+    private val restartCallback: () -> Unit
+) : Tun2SocksControl {
+    companion object {
+        private const val TUN2SOCKS = "libtun2socks.so"
+    }
+
+    private lateinit var process: Process
+
+    /**
+     * Starts the tun2socks process with the appropriate parameters.
+     */
+    override fun startTun2Socks() {
+        Log.i(AppConfig.TAG, "Start run $TUN2SOCKS")
+        val socksPort = SettingsManager.getSocksPort()
+        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
+        val cmd = arrayListOf(
+            File(context.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
+            "--netif-ipaddr", vpnConfig.ipv4Router,
+            "--netif-netmask", "255.255.255.252",
+            "--socks-server-addr", "${AppConfig.LOOPBACK}:${socksPort}",
+            "--tunmtu", SettingsManager.getVpnMtu().toString(),
+            "--sock-path", "sock_path",
+            "--enable-udprelay",
+            "--loglevel", "notice"
+        )
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
+            cmd.add("--netif-ip6addr")
+            cmd.add(vpnConfig.ipv6Router)
+        }
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
+            val localDnsPort = Utils.parseInt(
+                MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), 
+                AppConfig.PORT_LOCAL_DNS.toInt()
+            )
+            cmd.add("--dnsgw")
+            cmd.add("${AppConfig.LOOPBACK}:${localDnsPort}")
+        }
+        Log.i(AppConfig.TAG, cmd.toString())
+
+        try {
+            val proBuilder = ProcessBuilder(cmd)
+            proBuilder.redirectErrorStream(true)
+            process = proBuilder
+                .directory(context.filesDir)
+                .start()
+            Thread {
+                Log.i(AppConfig.TAG, "$TUN2SOCKS check")
+                process.waitFor()
+                Log.i(AppConfig.TAG, "$TUN2SOCKS exited")
+                if (isRunningProvider()) {
+                    Log.i(AppConfig.TAG, "$TUN2SOCKS restart")
+                    restartCallback()
+                }
+            }.start()
+            Log.i(AppConfig.TAG, "$TUN2SOCKS process info: $process")
+
+            sendFd()
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to start $TUN2SOCKS process", e)
+        }
+    }
+
+    /**
+     * Sends the file descriptor to the tun2socks process.
+     * Attempts to send the file descriptor multiple times if necessary.
+     */
+    private fun sendFd() {
+        val fd = vpnInterface.fileDescriptor
+        val path = File(context.filesDir, "sock_path").absolutePath
+        Log.i(AppConfig.TAG, "LocalSocket path: $path")
+
+        CoroutineScope(Dispatchers.IO).launch {
+            var tries = 0
+            while (true) try {
+                Thread.sleep(50L shl tries)
+                Log.i(AppConfig.TAG, "LocalSocket sendFd tries: $tries")
+                LocalSocket().use { localSocket ->
+                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
+                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
+                    localSocket.outputStream.write(42)
+                }
+                break
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to send file descriptor, try: $tries", e)
+                if (tries > 5) break
+                tries += 1
+            }
+        }
+    }
+
+    /**
+     * Stops the tun2socks process
+     */
+    override fun stopTun2Socks() {
+        try {
+            Log.i(AppConfig.TAG, "$TUN2SOCKS destroy")
+            if (::process.isInitialized) {
+                process.destroy()
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to destroy $TUN2SOCKS process", e)
+        }
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.IBinder
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper
 import java.lang.ref.SoftReference

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
@@ -9,10 +9,10 @@ import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.PluginServiceManager
 import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.Utils
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
@@ -78,7 +78,7 @@ class V2RayTestService : Service() {

        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
        if (config.configType == EConfigType.HYSTERIA2) {
-            val delay = PluginUtil.realPingHy2(this, config)
+            val delay = PluginServiceManager.realPingHy2(this, config)
            return delay
        } else {
            val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(this, guid)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
@@ -5,8 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
-import android.net.LocalSocket
-import android.net.LocalSocketAddress
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
@@ -21,24 +19,17 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.NotificationManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
 import java.lang.ref.SoftReference

 class V2RayVpnService : VpnService(), ServiceControl {
-    companion object {
-        private const val VPN_MTU = 1500
-        private const val TUN2SOCKS = "libtun2socks.so"
-    }
-
    private lateinit var mInterface: ParcelFileDescriptor
    private var isRunning = false
-    private lateinit var process: Process
+    private var tun2SocksService: Tun2SocksControl? = null

    /**destroy
     * Unfortunately registerDefaultNetworkCallback is going to return our VPN interface: https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
@@ -95,7 +86,7 @@ class V2RayVpnService : VpnService(), ServiceControl {

    override fun onDestroy() {
        super.onDestroy()
-        NotificationService.cancelNotification()
+        NotificationManager.cancelNotification()
    }

    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -111,7 +102,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
    }

    override fun startService() {
-        setup()
+        setupService()
    }

    override fun stopService() {
@@ -134,13 +125,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
     * Sets up the VPN service.
     * Prepares the VPN and configures it if preparation is successful.
     */
-    private fun setup() {
+    private fun setupService() {
        val prepare = prepare(this)
        if (prepare != null) {
            return
        }

-        if (setupVpnService() != true) {
+        if (configureVpnService() != true) {
            return
        }

@@ -151,17 +142,52 @@ class V2RayVpnService : VpnService(), ServiceControl {
     * Configures the VPN service.
     * @return True if the VPN service was configured successfully, false otherwise.
     */
-    private fun setupVpnService(): Boolean {
-        // If the old interface has exactly the same parameters, use it!
-        // Configure a builder while parsing the parameters.
+    private fun configureVpnService(): Boolean {
        val builder = Builder()
-        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
-        //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)

-        builder.setMtu(VPN_MTU)
-        builder.addAddress(vpnConfig.ipv4Client, 30)
-        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+        // Configure network settings (addresses, routing and DNS)
+        configureNetworkSettings(builder)
+
+        // Configure app-specific settings (session name and per-app proxy)
+        configurePerAppProxy(builder)
+
+        // Close the old interface since the parameters have been changed
+        try {
+            mInterface.close()
+        } catch (ignored: Exception) {
+            // ignored
+        }
+
+        // Configure platform-specific features
+        configurePlatformFeatures(builder)
+
+        // Create a new interface using the builder and save the parameters
+        try {
+            mInterface = builder.establish()!!
+            isRunning = true
+            return true
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
+            stopV2Ray()
+        }
+        return false
+    }
+
+    /**
+     * Configures the basic network settings for the VPN.
+     * This includes IP addresses, routing rules, and DNS servers.
+     *
+     * @param builder The VPN Builder to configure
+     */
+    private fun configureNetworkSettings(builder: Builder) {
+        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
        val bypassLan = SettingsManager.routingRulesetsBypassLan()
+
+        // Configure IPv4 settings
+        builder.setMtu(SettingsManager.getVpnMtu())
+        builder.addAddress(vpnConfig.ipv4Client, 30)
+
+        // Configure routing rules
        if (bypassLan) {
            AppConfig.ROUTED_IP_LIST.forEach {
                val addr = it.split('/')
@@ -171,38 +197,37 @@ class V2RayVpnService : VpnService(), ServiceControl {
            builder.addRoute("0.0.0.0", 0)
        }

+        // Configure IPv6 if enabled
        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
            builder.addAddress(vpnConfig.ipv6Client, 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
+                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)
            }
        }

-//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-//        } else {
-        SettingsManager.getVpnDnsServers()
-            .forEach {
-                if (Utils.isPureIpAddress(it)) {
-                    builder.addDnsServer(it)
-                }
+        // Configure DNS servers
+        //if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+        //  builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+        //} else {
+        SettingsManager.getVpnDnsServers().forEach {
+            if (Utils.isPureIpAddress(it)) {
+                builder.addDnsServer(it)
            }
-//        }
-
-        builder.setSession(V2RayServiceManager.getRunningServerName())
-
-        configurePerAppProxy(builder)
-
-        // Close the old interface since the parameters have been changed.
-        try {
-            mInterface.close()
-        } catch (ignored: Exception) {
-            // ignored
        }

+        builder.setSession(V2RayServiceManager.getRunningServerName())
+    }
+
+    /**
+     * Configures platform-specific VPN features for different Android versions.
+     *
+     * @param builder The VPN Builder to configure
+     */
+    private fun configurePlatformFeatures(builder: Builder) {
+        // Android P (API 28) and above: Configure network callbacks
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            try {
                connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
@@ -211,24 +236,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
            }
        }

+        // Android Q (API 29) and above: Configure metering and HTTP proxy
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            builder.setMetered(false)
            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
            }
        }
-
-        // Create a new interface using the builder and save the parameters.
-        try {
-            mInterface = builder.establish()!!
-            isRunning = true
-            return true
-        } catch (e: Exception) {
-            // non-nullable lateinit var
-            Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
-            stopV2Ray()
-        }
-        return false
    }

    /**
@@ -281,80 +295,23 @@ 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 vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
-        val cmd = arrayListOf(
-            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-            "--netif-ipaddr", vpnConfig.ipv4Router,
-            "--netif-netmask", "255.255.255.252",
-            "--socks-server-addr", "$LOOPBACK:${socksPort}",
-            "--tunmtu", VPN_MTU.toString(),
-            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
-            "--enable-udprelay",
-            "--loglevel", "notice"
-        )
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
-            cmd.add("--netif-ip6addr")
-            cmd.add(vpnConfig.ipv6Router)
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL) == true) {
+            tun2SocksService = TProxyService(
+                context = applicationContext,
+                vpnInterface = mInterface,
+                isRunningProvider = { isRunning },
+                restartCallback = { runTun2socks() }
+            )
+        } else {
+            tun2SocksService = Tun2SocksService(
+                context = applicationContext,
+                vpnInterface = mInterface,
+                isRunningProvider = { isRunning },
+                restartCallback = { runTun2socks() }
+            )
        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
-            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
-            cmd.add("--dnsgw")
-            cmd.add("$LOOPBACK:${localDnsPort}")
-        }
-        Log.i(AppConfig.TAG, cmd.toString())

-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(applicationContext.filesDir)
-                .start()
-            Thread {
-                Log.i(AppConfig.TAG, "$TUN2SOCKS check")
-                process.waitFor()
-                Log.i(AppConfig.TAG, "$TUN2SOCKS exited")
-                if (isRunning) {
-                    Log.i(AppConfig.TAG, "$TUN2SOCKS restart")
-                    runTun2socks()
-                }
-            }.start()
-            Log.i(AppConfig.TAG, "$TUN2SOCKS process info : ${process.toString()}")
-
-            sendFd()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to start $TUN2SOCKS process", e)
-        }
-    }
-
-    /**
-     * Sends the file descriptor to the tun2socks process.
-     * Attempts to send the file descriptor multiple times if necessary.
-     */
-    private fun sendFd() {
-        val fd = mInterface.fileDescriptor
-        val path = File(applicationContext.filesDir, "sock_path").absolutePath
-        Log.i(AppConfig.TAG, "LocalSocket path : $path")
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var tries = 0
-            while (true) try {
-                Thread.sleep(50L shl tries)
-                Log.i(AppConfig.TAG, "LocalSocket sendFd tries: $tries")
-                LocalSocket().use { localSocket ->
-                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
-                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
-                    localSocket.outputStream.write(42)
-                }
-                break
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to send file descriptor, try: $tries", e)
-                if (tries > 5) break
-                tries += 1
-            }
-        }
+        tun2SocksService?.startTun2Socks()
    }

    /**
@@ -375,12 +332,8 @@ class V2RayVpnService : VpnService(), ServiceControl {
            }
        }

-        try {
-            Log.i(AppConfig.TAG, "$TUN2SOCKS destroy")
-            process.destroy()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to destroy $TUN2SOCKS process", e)
-        }
+        tun2SocksService?.stopTun2Socks()
+        tun2SocksService = null

        V2RayServiceManager.stopCoreLoop()

@@ -400,3 +353,4 @@ class V2RayVpnService : VpnService(), ServiceControl {
        }
    }
 }
+
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -38,7 +38,7 @@ import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MigrateManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
 import kotlinx.coroutines.Dispatchers
@@ -386,6 +386,9 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        }

        R.id.intelligent_selection_all -> {
+            if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") != "0") {
+                toast(getString(R.string.pre_resolving_domain))
+            }
            mainViewModel.createIntelligentSelectionAll()
            true
        }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -26,7 +26,7 @@ import com.v2ray.ang.handler.AngConfigManager
 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 com.v2ray.ang.handler.V2RayServiceManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
@@ -56,8 +56,14 @@ class PerAppProxyActivity : BaseActivity() {
                        appsList.sortedWith { p1, p2 ->
                            when {
                                p1.isSelected > p2.isSelected -> -1
-                                p1.isSelected == p2.isSelected -> 0
-                                else -> 1
+                                p1.isSelected < p2.isSelected -> 1
+                                p1.isSystemApp > p2.isSystemApp -> 1
+                                p1.isSystemApp < p2.isSystemApp -> -1
+                                p1.appName.lowercase() > p2.appName.lowercase() -> 1
+                                p1.appName.lowercase() < p2.appName.lowercase() -> -1
+                                p1.packageName > p2.packageName -> 1
+                                p1.packageName < p2.packageName -> -1
+                                else -> 0
                            }
                        }
                    } else {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt
@@ -2,7 +2,7 @@ package com.v2ray.ang.ui

 import android.os.Bundle
 import com.v2ray.ang.R
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager

 class ScSwitchActivity : BaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
@@ -117,6 +117,8 @@ class ServerActivity : BaseActivity() {
    private val container_short_id: LinearLayout? by lazy { findViewById(R.id.lay_short_id) }
    private val et_spider_x: EditText? by lazy { findViewById(R.id.et_spider_x) }
    private val container_spider_x: LinearLayout? by lazy { findViewById(R.id.lay_spider_x) }
+    private val et_mldsa65_verify: EditText? by lazy { findViewById(R.id.et_mldsa65_verify) }
+    private val container_mldsa65_verify: LinearLayout? by lazy { findViewById(R.id.lay_mldsa65_verify) }
    private val et_reserved1: EditText? by lazy { findViewById(R.id.et_reserved1) }
    private val et_local_address: EditText? by lazy { findViewById(R.id.et_local_address) }
    private val et_local_mtu: EditText? by lazy { findViewById(R.id.et_local_mtu) }
@@ -253,9 +255,14 @@ class ServerActivity : BaseActivity() {
                    // Case 1: Null or blank
                    isBlank -> {
                        listOf(
-                            container_sni, container_fingerprint, container_alpn,
-                            container_allow_insecure, container_public_key,
-                            container_short_id, container_spider_x
+                            container_sni,
+                            container_fingerprint,
+                            container_alpn,
+                            container_allow_insecure,
+                            container_public_key,
+                            container_short_id,
+                            container_spider_x,
+                            container_mldsa65_verify
                        ).forEach { it?.visibility = View.GONE }
                    }

@@ -270,7 +277,8 @@ class ServerActivity : BaseActivity() {
                        listOf(
                            container_public_key,
                            container_short_id,
-                            container_spider_x
+                            container_spider_x,
+                            container_mldsa65_verify
                        ).forEach { it?.visibility = View.GONE }
                    }

@@ -284,7 +292,8 @@ class ServerActivity : BaseActivity() {
                        listOf(
                            container_public_key,
                            container_short_id,
-                            container_spider_x
+                            container_spider_x,
+                            container_mldsa65_verify
                        ).forEach { it?.visibility = View.VISIBLE }
                    }
                }
@@ -366,9 +375,12 @@ class ServerActivity : BaseActivity() {
                if (allowinsecure >= 0) {
                    sp_allow_insecure?.setSelection(allowinsecure)
                }
-                container_public_key?.visibility = View.GONE
-                container_short_id?.visibility = View.GONE
-                container_spider_x?.visibility = View.GONE
+                listOf(
+                    container_public_key,
+                    container_short_id,
+                    container_spider_x,
+                    container_mldsa65_verify
+                ).forEach { it?.visibility = View.GONE }
            } else if (config.security == REALITY) {
                container_public_key?.visibility = View.VISIBLE
                et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
@@ -376,18 +388,23 @@ class ServerActivity : BaseActivity() {
                et_short_id?.text = Utils.getEditable(config.shortId.orEmpty())
                container_spider_x?.visibility = View.VISIBLE
                et_spider_x?.text = Utils.getEditable(config.spiderX.orEmpty())
+                container_mldsa65_verify?.visibility = View.VISIBLE
+                et_mldsa65_verify?.text = Utils.getEditable(config.mldsa65Verify.orEmpty())
                container_allow_insecure?.visibility = View.GONE
            }
        }

        if (config.security.isNullOrEmpty()) {
-            container_sni?.visibility = View.GONE
-            container_fingerprint?.visibility = View.GONE
-            container_alpn?.visibility = View.GONE
-            container_allow_insecure?.visibility = View.GONE
-            container_public_key?.visibility = View.GONE
-            container_short_id?.visibility = View.GONE
-            container_spider_x?.visibility = View.GONE
+            listOf(
+                container_sni,
+                container_fingerprint,
+                container_alpn,
+                container_allow_insecure,
+                container_public_key,
+                container_short_id,
+                container_spider_x,
+                container_mldsa65_verify
+            ).forEach { it?.visibility = View.GONE }
        }
        val network = Utils.arrayFind(networks, config.network.orEmpty())
        if (network >= 0) {
@@ -550,6 +567,7 @@ class ServerActivity : BaseActivity() {
        val publicKey = et_public_key?.text?.toString()
        val shortId = et_short_id?.text?.toString()
        val spiderX = et_spider_x?.text?.toString()
+        val mldsa65Verify = et_mldsa65_verify?.text?.toString()

        val allowInsecure =
            if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
@@ -566,6 +584,7 @@ class ServerActivity : BaseActivity() {
        config.publicKey = publicKey
        config.shortId = shortId
        config.spiderX = spiderX
+        config.mldsa65Verify = mldsa65Verify
    }

    private fun transportTypes(network: String?): Array<out String> {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
@@ -18,7 +18,7 @@ import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toLongEx
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.service.SubscriptionUpdater
+import com.v2ray.ang.handler.SubscriptionUpdater
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.SettingsViewModel
 import java.util.concurrent.TimeUnit
@@ -45,6 +45,7 @@ class SettingsActivity : BaseActivity() {
        private val vpnDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_DNS) }
        private val vpnBypassLan by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_BYPASS_LAN) }
        private val vpnInterfaceAddress by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX) }
+        private val vpnMtu by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_MTU) }

        private val mux by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_MUX_ENABLED) }
        private val muxConcurrency by lazy { findPreference<EditTextPreference>(AppConfig.PREF_MUX_CONCURRENCY) }
@@ -66,6 +67,10 @@ class SettingsActivity : BaseActivity() {
        private val delayTestUrl by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DELAY_TEST_URL) }
        private val mode by lazy { findPreference<ListPreference>(AppConfig.PREF_MODE) }

+        private val hevTunLogLevel by lazy { findPreference<ListPreference>(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) }
+        private val hevTunRwTimeout by lazy { findPreference<EditTextPreference>(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) }
+        private val useHevTun by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_USE_HEV_TUNNEL) }
+
        override fun onCreatePreferences(bundle: Bundle?, s: String?) {
            addPreferencesFromResource(R.xml.pref_settings)

@@ -89,6 +94,12 @@ class SettingsActivity : BaseActivity() {
                true
            }

+            vpnMtu?.setOnPreferenceChangeListener { _, any ->
+                val nval = any as String
+                vpnMtu?.summary = if (TextUtils.isEmpty(nval)) AppConfig.VPN_MTU.toString() else nval
+                true
+            }
+
            mux?.setOnPreferenceChangeListener { _, newValue ->
                updateMux(newValue as Boolean)
                true
@@ -172,6 +183,16 @@ class SettingsActivity : BaseActivity() {
            mode?.dialogLayoutResource = R.layout.preference_with_help_link
            //loglevel.summary = "LogLevel"

+            useHevTun?.setOnPreferenceChangeListener { _, newValue ->
+                updateHevTunSettings(newValue as Boolean)
+                true
+            }
+
+            hevTunRwTimeout?.setOnPreferenceChangeListener { _, any ->
+                val nval = any as String
+                hevTunRwTimeout?.summary = if (TextUtils.isEmpty(nval)) AppConfig.HEVTUN_RW_TIMEOUT else nval
+                true
+            }
        }

        override fun onStart() {
@@ -182,6 +203,7 @@ class SettingsActivity : BaseActivity() {
            appendHttpProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY, false)
            localDnsPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
            vpnDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
+            vpnMtu?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_MTU, AppConfig.VPN_MTU.toString())

            updateMux(MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false))
            mux?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
@@ -205,6 +227,9 @@ class SettingsActivity : BaseActivity() {
            dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)

+            updateHevTunSettings(MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL, false))
+            hevTunRwTimeout?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT, AppConfig.HEVTUN_RW_TIMEOUT)
+
            initSharedPreference()
        }

@@ -212,6 +237,7 @@ class SettingsActivity : BaseActivity() {
            listOf(
                localDnsPort,
                vpnDns,
+                vpnMtu,
                muxConcurrency,
                muxXudpConcurrency,
                fragmentLength,
@@ -220,7 +246,8 @@ class SettingsActivity : BaseActivity() {
                socksPort,
                remoteDns,
                domesticDns,
-                delayTestUrl
+                delayTestUrl,
+                hevTunRwTimeout
            ).forEach { key ->
                key?.text = key?.summary.toString()
            }
@@ -242,7 +269,8 @@ class SettingsActivity : BaseActivity() {
                AppConfig.PREF_DOUBLE_COLUMN_DISPLAY,
                AppConfig.PREF_PREFER_IPV6,
                AppConfig.PREF_PROXY_SHARING,
-                AppConfig.PREF_ALLOW_INSECURE
+                AppConfig.PREF_ALLOW_INSECURE,
+                AppConfig.PREF_USE_HEV_TUNNEL
            ).forEach { key ->
                findPreference<CheckBoxPreference>(key)?.isChecked =
                    MmkvManager.decodeSettingsBool(key, false)
@@ -259,7 +287,8 @@ class SettingsActivity : BaseActivity() {
                AppConfig.PREF_LOGLEVEL,
                AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD,
                AppConfig.PREF_INTELLIGENT_SELECTION_METHOD,
-                AppConfig.PREF_MODE
+                AppConfig.PREF_MODE,
+                AppConfig.PREF_HEV_TUNNEL_LOGLEVEL
            ).forEach { key ->
                if (MmkvManager.decodeSettingsString(key) != null) {
                    findPreference<ListPreference>(key)?.value = MmkvManager.decodeSettingsString(key)
@@ -278,6 +307,7 @@ class SettingsActivity : BaseActivity() {
            vpnDns?.isEnabled = vpn
            vpnBypassLan?.isEnabled = vpn
            vpnInterfaceAddress?.isEnabled = vpn
+            vpnMtu?.isEnabled = vpn
            if (vpn) {
                updateLocalDns(
                    MmkvManager.decodeSettingsBool(
@@ -365,6 +395,11 @@ class SettingsActivity : BaseActivity() {
        private fun updateFragmentInterval(value: String?) {
            fragmentInterval?.summary = value.toString()
        }
+
+        private fun updateHevTunSettings(enabled: Boolean) {
+            hevTunLogLevel?.isEnabled = enabled
+            hevTunRwTimeout?.isEnabled = enabled
+        }
    }

    fun onModeHelpClicked(view: View) {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
@@ -12,7 +12,9 @@ import java.net.IDN
 import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
+import java.net.MalformedURLException
 import java.net.Proxy
+import java.net.URI
 import java.net.URL

 object HttpUtil {
@@ -140,7 +142,7 @@ object HttpUtil {
            val responseCode = conn.responseCode
            when (responseCode) {
                in 300..399 -> {
-                    val location = conn.getHeaderField("Location")
+                    val location = resolveLocation(conn)
                    conn.disconnect()
                    if (location.isNullOrEmpty()) {
                        throw IOException("Redirect location not found")
@@ -219,5 +221,29 @@ object HttpUtil {
        }
        return conn
    }
+
+    // Returns absolute URL string location header sets
+    fun resolveLocation(conn: HttpURLConnection): String? {
+        val raw = conn.getHeaderField("Location")?.trim()?.takeIf { it.isNotEmpty() } ?: return null
+
+        // Try check url is relative or absolute
+        return try {
+            val locUri = URI(raw)
+            val baseUri = conn.url.toURI()
+            val resolved = if (locUri.isAbsolute) locUri else baseUri.resolve(locUri)
+            resolved.toURL().toString()
+        } catch (_: Exception) {
+            // Fallback: url resolver, also should handles //host/...
+            try {
+                URL(raw).toString() // absolute with protocol
+            } catch (_: MalformedURLException) {
+                try {
+                    URL(conn.url, raw).toString()
+                } catch (_: MalformedURLException) {
+                    null
+                }
+            }
+        }
+    }
 }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
@@ -42,6 +42,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.PREF_VPN_DNS,
            AppConfig.PREF_VPN_BYPASS_LAN,
            AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX,
+            AppConfig.PREF_VPN_MTU,
            AppConfig.PREF_REMOTE_DNS,
            AppConfig.PREF_DOMESTIC_DNS,
            AppConfig.PREF_DNS_HOSTS,
@@ -59,6 +60,8 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.PREF_FRAGMENT_LENGTH,
            AppConfig.PREF_FRAGMENT_INTERVAL,
            AppConfig.PREF_MUX_XUDP_QUIC,
+            AppConfig.PREF_HEV_TUNNEL_LOGLEVEL,
+            AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT
                -> {
                MmkvManager.encodeSettings(key, sharedPreferences.getString(key, ""))
            }
@@ -80,6 +83,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.SUBSCRIPTION_AUTO_UPDATE,
            AppConfig.PREF_FRAGMENT_ENABLED,
            AppConfig.PREF_MUX_ENABLED,
+            AppConfig.PREF_USE_HEV_TUNNEL
                -> {
                MmkvManager.encodeSettings(key, sharedPreferences.getBoolean(key, false))
            }
--- a/V2rayNG/app/src/main/res/layout/layout_tls.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls.xml
@@ -178,4 +178,25 @@
            android:nextFocusDown="@+id/sp_stream_fingerprint" />

    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/lay_mldsa65_verify"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/padding_spacing_dp16"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_mldsa65_verify" />
+
+        <EditText
+            android:id="@+id/et_mldsa65_verify"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:nextFocusDown="@+id/sp_stream_fingerprint" />
+
+    </LinearLayout>
 </LinearLayout>
--- a/V2rayNG/app/src/main/res/values-ar/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ar/strings.xml
@@ -81,6 +81,7 @@
    <string name="server_lab_preshared_key">PreSharedKey(optional)</string>
    <string name="server_lab_short_id" translatable="false">المعرّف القصير</string>
    <string name="server_lab_spider_x" translatable="false">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key" translatable="false">المفتاح السري</string>
    <string name="server_lab_reserved">محجوز (اختياري)</string>
    <string name="server_lab_local_address">العنوان المحلي (اختياري IPv4/IPv6، مفصولة بفواصل)</string>
@@ -183,6 +184,7 @@
    <string name="title_pref_vpn_bypass_lan">Does VPN bypass LAN</string>

    <string name="title_pref_vpn_interface_address">VPN Interface Address</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>

    <string name="title_pref_domestic_dns">DNS المحلي (اختياري)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -247,6 +249,10 @@
    <string name="title_language">اللغة</string>
    <string name="title_ui_settings">إعدادات واجهة المستخدم</string>
    <string name="title_pref_ui_mode_night">إعدادات وضع واجهة المستخدم ليلاً</string>
+    <string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
+    <string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">نسخ</string>
@@ -371,5 +377,6 @@
        <item>Least Ping</item>
        <item>Least Load</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-bn/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bn/strings.xml
@@ -80,6 +80,7 @@
    <string name="server_lab_preshared_key">PreSharedKey(optional)</string>
    <string name="server_lab_short_id" translatable="false">শর্ট আইডি</string>
    <string name="server_lab_spider_x" translatable="false">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key" translatable="false">সিক্রেট কী</string>
    <string name="server_lab_reserved">সংরক্ষিত (ঐচ্ছিক)</string>
    <string name="server_lab_local_address">স্থানীয় ঠিকানা (ঐচ্ছিক IPv4/IPv6, কমা দ্বারা পৃথক করা)</string>
@@ -183,6 +184,7 @@
    <string name="title_pref_vpn_bypass_lan">Does VPN bypass LAN</string>

    <string name="title_pref_vpn_interface_address">VPN Interface Address</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>

    <string name="title_pref_domestic_dns">ঘরোয়া DNS (ঐচ্ছিক)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -247,6 +249,10 @@
    <string name="title_language">ভাষা</string>
    <string name="title_ui_settings">ইউআই সেটিংস</string>
    <string name="title_pref_ui_mode_night">ইউআই মোড সেটিংস</string>
+    <string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
+    <string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>

    <string name="title_logcat">লগক্যাট</string>
    <string name="logcat_copy">কপি করুন</string>
@@ -376,5 +382,6 @@
        <item>Least Ping</item>
        <item>Least Load</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
@@ -80,6 +80,7 @@
    <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_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">کیلیت سیخومی</string>
    <string name="server_lab_reserved">Reserved(اختیاری، وا کاما ز یک جوڌا ابۊن)</string>
    <string name="server_lab_local_address">نشۊوی مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن)</string>
@@ -183,6 +184,7 @@
    <string name="title_pref_vpn_bypass_lan">VPN ز شبکه مهلی اگوڌرته؟</string>

    <string name="title_pref_vpn_interface_address">نشۊوی رابت VPN</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>

    <string name="title_pref_domestic_dns">DNS منی (اختیاری)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -221,7 +223,7 @@
    <!-- AboutActivity -->
    <string name="title_pref_feedback">فشناڌن منشڌ</string>
    <string name="summary_pref_feedback">فشناڌن منشڌ یا داسووݩ موشکلا من Github</string>
-    <string name="summary_pref_tg_group">ٱووڌن من جرگه تلگرام</string>
+    <string name="summary_pref_tg_group">ٱووڌن من بونکۊ تلگرام</string>
    <string name="toast_tg_app_not_found">برنومه تلگرامن نجوست</string>
    <string name="title_privacy_policy">هریم سیخومی</string>
    <string name="title_about">زبار</string>
@@ -247,16 +249,20 @@
    <string name="title_language">زووݩ</string>
    <string name="title_ui_settings">سامووا رابت منتوری</string>
    <string name="title_pref_ui_mode_night">سامووا هالت رابت منتوری</string>
+    <string name="title_pref_use_hev_tunnel">فعال کردن ویژیی نۊ TUN</string>
+    <string name="summary_pref_use_hev_tunnel">ٱر ک فعال بۊ، TUN ایا hev-socks5-tunnel ن و کار اگره؛ ٱندی ز badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">Hev Tun سئت گوزارشا</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Hev Tun زمووݩ مندیر بیڌن خوندن وو هؽل کردن (میلی سانیه، پؽش فرز 300000)</string>

    <string name="title_logcat">داسووا</string>
    <string name="logcat_copy">لف گیری</string>
    <string name="logcat_clear">روفتن</string>
    <string name="title_service_restart">ر وندن دووارته خدمات</string>
-    <string name="title_del_all_config">پاک کردن پوی کانفیگا جرگه سکویی</string>
-    <string name="title_del_duplicate_config">پاک کردن کانفیگا تکراری جرگه سکویی</string>
-    <string name="title_del_invalid_config">پاک کردن کانفیگا نا موئتبر جرگه سکویی</string>
-    <string name="title_export_all">و در کشیڌن کانفیگا غیر سفارشی جرگه سکویی من کلیپ بورد</string>
-    <string name="title_sub_setting">سامووا جرگه اشتراک</string>
+    <string name="title_del_all_config">پاک کردن پوی کانفیگا بونکۊ سکویی</string>
+    <string name="title_del_duplicate_config">پاک کردن کانفیگا تکراری بونکۊ سکویی</string>
+    <string name="title_del_invalid_config">پاک کردن کانفیگا نا موئتبر بونکۊ سکویی</string>
+    <string name="title_export_all">و در کشیڌن کانفیگا غیر سفارشی بونکۊ سکویی من کلیپ بورد</string>
+    <string name="title_sub_setting">سامووا بونکۊ اشتراک</string>
    <string name="sub_setting_remarks">نیشتنا</string>
    <string name="sub_setting_url">نشۊوی اینترنتی اختیاری</string>
    <string name="sub_setting_filter">نوم موستعار فیلتر</string>
@@ -266,14 +272,14 @@
    <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_create_intelligent_selection_all_server">وورکل پسند هۊشمند کانفیگ جرگه سکویی</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_create_intelligent_selection_all_server">وورکل پسند هۊشمند کانفیگ بونکۊ سکویی</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>
@@ -383,8 +389,9 @@
    <string name="sub_setting_intelligent_selection_filter">گوڌنا دیاری پسند هۊشمند فیلتر مئمۊلی</string>
    <string name="title_intelligent_selection_method">بارت پسند هۊشمند</string>
    <string-array name="intelligent_selection_method">
-        <item>بلم ترین پینگ</item>
-        <item>هدقل بار</item>
+        <item>کم ترین پینگ</item>
+        <item>کم ترین بار(لود)</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -80,6 +80,7 @@
    <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_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">کلید خصوصی</string>
    <string name="server_lab_reserved">Reserved (اختیاری، جدا شده با کاما)</string>
    <string name="server_lab_local_address">آدرس محلی (IPv4/IPv6 اختیاری، جدا شده با کاما)</string>
@@ -180,7 +181,8 @@
    <string name="title_pref_vpn_dns">VPN DNS (فقط IPv4/v6)</string>
    <string name="title_pref_vpn_bypass_lan">آیا VPN از شبکه محلی عبور می کند؟</string>

-    <string name="title_pref_vpn_interface_address">VPN Interface Address</string>
+    <string name="title_pref_vpn_interface_address">آدرس واسط VPN</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>

    <string name="title_pref_domestic_dns">DNS داخلی (اختیاری)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -244,6 +246,10 @@
    <string name="title_language">زبان</string>
    <string name="title_ui_settings">تنظیمات رابط کاربری</string>
    <string name="title_pref_ui_mode_night">تنظیمات حالت رابط کاربری</string>
+    <string name="title_pref_use_hev_tunnel">فعالسازی قابلیت TUN جدید</string>
+    <string name="summary_pref_use_hev_tunnel">در صورت فعال بودن، TUN از hev-socks5-tunnel استفاده می‌کند؛ در غیر این صورت از badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">سطح گزارشات Hev Tun</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">زمان انتظار خواندن/نوشتن (میلی‌ثانیه، پیش‌فرض ۳۰۰۰۰۰) Hev Tun</string>

    <string name="title_logcat">گزارشات</string>
    <string name="logcat_copy">کپی</string>
@@ -266,7 +272,7 @@
    <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_create_intelligent_selection_all_server">Creating Intelligent Selection Current Group Configuration</string>
+    <string name="title_create_intelligent_selection_all_server">ایجاد کانفیگ انتخاب هوشمند برای گروه فعلی</string>
    <string name="title_user_asset_setting">فایل های منبع جغرافیایی</string>
    <string name="title_sort_by_test_results">مرتب‌ سازی بر اساس نتایج آزمایش</string>
    <string name="title_filter_config">فیلتر کردن کانفیگ‌ها</string>
@@ -378,12 +384,13 @@
        <item>Resolve and add to DNS Hosts</item>
        <item>Resolve and replace domain</item>
    </string-array>
-    <string name="intelligent_selection">Intelligent Selection</string>
-    <string name="sub_setting_intelligent_selection_filter">Remarks Intelligent Selection regular filter</string>
-    <string name="title_intelligent_selection_method">Intelligent Selection Method</string>
+    <string name="intelligent_selection">انتخاب هوشمند</string>
+    <string name="sub_setting_intelligent_selection_filter">فیلتر نام مستعار برای انتخاب هوشمند</string>
+    <string name="title_intelligent_selection_method">روش انتخاب هوشمند</string>
    <string-array name="intelligent_selection_method">
-        <item>Least Ping</item>
-        <item>Least Load</item>
+        <item>کمترین پینگ</item>
+        <item>کمترین بار(لود)</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -80,6 +80,7 @@
    <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_mldsa65_verify">mldsa65Verify</string>
    <string name="server_lab_secret_key">Закрытый ключ</string>
    <string name="server_lab_reserved">Reserved (необязательно, через запятую)</string>
    <string name="server_lab_local_address">Локальный адрес (необязательно, IPv4/IPv6 через запятую)</string>
@@ -181,7 +182,8 @@
    <string name="title_pref_vpn_dns">VPN DNS (только IPv4/v6)</string>
    <string name="title_pref_vpn_bypass_lan">VPN обходит LAN</string>

-    <string name="title_pref_vpn_interface_address">VPN частный IP</string>
+    <string name="title_pref_vpn_interface_address">Адрес интерфейса VPN</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (по умолчанию 1500)</string>

    <string name="title_pref_domestic_dns">Внутренняя DNS (необязательно)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -196,7 +198,7 @@
    <string name="summary_pref_proxy_sharing_enabled">Другие устройства могут подключаться, используя ваш IP-адрес, чтобы использовать локальный прокси. Используйте только в доверенной сети, чтобы избежать несанкционированного подключения.</string>
    <string name="toast_warning_pref_proxysharing_short">Доступ из LAN разрешён, убедитесь, что вы находитесь в доверенной сети</string>

-    <string name="title_pref_allow_insecure">Разрешать небезопасные</string>
+    <string name="title_pref_allow_insecure">Разрешать небезопасные соединения</string>
    <string name="summary_pref_allow_insecure">Для TLS по умолчанию разрешены небезопасные соединения</string>

    <string name="title_pref_socks_port">Порт локального прокси</string>
@@ -240,12 +242,16 @@
    <string name="title_pref_auto_update_interval">Интервал автообновления (минут, не менее 15)</string>

    <string name="title_core_loglevel">Подробность ведения журнала</string>
-    <string name="title_outbound_domain_resolve_method">Предварительное определение исходящего домена</string>
+    <string name="title_outbound_domain_resolve_method">Предопределение исходящего домена</string>
    <string name="title_mode">Режим</string>
    <string name="title_mode_help">Нажмите для получения дополнительной информации</string>
    <string name="title_language">Язык</string>
    <string name="title_ui_settings">Настройки интерфейса</string>
    <string name="title_pref_ui_mode_night">Тема интерфейса</string>
+    <string name="title_pref_use_hev_tunnel">Использовать новую версию TUN</string>
+    <string name="summary_pref_use_hev_tunnel">Если включено, TUN будет использовать hev-socks5-tunnel, иначе будет использоваться badvpn-tun2socks</string>
+    <string name="title_pref_hev_tunnel_loglevel">Подробность журнала HevTun</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Время ожидания чтения/записи HevTun (мс, по умолчанию 300000)</string>

    <string name="title_logcat">Журнал</string>
    <string name="logcat_copy">Копировать</string>
@@ -385,5 +391,6 @@
        <item>Наименьшая задержка</item>
        <item>Наименьшая нагрузка</item>
    </string-array>
+    <string name="pre_resolving_domain">Предварительное определение домена…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-vi/strings.xml
+++ b/V2rayNG/app/src/main/res/values-vi/strings.xml
@@ -80,6 +80,7 @@
    <string name="server_lab_preshared_key">PreSharedKey(optional)</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">SecretKey</string>
    <string name="server_lab_reserved">Reserved (Không bắt buộc)</string>
    <string name="server_lab_local_address">Địa chỉ cục bộ (IPv4 / IPv6, phân cách bằng dấu phẩy)</string>
@@ -183,6 +184,7 @@
    <string name="title_pref_vpn_bypass_lan">Does VPN bypass LAN</string>

    <string name="title_pref_vpn_interface_address">VPN Interface Address</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>

    <string name="title_pref_domestic_dns">DNS nội địa (Không bắt buộc)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -247,6 +249,10 @@
    <string name="title_language">Ngôn ngữ</string>
    <string name="title_ui_settings">Cài đặt UI</string>
    <string name="title_pref_ui_mode_night">Cài đặt chế độ UI</string>
+    <string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
+    <string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">Sao chép</string>
@@ -373,5 +379,6 @@
        <item>Least Ping</item>
        <item>Least Load</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -80,6 +80,7 @@
    <string name="server_lab_preshared_key">PreSharedKey (optional)</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">SecretKey</string>
    <string name="server_lab_reserved">Reserved (可选，逗号隔开)</string>
    <string name="server_lab_local_address">本地地址 (可选 IPv4/IPv6，逗号隔开)</string>
@@ -180,6 +181,7 @@
    <string name="title_pref_vpn_bypass_lan">VPN 是否绕过局域网</string>

    <string name="title_pref_vpn_interface_address">VPN 接口地址</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (默认 1500)</string>

    <string name="title_pref_domestic_dns">境内 DNS (可选)</string>
    <string name="summary_pref_domestic_dns">DNS</string>
@@ -244,6 +246,10 @@
    <string name="title_language">语言</string>
    <string name="title_ui_settings">用户界面设置</string>
    <string name="title_pref_ui_mode_night">界面颜色设置</string>
+    <string name="title_pref_use_hev_tunnel">启用新的 TUN 功能</string>
+    <string name="summary_pref_use_hev_tunnel">选择启用后 TUN 将使用 hev-socks5-tunnel 否则使用 badvpn-tun2socks</string>
+    <string name="title_pref_hev_tunnel_loglevel">HevTun 日志级别</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">HevTun 读写超时 (ms, 默认 300000)</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">复制</string>
@@ -377,5 +383,6 @@
        <item>最低延迟</item>
        <item>最稳定</item>
    </string-array>
+    <string name="pre_resolving_domain">预解析域名中…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -80,6 +80,7 @@
    <string name="server_lab_preshared_key">PreSharedKey (optional)</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">SecretKey</string>
    <string name="server_lab_reserved">Reserved (可選，逗號隔開)</string>
    <string name="server_lab_local_address">本機位址 (可選 IPv4/IPv6，逗號隔開)</string>
@@ -182,6 +183,7 @@
    <string name="title_pref_vpn_bypass_lan">VPN 是否繞過區域網</string>

    <string name="title_pref_vpn_interface_address">VPN 介面位址</string>
+    <string name="title_pref_vpn_mtu">VPN MTU (預設 1500)</string>

    <string name="summary_pref_domestic_dns">DNS</string>
    <string name="title_pref_domestic_dns">境内 DNS (可选)</string>
@@ -245,6 +247,10 @@
    <string name="title_language">語言</string>
    <string name="title_ui_settings">介面顏色設定</string>
    <string name="title_pref_ui_mode_night">介面顯示模式</string>
+    <string name="title_pref_use_hev_tunnel">啟用新 TUN 功能</string>
+    <string name="summary_pref_use_hev_tunnel">選擇啟用後，TUN 將使用 hev-socks5-tunnel，否則使用 badvpn-tun2socks。</string>
+    <string name="title_pref_hev_tunnel_loglevel">HevTun 日誌級別</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">HevTun 讀寫逾時 (ms, 預設 300000)</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">複製</string>
@@ -377,5 +383,6 @@
        <item>Least Ping</item>
        <item>Least Load</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/values/arrays.xml
+++ b/V2rayNG/app/src/main/res/values/arrays.xml
@@ -118,6 +118,13 @@
        <item>Proxy only</item>
    </string-array>

+    <string-array name="hev_tunnel_loglevel" translatable="false">
+        <item>none</item>
+        <item>error</item>
+        <item>warn</item>
+        <item>debug</item>
+    </string-array>
+
    <string-array name="flows" translatable="false">
        <item></item>
        <item>xtls-rprx-vision</item>
--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@@ -81,6 +81,7 @@
    <string name="server_lab_preshared_key">PreSharedKey(optional)</string>
    <string name="server_lab_short_id">ShortId</string>
    <string name="server_lab_spider_x">SpiderX</string>
+    <string name="server_lab_mldsa65_verify">Mldsa65Verify</string>
    <string name="server_lab_secret_key">SecretKey</string>
    <string name="server_lab_reserved">Reserved(Optional, separated by commas)</string>
    <string name="server_lab_local_address">Local address (optional IPv4/IPv6, separated by commas)</string>
@@ -185,6 +186,9 @@

    <string name="title_pref_vpn_interface_address">VPN Interface Address</string>

+    <string name="title_pref_vpn_mtu">VPN MTU (default 1500)</string>
+
+
    <string name="title_pref_domestic_dns">Domestic DNS (Optional)</string>
    <string name="summary_pref_domestic_dns">DNS</string>

@@ -248,6 +252,10 @@
    <string name="title_language">Language</string>
    <string name="title_ui_settings">UI settings</string>
    <string name="title_pref_ui_mode_night">UI mode settings</string>
+    <string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
+    <string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
+    <string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
+    <string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>

    <string name="title_logcat">Logcat</string>
    <string name="logcat_copy">Copy</string>
@@ -387,5 +395,6 @@
        <item>Least Ping</item>
        <item>Least Load</item>
    </string-array>
+    <string name="pre_resolving_domain">Pre-resolving domain…</string>

 </resources>
--- a/V2rayNG/app/src/main/res/xml/pref_settings.xml
+++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml
@@ -13,6 +13,7 @@
        android:key="pref_route_only_enabled"
        android:summary="@string/summary_pref_route_only_enabled"
        android:title="@string/title_pref_route_only_enabled" />
+
    <CheckBoxPreference
        android:key="pref_is_booted"
        android:summary="@string/summary_pref_is_booted"
@@ -70,6 +71,31 @@
            android:key="pref_vpn_interface_address_config_index"
            android:summary="%s"
            android:title="@string/title_pref_vpn_interface_address" />
+
+        <EditTextPreference
+            android:inputType="number"
+            android:key="pref_vpn_mtu"
+            android:summary="1500"
+            android:title="@string/title_pref_vpn_mtu" />
+
+        <CheckBoxPreference
+            android:key="pref_use_hev_tunnel"
+            android:summary="@string/summary_pref_use_hev_tunnel"
+            android:title="@string/title_pref_use_hev_tunnel" />
+
+        <ListPreference
+            android:defaultValue="none"
+            android:entries="@array/hev_tunnel_loglevel"
+            android:entryValues="@array/hev_tunnel_loglevel"
+            android:key="pref_hev_tunnel_loglevel"
+            android:summary="%s"
+            android:title="@string/title_pref_hev_tunnel_loglevel" />
+
+        <EditTextPreference
+            android:inputType="number"
+            android:key="pref_hev_tunnel_rw_timeout"
+            android:summary="300000"
+            android:title="@string/title_pref_hev_tunnel_rw_timeout" />
    </PreferenceCategory>

    <PreferenceCategory android:title="@string/title_ui_settings">
@@ -254,7 +280,7 @@
            android:key="pref_mode"
            android:summary="%s"
            android:title="@string/title_mode" />
+
    </PreferenceCategory>

-
 </PreferenceScreen>
--- a/V2rayNG/gradle/libs.versions.toml
+++ b/V2rayNG/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-agp = "8.10.1"
+agp = "8.12.1"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
-kotlin = "2.1.21"
+kotlin = "2.2.10"
 coreKtx = "1.16.0"
 junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
 appcompat = "1.7.1"
 material = "1.12.0"
 activity = "1.10.1"
 constraintlayout = "2.2.1"
-mmkvStatic = "1.3.12"
+mmkvStatic = "1.3.14"
 gson = "2.12.1"
 quickieFoss = "1.14.0"
 kotlinxCoroutinesAndroid = "1.10.2"
@@ -20,8 +20,8 @@ swiperefreshlayout = "1.1.0"
 toasty = "1.5.2"
 editorkit = "2.9.0"
 core = "3.5.3"
-workRuntimeKtx = "2.10.2"
-lifecycleViewmodelKtx = "2.9.1"
+workRuntimeKtx = "2.10.3"
+lifecycleViewmodelKtx = "2.9.2"
 multidex = "2.0.1"
 mockitoMockitoInline = "5.2.0"
 flexbox = "3.0.0"
--- a/V2rayNG/gradle/wrapper/gradle-wrapper.properties
+++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Nov 14 12:42:51 BDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/compile-tun2socks.sh
+++ b/compile-tun2socks.sh
@@ -30,3 +30,29 @@ $NDK_HOME/ndk-build \
 cp -r $TMPDIR/libs $__dir/
 popd
 rm -rf $TMPDIR
+
+#build hev-socks5-tunnel
+HEVTUN_TMP=$(mktemp -d)
+trap 'rm -rf "$HEVTUN_TMP"' EXIT
+
+mkdir -p "$HEVTUN_TMP/jni"
+pushd "$HEVTUN_TMP"
+
+echo 'include $(call all-subdir-makefiles)' > jni/Android.mk
+
+ln -s "$__dir/hev-socks5-tunnel" jni/hev-socks5-tunnel
+
+"$NDK_HOME/ndk-build" \
+    NDK_PROJECT_PATH=. \
+    APP_BUILD_SCRIPT=jni/Android.mk \
+	"APP_ABI=armeabi-v7a arm64-v8a x86 x86_64" \
+	APP_PLATFORM=android-21 \
+    NDK_LIBS_OUT="$HEVTUN_TMP/libs" \
+    NDK_OUT="$HEVTUN_TMP/obj" \
+    "APP_CFLAGS=-O3 -DPKGNAME=com/v2ray/ang/service" \
+    "APP_LDFLAGS=-WI,--build-id=none -WI,--hash-style=gnu" \
+
+cp -r "$HEVTUN_TMP/libs/"* "$__dir/libs/"
+popd
+
+rm -rf "$HEVTUN_TMP"
--- a/1
+++ b/1
--- a/2
+++ b/2
Author	SHA1	Message	Date
2dust	6632ba3b6e	Update libs.versions.toml	2025-08-25 18:39:00 +08:00
2dust	bd582f1d90	Update libs.versions.toml	2025-08-25 18:32:15 +08:00
Evgenii Pravda	f5f1e12565	Reasonable app sorting order (#4869 )	2025-08-25 17:49:24 +08:00
2dust	207d6f4f8c	Revert "Update build.yml" This reverts commit `fc0e60a097`.	2025-08-17 11:15:48 +08:00
2dust	52e0a19826	up 1.10.19	2025-08-17 10:22:04 +08:00
2dust	fc0e60a097	Update build.yml	2025-08-17 09:41:41 +08:00
Hossin Asaadi	65d6b4aaa8	fix redirect infinite loop (#4857 )	2025-08-17 09:27:22 +08:00
Hossin Asaadi	7b11755e7f	IPv6 Unreachability Fallback for TLS Configs (#4846 ) * fix unreachable ipv6 fallback * add UseIP domainStrategy * fix DNS query loop	2025-08-16 14:34:53 +08:00
fuilloi	2d0de4860c	fix (#4855 )	2025-08-16 14:06:35 +08:00
solokot	7406ef16ff	Update Russian translation (#4845 )	2025-08-14 17:33:24 +08:00
DHR60	a084b21d50	Improves intelligent selection toast and DNS routing (#4838 ) * Improves intelligent selection toast and DNS routing * rename	2025-08-13 16:59:22 +08:00
2dust	bf01fe2bdb	up 1.10.18	2025-08-13 08:48:33 +08:00
Skh-web6982	519cc2a4b5	Bump actions/checkout from 4 to 5 (#4837 ) Bump actions/checkout from 4 to 5	2025-08-13 08:38:18 +08:00
Tamim Hossain	c21653d40f	Feat/add mtu in settings (#4836 ) * Added MTU In Settings Added MTU In Settings. Closes #4824 * Update SettingsViewModel.kt	2025-08-13 08:38:07 +08:00
solokot	1919c5e05f	Update Russian translation (#4833 )	2025-08-13 08:37:52 +08:00
2dust	8a17d93882	up 1.10.17	2025-08-12 18:04:41 +08:00
2dust	21ed008c7b	up strings	2025-08-12 18:02:22 +08:00
Tamim Hossain	d83cfa28c2	Added MTU In Settings (#4828 ) Added MTU In Settings. Closes #4824	2025-08-12 17:33:04 +08:00
2dust	d27e2091a7	up 1.10.16	2025-08-09 20:14:11 +08:00
solokot	c545678e47	Update Russian translation (#4823 )	2025-08-09 19:48:31 +08:00
Hossein Abaspanah	05cba9b0fe	Update Luri Bakhtiari translation (#4822 )	2025-08-09 09:17:36 +08:00
Skh-web6982	b472aa0e6b	Update Persian translation (#4821 ) * Update Persian translation * Update strings.xml	2025-08-09 09:17:28 +08:00
2dust	1ad840851a	Adjust settings options	2025-08-08 19:44:03 +08:00
Skh-web6982	ffc74f479c	Update gradle to 9.0.0 (#4820 )	2025-08-08 18:45:08 +08:00
Skh-web6982	81c0087ac1	Update mmkvstatic v1.3.14 (#4819 ) v1.3.14 / 2025-05-13 This is a Long Term Support (LTS) release. This is a hot-fix release for Android/iOS/macOS users. So it is only available on Maven Central and CocoaPods. Android Support 16K pagesize. Fix a potential log callback OOM crash. Upgrade to NDK r28.1 to have full support of 16K pagesize. iOS Retain the callback handler to prevent a potential short-lived callback handler from crashing.	2025-08-08 17:11:24 +08:00
Skh-web6982	97327a0101	Update kotlin version to v2.2.0 (#4818 ) * Update kotlin version to 2.2.0 * Update README.md : Update kotlin version to 2.2.0	2025-08-08 17:04:11 +08:00
fuilloi	6318dd554b	add hevtun option (#4817 )	2025-08-08 17:03:27 +08:00
2dust	785aa7eb8a	up 1.10.15	2025-08-07 09:38:42 +08:00
fuilloi	872e926132	Update V2rayConfigManager.kt (#4813 )	2025-08-07 09:37:06 +08:00
2dust	b278180eb5	up 1.10.14	2025-08-06 19:27:28 +08:00
2dust	ce64ffbf3b	Update hev-socks5-tunnel	2025-08-06 17:46:04 +08:00
2dust	5ad8605a41	Update AndroidLibXrayLite	2025-08-06 17:46:02 +08:00
fuilloi	95f7e99752	fix hev-socks5-tunnel CustomLocalDns route (#4806 ) * fix hev-socks5-tunnel dns route * update	2025-08-06 16:54:04 +08:00
Peyman	f703a41778	Update Persian translation (#4804 )	2025-08-05 19:30:19 +08:00
fuilloi	2251c59c0b	fix type (#4805 )	2025-08-05 18:18:00 +08:00
2dust	edd0ce96b1	remove libhev-socks5-tunnel.so	2025-08-05 18:03:18 +08:00
fuilloi	562283b3cc	ndkbuild hev-socks5-tunnel (#4800 )	2025-08-05 18:00:13 +08:00
solokot	bb04953845	Update Russian translation (#4797 )	2025-08-05 17:13:10 +08:00
Hossein Abaspanah	208a93a917	Update Luri Bakhtiari translation (#4796 )	2025-08-05 17:13:00 +08:00
2dust	92f33ee3f8	up 1.10.13	2025-08-04 20:21:17 +08:00
2dust	084346b348	Update AndroidLibXrayLite	2025-08-04 19:46:45 +08:00
2dust	15de18b736	Add Enable New TUN Feature option When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks	2025-08-04 18:32:16 +08:00
Peyman	b60423d1c0	Update Persian translate (#4791 )	2025-08-04 10:00:28 +08:00
2dust	86e38c6963	up 1.10.12	2025-08-03 17:37:32 +08:00
2dust	9ba4d7e691	Add Mldsa65Verify	2025-08-03 14:13:06 +08:00
2dust	16e72787c9	Optimize V2RayVpnService	2025-08-02 17:39:12 +08:00
2dust	3ffac8b29f	Standardized file naming	2025-08-02 17:06:06 +08:00
2dust	10df1b44ea	Optimize V2RayVpnService add Tun2SocksManager	2025-08-02 16:20:41 +08:00
2dust	fa12878258	Update libs.versions.toml	2025-08-02 16:08:28 +08:00
2dust	0f1ea1e119	Update hysteria	2025-08-02 16:08:15 +08:00
2dust	1959608f24	Update AndroidLibXrayLite	2025-08-02 16:08:04 +08:00
2dust	0e041a6e9a	up 1.10.11	2025-07-26 20:21:01 +08:00
2dust	c78ef380cc	up 1.10.10	2025-07-24 19:34:31 +08:00
2dust	57362a4bde	Update AndroidLibXrayLite	2025-07-24 19:28:19 +08:00
DHR60	7f24ad534f	Fix Intelligent Selection not working (#4767 )	2025-07-24 19:22:15 +08:00