up 2.0.2

https://github.com/2dust/v2rayNG/issues/5172

.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,33 +31,33 @@ 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
+    - name: Restore cached libhevtun
+      id: cache-libhevtun-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: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }}
 
-    - name: Build libtun2socks
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+    - name: Build libhevtun
+      if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true'
       run: |
-        bash compile-tun2socks.sh
-
-    - name: Save libtun2socks
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+        bash compile-hevtun.sh
+    
+    - name: Save libhevtun
+      if: steps.cache-libhevtun-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: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }}
 
-    - name: Copy libtun2socks
+    - name: Copy libhevtun
       run: |
         cp -r ${{ github.workspace }}/libs ${{ github.workspace }}/V2rayNG/app
 
@@ -77,36 +77,6 @@ jobs:
         fileName: 'libv2ray.aar'
         out-file-path: V2rayNG/app/libs/
 
-    - name: Restore cached libhysteria2
-      id: cache-libhysteria2-restore
-      uses: actions/cache/restore@v4
-      with:
-        path: ${{ github.workspace }}/hysteria/libs
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
-
-    - name: Setup Golang
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      uses: actions/setup-go@v5.4.0
-      with:
-        go-version-file: 'AndroidLibXrayLite/go.mod'
-        cache: false
-
-    - name: Build libhysteria2
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      run: |
-        bash libhysteria2.sh
-
-    - name: Save libhysteria2
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ${{ github.workspace }}/hysteria/libs
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
-
-    - name: Copy libhysteria2
-      run: |
-        cp -r ${{ github.workspace }}/hysteria/libs ${{ github.workspace }}/V2rayNG/app
-
     - name: Setup Java
       uses: actions/setup-java@v4.7.0
       with:
@@ -153,7 +123,7 @@ jobs:
       uses: svenstaro/upload-release-action@v2
       if: github.event.inputs.release_tag != ''
       with:
-        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*playstore*/release/*.apk
+        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*.apk
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
         prerelease: true

.gitmodules

@@ -1,12 +1,6 @@
-[submodule "hysteria"]
-	path = hysteria
-	url = https://github.com/apernet/hysteria
 [submodule "AndroidLibXrayLite"]
 	path = AndroidLibXrayLite
 	url = https://github.com/2dust/AndroidLibXrayLite
-[submodule "badvpn"]
-	path = badvpn
-	url = https://github.com/XTLS/badvpn
-[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

README.md

@@ -2,8 +2,8 @@
 
 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)
+[![API](https://img.shields.io/badge/API-24%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.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)

V2rayNG/app/build.gradle.kts

@@ -6,14 +6,14 @@ plugins {
 
 android {
     namespace = "com.v2ray.ang"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.v2ray.ang"
-        minSdk = 21
-        targetSdk = 35
-        versionCode = 662
-        versionName = "1.10.12"
+        minSdk = 24
+        targetSdk = 36
+        versionCode = 702
+        versionName = "2.0.2"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
@@ -67,14 +67,16 @@ android {
         }
     }
 
-
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     applicationVariants.all {
@@ -146,6 +148,8 @@ dependencies {
     implementation(libs.preference.ktx)
     implementation(libs.recyclerview)
     implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.androidx.fragment)
 
     // UI Libraries
     implementation(libs.material)
@@ -156,6 +160,7 @@ dependencies {
     // Data and Storage Libraries
     implementation(libs.mmkv.static)
     implementation(libs.gson)
+    implementation(libs.okhttp)
 
     // Reactive and Utility Libraries
     implementation(libs.kotlinx.coroutines.android)

V2rayNG/app/src/fdroid/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">v2rayNG (F-Droid)</string>
+</resources>

V2rayNG/app/src/fdroid/res/xml/shortcuts.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_qu_switch_24dp"
+        android:shortcutDisabledMessage="@string/app_widget_name"
+        android:shortcutId="shortcuts_switch"
+        android:shortcutLongLabel="@string/app_widget_name"
+        android:shortcutShortLabel="@string/app_widget_name">
+
+        <!--suppress AndroidDomInspection -->
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.v2ray.ang.ui.ScSwitchActivity"
+            android:targetPackage="com.v2ray.ang.fdroid" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+    <shortcut
+        android:enabled="true"
+        android:icon="@drawable/ic_qu_scan_24dp"
+        android:shortcutDisabledMessage="@string/menu_item_import_config_qrcode"
+        android:shortcutId="shortcuts_scan"
+        android:shortcutLongLabel="@string/menu_item_import_config_qrcode"
+        android:shortcutShortLabel="@string/menu_item_import_config_qrcode">
+
+        <!--suppress AndroidDomInspection -->
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="com.v2ray.ang.ui.ScScannerActivity"
+            android:targetPackage="com.v2ray.ang.fdroid" />
+        <categories android:name="android.shortcut.conversation" />
+    </shortcut>
+</shortcuts>

V2rayNG/app/src/main/AndroidManifest.xml

@@ -10,10 +10,6 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-sdk
-        android:minSdkVersion="21"
-        tools:overrideLibrary="com.blacksquircle.ui.editorkit" />
-
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
@@ -30,7 +26,7 @@
     <!-- https://developer.android.com/about/versions/11/privacy/package-visibility -->
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
-        tools:ignore="QueryAllPackagesPermission" />
+        tools:ignore="PackageVisibilityPolicy,QueryAllPackagesPermission" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -53,15 +49,13 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeDayNight"
-        android:usesCleartextTraffic="true"
-        tools:targetApi="m">
+        android:theme="@style/AppThemeDayNight.NoActionBar"
+        android:usesCleartextTraffic="true">
 
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:theme="@style/AppThemeDayNight.NoActionBar">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -84,6 +78,10 @@
             android:name=".ui.ServerCustomConfigActivity"
             android:exported="false"
             android:windowSoftInputMode="stateUnchanged" />
+        <activity
+            android:name=".ui.ServerGroupActivity"
+            android:exported="false"
+            android:windowSoftInputMode="stateUnchanged" />
         <activity
             android:name=".ui.SettingsActivity"
             android:exported="false" />
@@ -123,7 +121,7 @@
             android:excludeFromRecents="true"
             android:exported="false"
             android:process=":RunSoLibV2RayDaemon"
-            android:theme="@style/AppTheme.NoActionBar.Translucent" />
+            android:theme="@style/AppThemeDayNight.NoActionBar.Translucent" />
 
         <activity
             android:name=".ui.UrlSchemeActivity"
@@ -147,6 +145,9 @@
         <activity
             android:name=".ui.CheckUpdateActivity"
             android:exported="false" />
+        <activity
+            android:name=".ui.BackupActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.AboutActivity"
             android:exported="false" />
@@ -158,7 +159,8 @@
             android:foregroundServiceType="specialUse"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon"
+            tools:ignore="VpnServicePolicy">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
@@ -195,8 +197,8 @@
                 android:resource="@xml/app_widget_provider" />
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.v2ray.ang.action.widget.click" />
-                <action android:name="com.v2ray.ang.action.activity" />
+                <action android:name="${applicationId}.action.widget.click" />
+                <action android:name="${applicationId}.action.activity" />
             </intent-filter>
         </receiver>
         <receiver
@@ -215,8 +217,7 @@
             android:icon="@drawable/ic_stat_name"
             android:label="@string/app_tile_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:process=":RunSoLibV2RayDaemon"
-            tools:targetApi="24">
+            android:process=":RunSoLibV2RayDaemon">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>

V2rayNG/app/src/main/assets/custom_routing_black

@@ -6,20 +6,19 @@
       "bittorrent"
     ]
   },
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
     "port": "443",
     "network": "udp"
   },
+  {
+    "remarks": "代理Google",
+    "outboundTag": "proxy",
+    "domain": [
+      "geosite:google"
+    ]
+  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -139,4 +138,4 @@
     "port": "0-65535",
     "outboundTag": "direct"
   }
-]
+]

V2rayNG/app/src/main/assets/custom_routing_white

@@ -1,18 +1,17 @@
 [
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
     "port": "443",
     "network": "udp"
   },
+  {
+    "remarks": "代理Google",
+    "outboundTag": "proxy",
+    "domain": [
+      "geosite:google"
+    ]
+  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -93,4 +92,4 @@
       "geosite:cn"
     ]
   }
-]
+]

V2rayNG/app/src/main/assets/custom_routing_white_russia

@@ -0,0 +1,43 @@
+[
+  {
+    "remarks": "Bypass bittorrent",
+    "outboundTag": "direct",
+    "protocol": [
+      "bittorrent"
+    ]
+  },
+  {
+    "remarks": "Block udp443",
+    "outboundTag": "block",
+    "port": "443",
+    "network": "udp"
+  },
+  {
+    "remarks": "Direct LAN IP",
+    "outboundTag": "direct",
+    "ip": [
+      "geoip:private"
+    ]
+  },
+  {
+    "remarks": "Direct LAN domains",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:private"
+    ]
+  },
+  {
+    "remarks": "Bypass Russia domains",
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:category-ru"
+    ]
+  },
+  {
+    "remarks": "Bypass Russia IP",
+    "outboundTag": "direct",
+    "ip": [
+       "geoip:ru"
+    ]
+  }
+]

V2rayNG/app/src/main/assets/v2ray_config.json

@@ -33,14 +33,6 @@
         "tls"
       ]
     }
-  },
-  {
-    "tag": "http",
-    "port": 10809,
-    "protocol": "http",
-    "settings": {
-      "userLevel": 8
-    }
   }
 ],
   "outbounds": [{

V2rayNG/app/src/main/assets/v2ray_config_with_tun.json

@@ -0,0 +1,109 @@
+{
+  "stats":{},
+  "log": {
+    "loglevel": "warning"
+  },
+  "policy":{
+      "levels": {
+        "8": {
+          "handshake": 4,
+          "connIdle": 300,
+          "uplinkOnly": 1,
+          "downlinkOnly": 1
+        }
+      },
+      "system": {
+        "statsOutboundUplink": true,
+        "statsOutboundDownlink": true
+      }
+  },
+  "inbounds": [{
+    "tag": "socks",
+    "port": 10808,
+    "protocol": "socks",
+    "settings": {
+      "auth": "noauth",
+      "udp": true,
+      "userLevel": 8
+    },
+    "sniffing": {
+      "enabled": true,
+      "destOverride": [
+        "http",
+        "tls"
+      ]
+    }
+  },
+  {
+    "tag": "tun",
+    "port": 0,
+    "protocol": "tun",
+    "settings": {
+      "name": "xray0",
+      "MTU": 1500,
+      "userLevel": 8
+    }
+  }
+],
+  "outbounds": [{
+    "tag": "proxy",
+    "protocol": "vmess",
+    "settings": {
+      "vnext": [
+        {
+          "address": "v2ray.cool",
+          "port": 10086,
+          "users": [
+            {
+              "id": "a3482e88-686a-4a58-8126-99c9df64b7bf",
+              "alterId": 0,
+              "security": "auto",
+              "level": 8
+            }
+          ]
+        }
+      ],
+      "servers": [
+        {
+        "address": "v2ray.cool",
+        "method": "chacha20",
+        "ota": false,
+        "password": "123456",
+        "port": 10086,
+        "level": 8
+      }
+      ]
+    },
+    "streamSettings": {
+      "network": "tcp"
+    },
+    "mux": {
+      "enabled": false
+    }
+  },
+  {
+    "protocol": "freedom",
+    "settings": {
+      "domainStrategy": "UseIP"
+    },
+    "tag": "direct"
+  },
+  {
+    "protocol": "blackhole",
+    "tag": "block",
+    "settings": {
+      "response": {
+        "type": "http"
+      }
+    }
+  }
+  ],
+  "routing": {
+      "domainStrategy": "AsIs",
+      "rules": []
+  },
+  "dns": {
+      "hosts": {},
+      "servers": []
+  }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt

@@ -34,6 +34,8 @@ class AngApplication : MultiDexApplication() {
 
         MMKV.initialize(this)
 
+        // Ensure critical preference defaults are present in MMKV early
+        SettingsManager.ensureDefaultSettings()
         SettingsManager.setNightMode()
         // Initialize WorkManager with the custom configuration
         WorkManager.initialize(this, workManagerConfiguration)

V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt

@@ -9,7 +9,9 @@ object AppConfig {
 
     /** Directory names used in the app's file system. */
     const val DIR_ASSETS = "assets"
-    const val DIR_BACKUPS = "backups"
+
+    const val  WEBDAV_BACKUP_DIR = "backups"
+    const val  WEBDAV_BACKUP_FILE_NAME = "backup_ng.zip"
 
     /** Legacy configuration keys. */
     const val ANG_CONFIG = "ang_config"
@@ -27,6 +29,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"
@@ -55,13 +58,18 @@ object AppConfig {
     const val PREF_DOMESTIC_DNS = "pref_domestic_dns"
     const val PREF_DNS_HOSTS = "pref_dns_hosts"
     const val PREF_DELAY_TEST_URL = "pref_delay_test_url"
+    const val PREF_IP_API_URL = "pref_ip_api_url"
     const val PREF_LOGLEVEL = "pref_core_loglevel"
     const val PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD = "pref_outbound_domain_resolve_method"
-    const val PREF_INTELLIGENT_SELECTION_METHOD = "pref_intelligent_selection_method"
     const val PREF_MODE = "pref_mode"
     const val PREF_IS_BOOTED = "pref_is_booted"
     const val PREF_CHECK_UPDATE_PRE_RELEASE = "pref_check_update_pre_release"
     const val PREF_GEO_FILES_SOURCES = "pref_geo_files_sources"
+    const val PREF_USE_HEV_TUNNEL = "pref_use_hev_tunnel_v2"
+    const val PREF_HEV_TUNNEL_LOGLEVEL = "pref_hev_tunnel_loglevel"
+    const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout_v2"
+    const val PREF_AUTO_REMOVE_INVALID_AFTER_TEST = "pref_auto_remove_invalid_after_test"
+    const val PREF_AUTO_SORT_AFTER_TEST = "pref_auto_sort_after_test"
 
     /** Cache keys. */
     const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
@@ -71,9 +79,9 @@ object AppConfig {
     const val PROTOCOL_FREEDOM = "freedom"
 
     /** Broadcast actions. */
-    const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
-    const val BROADCAST_ACTION_ACTIVITY = "com.v2ray.ang.action.activity"
-    const val BROADCAST_ACTION_WIDGET_CLICK = "com.v2ray.ang.action.widget.click"
+    const val BROADCAST_ACTION_SERVICE = "$ANG_PACKAGE.action.service"
+    const val BROADCAST_ACTION_ACTIVITY = "$ANG_PACKAGE.action.activity"
+    const val BROADCAST_ACTION_WIDGET_CLICK = "$ANG_PACKAGE.action.widget.click"
 
     /** Tasker extras. */
     const val TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"
@@ -87,6 +95,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"
@@ -106,7 +116,8 @@ object AppConfig {
     const val TG_CHANNEL_URL = "https://t.me/github_2dust"
     const val DELAY_TEST_URL = "https://www.gstatic.com/generate_204"
     const val DELAY_TEST_URL2 = "https://www.google.com/generate_204"
-    const val IP_API_URL = "https://speed.cloudflare.com/meta"
+//    const val IP_API_URL = "https://speed.cloudflare.com/meta"
+    const val IP_API_URL = "https://api.ip.sb/geoip"
 
     /** DNS server addresses. */
     const val DNS_PROXY = "1.1.1.1"
@@ -141,6 +152,8 @@ object AppConfig {
     const val MSG_MEASURE_CONFIG = 7
     const val MSG_MEASURE_CONFIG_SUCCESS = 71
     const val MSG_MEASURE_CONFIG_CANCEL = 72
+    const val MSG_MEASURE_CONFIG_NOTIFY = 73
+    const val MSG_MEASURE_CONFIG_FINISH = 74
 
     /** Notification channel IDs and names. */
     const val RAY_NG_CHANNEL_ID = "RAY_NG_M_CH_ID"
@@ -158,6 +171,7 @@ object AppConfig {
     const val TROJAN = "trojan://"
     const val WIREGUARD = "wireguard://"
     const val TUIC = "tuic://"
+    const val HYSTERIA = "hysteria://"
     const val HYSTERIA2 = "hysteria2://"
     const val HY2 = "hy2://"
 
@@ -165,6 +179,9 @@ object AppConfig {
     const val VPN = "VPN"
     const val VPN_MTU = 1500
 
+    /** hev-sock5-tunnel read-write-timeout value */
+    const val HEVTUN_RW_TIMEOUT = "300,60"
+
     // Google API rule constants
     const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
     const val GOOGLEAPIS_COM_DOMAIN = "googleapis.com"

V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt

@@ -4,6 +4,5 @@ data class ConfigResult(
     var status: Boolean,
     var guid: String? = null,
     var content: String = "",
-    var socksPort: Int? = null,
 )
 

V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt

@@ -14,7 +14,9 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
 
     //    TUIC(8, AppConfig.TUIC),
     HYSTERIA2(9, AppConfig.HYSTERIA2),
-    HTTP(10, AppConfig.HTTP);
+    HYSTERIA(900, AppConfig.HYSTERIA),
+    HTTP(10, AppConfig.HTTP),
+    POLICYGROUP (101, AppConfig.CUSTOM);
 
     companion object {
         fun fromInt(value: Int) = entries.firstOrNull { it.value == value }

V2rayNG/app/src/main/java/com/v2ray/ang/dto/GroupMapItem.kt

@@ -0,0 +1,6 @@
+package com.v2ray.ang.dto
+
+data class GroupMapItem(
+    var id: String,
+    var remarks: String,
+)

V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt

@@ -1,46 +0,0 @@
-package com.v2ray.ang.dto
-
-data class Hysteria2Bean(
-    val server: String?,
-    val auth: String?,
-    val lazy: Boolean? = true,
-    val obfs: ObfsBean? = null,
-    val socks5: Socks5Bean? = null,
-    val http: Socks5Bean? = null,
-    val tls: TlsBean? = null,
-    val transport: TransportBean? = null,
-    val bandwidth: BandwidthBean? = null,
-) {
-    data class ObfsBean(
-        val type: String?,
-        val salamander: SalamanderBean?
-    ) {
-        data class SalamanderBean(
-            val password: String?,
-        )
-    }
-
-    data class Socks5Bean(
-        val listen: String?,
-    )
-
-    data class TlsBean(
-        val sni: String?,
-        val insecure: Boolean?,
-        val pinSHA256: String?,
-    )
-
-    data class TransportBean(
-        val type: String?,
-        val udp: TransportUdpBean?
-    ) {
-        data class TransportUdpBean(
-            val hopInterval: String?,
-        )
-    }
-
-    data class BandwidthBean(
-        val down: String?,
-        val up: String?,
-    )
-}

V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt

@@ -8,5 +8,10 @@ data class IPAPIInfo(
     var country: String? = null,
     var country_name: String? = null,
     var country_code: String? = null,
-    var countryCode: String? = null
-)
+    var countryCode: String? = null,
+    var location: LocationBean? = null
+) {
+    data class LocationBean(
+        var country_code: String? = null
+    )
+}

V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt

@@ -10,7 +10,8 @@ enum class NetworkType(val type: String) {
     H2("h2"),
 
     //QUIC("quic"),
-    GRPC("grpc");
+    GRPC("grpc"),
+    HYSTERIA("hysteria");
 
     companion object {
         fun fromString(type: String?) = entries.find { it.type == type } ?: TCP

V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt

@@ -40,6 +40,8 @@ data class ProfileItem(
     var alpn: String? = null,
     var fingerPrint: String? = null,
     var insecure: Boolean? = null,
+    var echConfigList: String? = null,
+    var echForceQuery: String? = null,
 
     var publicKey: String? = null,
     var shortId: String? = null,
@@ -59,6 +61,10 @@ data class ProfileItem(
     var bandwidthDown: String? = null,
     var bandwidthUp: String? = null,
 
+    var policyGroupType: String? = null,
+    var policyGroupSubscriptionId: String? = null,
+    var policyGroupFilter: String? = null,
+
     ) {
     companion object {
         fun create(configType: EConfigType): ProfileItem {

V2rayNG/app/src/main/java/com/v2ray/ang/dto/RoutingType.kt

@@ -4,7 +4,8 @@ enum class RoutingType(val fileName: String) {
     WHITE("custom_routing_white"),
     BLACK("custom_routing_black"),
     GLOBAL("custom_routing_global"),
-    WHITE_IRAN("custom_routing_white_iran");
+    WHITE_IRAN("custom_routing_white_iran"),
+    WHITE_RUSSIA("custom_routing_white_russia");
 
     companion object {
         fun fromIndex(index: Int): RoutingType {
@@ -13,6 +14,7 @@ enum class RoutingType(val fileName: String) {
                 1 -> BLACK
                 2 -> GLOBAL
                 3 -> WHITE_IRAN
+                4 -> WHITE_RUSSIA
                 else -> WHITE
             }
         }

V2rayNG/app/src/main/java/com/v2ray/ang/dto/ServerConfig.kt

@@ -1,86 +0,0 @@
-package com.v2ray.ang.dto
-
-import com.v2ray.ang.AppConfig.TAG_BLOCKED
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.AppConfig.TAG_PROXY
-
-data class ServerConfig(
-    val configVersion: Int = 3,
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    val addedTime: Long = System.currentTimeMillis(),
-    var remarks: String = "",
-    val outboundBean: V2rayConfig.OutboundBean? = null,
-    var fullConfig: V2rayConfig? = null
-) {
-    companion object {
-        fun create(configType: EConfigType): ServerConfig {
-            when (configType) {
-                EConfigType.VMESS,
-                EConfigType.VLESS ->
-                    return ServerConfig(
-                        configType = configType,
-                        outboundBean = V2rayConfig.OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                vnext = listOf(
-                                    V2rayConfig.OutboundBean.OutSettingsBean.VnextBean(
-                                        users = listOf(V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean())
-                                    )
-                                )
-                            ),
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
-                        )
-                    )
-
-                EConfigType.CUSTOM ->
-                    return ServerConfig(configType = configType)
-
-                EConfigType.SHADOWSOCKS,
-                EConfigType.SOCKS,
-                EConfigType.HTTP,
-                EConfigType.TROJAN,
-                EConfigType.HYSTERIA2 ->
-                    return ServerConfig(
-                        configType = configType,
-                        outboundBean = V2rayConfig.OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                servers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.ServersBean())
-                            ),
-                            streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean()
-                        )
-                    )
-
-                EConfigType.WIREGUARD ->
-                    return ServerConfig(
-                        configType = configType,
-                        outboundBean = V2rayConfig.OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = V2rayConfig.OutboundBean.OutSettingsBean(
-                                secretKey = "",
-                                peers = listOf(V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean())
-                            )
-                        )
-                    )
-            }
-        }
-    }
-
-    fun getProxyOutbound(): V2rayConfig.OutboundBean? {
-        if (configType != EConfigType.CUSTOM) {
-            return outboundBean
-        }
-        return fullConfig?.getProxyOutbound()
-    }
-
-    fun getAllOutboundTags(): MutableList<String> {
-        if (configType != EConfigType.CUSTOM) {
-            return mutableListOf(TAG_PROXY, TAG_DIRECT, TAG_BLOCKED)
-        }
-        fullConfig?.let { config ->
-            return config.outbounds.map { it.tag }.toMutableList()
-        }
-        return mutableListOf()
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt

@@ -11,7 +11,7 @@ data class SubscriptionItem(
     var prevProfile: String? = null,
     var nextProfile: String? = null,
     var filter: String? = null,
-    var intelligentSelectionFilter: String? = null,
     var allowInsecureUrl: Boolean = false,
+    var userAgent: String? = null,
 )
 

V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt

@@ -2,7 +2,6 @@ package com.v2ray.ang.dto
 
 import com.google.gson.annotations.SerializedName
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.util.Utils
 
 data class V2rayConfig(
     var remarks: String? = null,
@@ -34,19 +33,19 @@ data class V2rayConfig(
         var port: Int,
         var protocol: String,
         var listen: String? = null,
-        val settings: Any? = null,
+        var settings: InSettingsBean? = null,
         val sniffing: SniffingBean? = null,
         val streamSettings: Any? = null,
         val allocate: Any? = null
     ) {
 
         data class InSettingsBean(
-            val auth: String? = null,
-            val udp: Boolean? = null,
-            val userLevel: Int? = null,
-            val address: String? = null,
-            val port: Int? = null,
-            val network: String? = null
+            var auth: String? = null,
+            var udp: Boolean? = null,
+            var userLevel: Int? = null,
+            var name: String? = null,
+            @SerializedName("MTU")
+            var mtu: Int? = null
         )
 
         data class SniffingBean(
@@ -76,7 +75,7 @@ data class V2rayConfig(
             /*DNS*/
             val network: String? = null,
             var address: Any? = null,
-            val port: Int? = null,
+            var port: Int? = null,
             /*Freedom*/
             var domainStrategy: String? = null,
             val redirect: String? = null,
@@ -160,7 +159,8 @@ data class V2rayConfig(
             var quicSettings: QuicSettingBean? = null,
             var realitySettings: TlsSettingsBean? = null,
             var grpcSettings: GrpcSettingsBean? = null,
-            var hy2steriaSettings: Hy2steriaSettingsBean? = null,
+            var hysteriaSettings: HysteriaSettingsBean? = null,
+            var udpmasks: List<UdpMasksBean>? = null,
             val dsSettings: Any? = null,
             var sockopt: SockoptBean? = null
         ) {
@@ -245,7 +245,15 @@ 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(
@@ -260,6 +268,8 @@ data class V2rayConfig(
                 val certificates: List<Any>? = null,
                 val disableSystemRoot: Boolean? = null,
                 val enableSessionResumption: Boolean? = null,
+                var echConfigList: String? = null,
+                var echForceQuery: String? = null,
                 // REALITY settings
                 val show: Boolean = false,
                 var publicKey: String? = null,
@@ -284,18 +294,27 @@ data class V2rayConfig(
                 var health_check_timeout: Int? = null
             )
 
-            data class Hy2steriaSettingsBean(
-                var password: String? = null,
-                var use_udp_extension: Boolean? = true,
-                var congestion: Hy2CongestionBean? = null
+            data class HysteriaSettingsBean(
+                var version: Int,
+                var auth: String? = null,
+                var up: String? = null,
+                var down: String? = null,
+                var udphop: HysteriaUdpHopBean? = null
             ) {
-                data class Hy2CongestionBean(
-                    var type: String? = "bbr",
-                    var up_mbps: Int? = null,
-                    var down_mbps: Int? = null,
+                data class HysteriaUdpHopBean(
+                    var port: String? = null,
+                    var interval: Int? = null
                 )
             }
 
+            data class UdpMasksBean(
+                var type: String,
+                var settings: UdpMasksSettingsBean? = null
+            ) {
+                data class UdpMasksSettingsBean(
+                    var password: String? = null
+                )
+            }
         }
 
         data class MuxBean(
@@ -314,11 +333,14 @@ data class V2rayConfig(
                 || protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
                 return settings?.servers?.first()?.address
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.peers?.first()?.endpoint?.substringBeforeLast(":")
+            } else if (protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
+            ) {
+                return settings?.address as String?
             }
             return null
         }
@@ -332,142 +354,24 @@ data class V2rayConfig(
                 || protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
                 return settings?.servers?.first()?.port
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.peers?.first()?.endpoint?.substringAfterLast(":")?.toInt()
+            } else if (protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
+            ) {
+                return settings?.port
             }
             return null
         }
 
-        fun getServerAddressAndPort(): String {
-            val address = getServerAddress().orEmpty()
-            val port = getServerPort()
-            return Utils.getIpv6Address(address) + ":" + port
-        }
-
-        fun getPassword(): String? {
-            if (protocol.equals(EConfigType.VMESS.name, true)
-                || protocol.equals(EConfigType.VLESS.name, true)
-            ) {
-                return settings?.vnext?.first()?.users?.first()?.id
-            } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-                || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.HYSTERIA2.name, true)
-            ) {
-                return settings?.servers?.first()?.password
-            } else if (protocol.equals(EConfigType.SOCKS.name, true)
-                || protocol.equals(EConfigType.HTTP.name, true)
-            ) {
-                return settings?.servers?.first()?.users?.first()?.pass
-            } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.secretKey
-            }
-            return null
-        }
-
-        fun getSecurityEncryption(): String? {
-            return when {
-                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.first()?.users?.first()?.security
-                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.first()?.users?.first()?.encryption
-                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.first()?.method
-                else -> null
-            }
-        }
-
-        fun getTransportSettingDetails(): List<String?>? {
-            if (protocol.equals(EConfigType.VMESS.name, true)
-                || protocol.equals(EConfigType.VLESS.name, true)
-                || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.SHADOWSOCKS.name, true)
-            ) {
-                val transport = streamSettings?.network ?: return null
-                return when (transport) {
-                    NetworkType.TCP.type -> {
-                        val tcpSetting = streamSettings?.tcpSettings ?: return null
-                        listOf(
-                            tcpSetting.header.type,
-                            tcpSetting.header.request?.headers?.Host?.joinToString(",").orEmpty(),
-                            tcpSetting.header.request?.path?.joinToString(",").orEmpty()
-                        )
-                    }
-
-                    NetworkType.KCP.type -> {
-                        val kcpSetting = streamSettings?.kcpSettings ?: return null
-                        listOf(
-                            kcpSetting.header.type,
-                            "",
-                            kcpSetting.seed.orEmpty()
-                        )
-                    }
-
-                    NetworkType.WS.type -> {
-                        val wsSetting = streamSettings?.wsSettings ?: return null
-                        listOf(
-                            "",
-                            wsSetting.headers.Host,
-                            wsSetting.path
-                        )
-                    }
-
-                    NetworkType.HTTP_UPGRADE.type -> {
-                        val httpupgradeSetting = streamSettings?.httpupgradeSettings ?: return null
-                        listOf(
-                            "",
-                            httpupgradeSetting.host,
-                            httpupgradeSetting.path
-                        )
-                    }
-
-                    NetworkType.XHTTP.type -> {
-                        val xhttpSettings = streamSettings?.xhttpSettings ?: return null
-                        listOf(
-                            "",
-                            xhttpSettings.host,
-                            xhttpSettings.path
-                        )
-                    }
-
-                    NetworkType.H2.type -> {
-                        val h2Setting = streamSettings?.httpSettings ?: return null
-                        listOf(
-                            "",
-                            h2Setting.host.joinToString(","),
-                            h2Setting.path
-                        )
-                    }
-
-//                    "quic" -> {
-//                        val quicSetting = streamSettings?.quicSettings ?: return null
-//                        listOf(
-//                            quicSetting.header.type,
-//                            quicSetting.security,
-//                            quicSetting.key
-//                        )
-//                    }
-
-                    NetworkType.GRPC.type -> {
-                        val grpcSetting = streamSettings?.grpcSettings ?: return null
-                        listOf(
-                            if (grpcSetting.multiMode == true) "multi" else "gun",
-                            grpcSetting.authority.orEmpty(),
-                            grpcSetting.serviceName
-                        )
-                    }
-
-                    else -> null
-                }
-            }
-            return null
-        }
-
-        fun ensureSockopt(): V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean {
-            val stream = streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean().also {
+        fun ensureSockopt(): StreamSettingsBean.SockoptBean {
+            val stream = streamSettings ?: StreamSettingsBean().also {
                 streamSettings = it
             }
 
-            val sockopt = stream.sockopt ?: V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean().also {
+            val sockopt = stream.sockopt ?: StreamSettingsBean.SockoptBean().also {
                 stream.sockopt = it
             }
 
@@ -490,6 +394,7 @@ data class V2rayConfig(
             var expectIPs: List<String>? = null,
             val clientIp: String? = null,
             val skipFallback: Boolean? = null,
+            val tag: String? = null,
         )
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/dto/VmessQRCode.kt

@@ -15,5 +15,6 @@ data class VmessQRCode(
     var tls: String = "",
     var sni: String = "",
     var alpn: String = "",
-    var fp: String = ""
+    var fp: String = "",
+    var insecure: String = ""
 )

V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt

@@ -29,8 +29,8 @@ enum class VpnInterfaceAddressConfig(
          *         or OPTION_1 (default) if the index is out of bounds
          */
         fun getConfigByIndex(index: Int): VpnInterfaceAddressConfig {
-            return if (index in values().indices) {
-                values()[index]
+            return if (index in entries.toTypedArray().indices) {
+                entries[index]
             } else {
                 OPTION_1 // Default to the first configuration
             }

V2rayNG/app/src/main/java/com/v2ray/ang/dto/WebDavConfig.kt

@@ -0,0 +1,9 @@
+package com.v2ray.ang.dto
+
+data class WebDavConfig(
+    val baseUrl: String,
+    val username: String? = null,
+    val password: String? = null,
+    val remoteBasePath: String = "/",
+    val timeoutSeconds: Long = 30
+)

V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt

@@ -9,10 +9,8 @@ import android.os.Bundle
 import android.widget.Toast
 import com.v2ray.ang.AngApplication
 import es.dmoral.toasty.Toasty
-import org.json.JSONObject
 import java.io.Serializable
 import java.net.URI
-import java.net.URLConnection
 
 val Context.v2RayApplication: AngApplication?
     get() = applicationContext as? AngApplication
@@ -71,25 +69,6 @@ fun Context.toastError(message: CharSequence) {
     Toasty.error(this, message, Toast.LENGTH_SHORT, true).show()
 }
 
-
-/**
- * Puts a key-value pair into the JSONObject.
- *
- * @param pair The key-value pair to put.
- */
-fun JSONObject.putOpt(pair: Pair<String, Any?>) {
-    put(pair.first, pair.second)
-}
-
-/**
- * Puts multiple key-value pairs into the JSONObject.
- *
- * @param pairs The map of key-value pairs to put.
- */
-fun JSONObject.putOpt(pairs: Map<String, Any?>) {
-    pairs.forEach { put(it.key, it.value) }
-}
-
 const val THRESHOLD = 1000L
 const val DIVISOR = 1024.0
 
@@ -116,13 +95,6 @@ fun Long.toTrafficString(): String {
     return String.format("%.1f %s", size, units[unitIndex])
 }
 
-val URLConnection.responseLength: Long
-    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        contentLengthLong
-    } else {
-        contentLength.toLong()
-    }
-
 val URI.idnHost: String
     get() = host?.replace("[", "")?.replace("]", "").orEmpty()
 
@@ -196,7 +168,7 @@ inline fun <reified T : Serializable> Intent.serializable(key: String): T? = whe
  *
  * @return True if the CharSequence is not null and not empty, false otherwise.
  */
-fun CharSequence?.isNotNullEmpty(): Boolean = this != null && this.isNotEmpty()
+fun CharSequence?.isNotNullEmpty(): Boolean = !this.isNullOrBlank()
 
 fun String.concatUrl(vararg paths: String): String {
     val builder = StringBuilder(this.trimEnd('/'))

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt

@@ -16,7 +16,7 @@ object CustomFmt : FmtBase() {
         val config = ProfileItem.create(EConfigType.CUSTOM)
 
         val fullConfig = JsonUtil.fromJson(str, V2rayConfig::class.java)
-        val outbound = fullConfig.getProxyOutbound()
+        val outbound = fullConfig?.getProxyOutbound()
 
         config.remarks = fullConfig?.remarks ?: System.currentTimeMillis().toString()
         config.server = outbound?.getServerAddress()

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt

@@ -72,14 +72,17 @@ open class FmtBase {
         if (config.security != AppConfig.TLS && config.security != AppConfig.REALITY) {
             config.security = null
         }
-        config.insecure = if (queryParam["allowInsecure"].isNullOrEmpty()) {
-            allowInsecure
-        } else {
-            queryParam["allowInsecure"].orEmpty() == "1"
+        // Support multiple possible query keys for allowInsecure like the C# implementation
+        val allowInsecureKeys = arrayOf("insecure", "allowInsecure", "allow_insecure")
+        config.insecure = when {
+            allowInsecureKeys.any { queryParam[it] == "1" } -> true
+            allowInsecureKeys.any { queryParam[it] == "0" } -> false
+            else -> allowInsecure
         }
         config.sni = queryParam["sni"]
         config.fingerPrint = queryParam["fp"]
         config.alpn = queryParam["alpn"]
+        config.echConfigList = queryParam["ech"]
         config.publicKey = queryParam["pbk"]
         config.shortId = queryParam["sid"]
         config.spiderX = queryParam["spx"]
@@ -98,12 +101,19 @@ open class FmtBase {
         dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
         config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
         config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.echConfigList.let { if (it.isNotNullEmpty()) dicQuery["ech"] = it.orEmpty() }
         config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
         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() }
+        // Add two keys for compatibility: "insecure" and "allowInsecure"
+        if (config.security == AppConfig.TLS) {
+            val insecureFlag = if (config.insecure == true) "1" else "0"
+            dicQuery["insecure"] = insecureFlag
+            dicQuery["allowInsecure"] = insecureFlag
+        }
 
         val networkType = NetworkType.fromString(config.network)
         dicQuery["type"] = networkType.type
@@ -148,6 +158,8 @@ open class FmtBase {
                 config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
                 config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
             }
+
+            else -> {}
         }
 
         return dicQuery

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt

@@ -1,11 +1,12 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.Hysteria2Bean
+import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.UdpMasksBean.UdpMasksSettingsBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.MmkvManager
@@ -30,21 +31,19 @@ object Hysteria2Fmt : FmtBase() {
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
         config.security = AppConfig.TLS
+        config.network = NetworkType.HYSTERIA.type
 
         if (!uri.rawQuery.isNullOrEmpty()) {
             val queryParam = getQueryParam(uri)
 
-            config.security = queryParam["security"] ?: AppConfig.TLS
-            config.insecure = if (queryParam["insecure"].isNullOrEmpty()) {
-                allowInsecure
-            } else {
-                queryParam["insecure"].orEmpty() == "1"
-            }
-            config.sni = queryParam["sni"]
-            config.alpn = queryParam["alpn"]
+            getItemFormQuery(config, queryParam, allowInsecure)
 
+            config.security = queryParam["security"] ?: AppConfig.TLS
             config.obfsPassword = queryParam["obfs-password"]
             config.portHopping = queryParam["mport"]
+            if (config.portHopping.isNotNullEmpty()) {
+                config.portHoppingInterval = queryParam["mportHopInt"]
+            }
             config.pinSHA256 = queryParam["pinSHA256"]
 
         }
@@ -73,6 +72,9 @@ object Hysteria2Fmt : FmtBase() {
         if (config.portHopping.isNotNullEmpty()) {
             dicQuery["mport"] = config.portHopping.orEmpty()
         }
+        if (config.portHoppingInterval.isNotNullEmpty()) {
+            dicQuery["mportHopInt"] = config.portHoppingInterval.orEmpty()
+        }
         if (config.pinSHA256.isNotNullEmpty()) {
             dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
         }
@@ -80,64 +82,6 @@ object Hysteria2Fmt : FmtBase() {
         return toUri(config, config.password, dicQuery)
     }
 
-    /**
-     * Converts a ProfileItem object to a Hysteria2Bean object.
-     *
-     * @param config the ProfileItem object to convert
-     * @param socksPort the port number for the socks5 proxy
-     * @return the converted Hysteria2Bean object, or null if conversion fails
-     */
-    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
-
-        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
-            Hysteria2Bean.ObfsBean(
-                type = "salamander",
-                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
-                    password = config.obfsPassword
-                )
-            )
-
-        val transport = if (config.portHopping.isNullOrEmpty()) null else
-            Hysteria2Bean.TransportBean(
-                type = "udp",
-                udp = Hysteria2Bean.TransportBean.TransportUdpBean(
-                    hopInterval = (config.portHoppingInterval ?: "30") + "s"
-                )
-            )
-
-        val bandwidth = if (config.bandwidthDown.isNullOrEmpty() || config.bandwidthUp.isNullOrEmpty()) null else
-            Hysteria2Bean.BandwidthBean(
-                down = config.bandwidthDown,
-                up = config.bandwidthUp,
-            )
-
-        val server =
-            if (config.portHopping.isNullOrEmpty())
-                config.getServerAddressAndPort()
-            else
-                Utils.getIpv6Address(config.server) + ":" + config.portHopping
-
-        val bean = Hysteria2Bean(
-            server = server,
-            auth = config.password,
-            obfs = obfs,
-            transport = transport,
-            bandwidth = bandwidth,
-            socks5 = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            http = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            tls = Hysteria2Bean.TlsBean(
-                sni = config.sni ?: config.server,
-                insecure = config.insecure,
-                pinSHA256 = if (config.pinSHA256.isNullOrEmpty()) null else config.pinSHA256
-            )
-        )
-        return bean
-    }
-
     /**
      * Converts a ProfileItem object to an OutboundBean object.
      *
@@ -145,7 +89,33 @@ object Hysteria2Fmt : FmtBase() {
      * @return the converted OutboundBean object, or null if conversion fails
      */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2) ?: return null
+        profileItem.network = NetworkType.HYSTERIA.type
+        profileItem.alpn = "h3"
+
+        outboundBean.settings?.let { server ->
+            server.address = getServerAddress(profileItem)
+            server.port = profileItem.serverPort.orEmpty().toInt()
+        }
+
+        val sni = outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }
+
+        outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }
+
+        if (profileItem.obfsPassword.isNotNullEmpty()) {
+            outboundBean.streamSettings?.udpmasks = mutableListOf(
+                StreamSettingsBean.UdpMasksBean(
+                    type = "salamander",
+                    settings = UdpMasksSettingsBean(
+                        password = profileItem.obfsPassword
+                    )
+                )
+            )
+        }
         return outboundBean
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt

@@ -122,7 +122,7 @@ object ShadowsocksFmt : FmtBase() {
     fun toUri(config: ProfileItem): String {
         val pw = "${config.method}:${config.password}"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt

@@ -51,7 +51,7 @@ object SocksFmt : FmtBase() {
             else
                 ":"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt

@@ -28,7 +28,7 @@ object VmessFmt : FmtBase() {
             return parseVmessStd(str)
         }
 
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.VMESS)
 
         var result = str.replace(EConfigType.VMESS.protocolScheme, "")
@@ -37,7 +37,7 @@ object VmessFmt : FmtBase() {
             Log.w(AppConfig.TAG, "Toast decoding failed")
             return null
         }
-        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
+        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java) ?: return null
         // Although VmessQRCode fields are non null, looks like Gson may still create null fields
         if (TextUtils.isEmpty(vmessQRCode.add)
             || TextUtils.isEmpty(vmessQRCode.port)
@@ -52,9 +52,13 @@ object VmessFmt : FmtBase() {
         config.server = vmessQRCode.add
         config.serverPort = vmessQRCode.port
         config.password = vmessQRCode.id
-        config.method = if (TextUtils.isEmpty(vmessQRCode.scy)) AppConfig.DEFAULT_SECURITY else vmessQRCode.scy
+        config.method =
+            if (TextUtils.isEmpty(vmessQRCode.scy)) AppConfig.DEFAULT_SECURITY else vmessQRCode.scy
 
-        config.network = vmessQRCode.net ?: NetworkType.TCP.type
+        config.network = vmessQRCode.net
+        if (config.network.isNullOrEmpty()) {
+            config.network = NetworkType.TCP.type
+        }
         config.headerType = vmessQRCode.type
         config.host = vmessQRCode.host
         config.path = vmessQRCode.path
@@ -79,11 +83,14 @@ object VmessFmt : FmtBase() {
         }
 
         config.security = vmessQRCode.tls
-        config.insecure = allowInsecure
         config.sni = vmessQRCode.sni
         config.fingerPrint = vmessQRCode.fp
         config.alpn = vmessQRCode.alpn
-
+        config.insecure = when (vmessQRCode.insecure) {
+            "1" -> true
+            "0" -> false
+            else -> allowInsecure
+        }
         return config
     }
 
@@ -132,6 +139,11 @@ object VmessFmt : FmtBase() {
         vmessQRCode.sni = config.sni.orEmpty()
         vmessQRCode.fp = config.fingerPrint.orEmpty()
         vmessQRCode.alpn = config.alpn.orEmpty()
+        vmessQRCode.insecure = when (config.insecure) {
+            true -> "1"
+            false -> "0"
+            else -> ""
+        }
 
         val json = JsonUtil.toJson(vmessQRCode)
         return Utils.encode(json)

V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt

@@ -110,13 +110,6 @@ object AngConfigManager {
             if (guid == null) return -1
             val result = V2rayConfigManager.getV2rayConfig(context, guid)
             if (result.status) {
-                val config = MmkvManager.decodeServerConfig(guid)
-                if (config?.configType == EConfigType.HYSTERIA2) {
-                    val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
-                    val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort)
-                    Utils.setClipboard(context, JsonUtil.toJsonPretty(hy2Config) + "\n" + result.content)
-                    return 0
-                }
                 Utils.setClipboard(context, result.content)
             } else {
                 return -1
@@ -148,6 +141,8 @@ object AngConfigManager {
                 EConfigType.TROJAN -> TrojanFmt.toUri(config)
                 EConfigType.WIREGUARD -> WireguardFmt.toUri(config)
                 EConfigType.HYSTERIA2 -> Hysteria2Fmt.toUri(config)
+                EConfigType.POLICYGROUP -> ""
+                else -> {}
             }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to share config for GUID: $guid", e)
@@ -275,7 +270,7 @@ object AngConfigManager {
         ) {
             try {
                 val serverList: Array<Any> =
-                    JsonUtil.fromJson(server, Array<Any>::class.java)
+                    JsonUtil.fromJson(server, Array<Any>::class.java)?: arrayOf()
 
                 if (serverList.isNotEmpty()) {
                     var count = 0
@@ -425,17 +420,18 @@ object AngConfigManager {
                 }
             }
             Log.i(AppConfig.TAG, url)
+            val userAgent = it.second.userAgent
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
-                HttpUtil.getUrlContentWithUserAgent(url, 15000, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, userAgent, 15000, httpPort)
             } catch (e: Exception) {
                 Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error", e)
                 ""
             }
             if (configText.isEmpty()) {
                 configText = try {
-                    HttpUtil.getUrlContentWithUserAgent(url)
+                    HttpUtil.getUrlContentWithUserAgent(url, userAgent)
                 } catch (e: Exception) {
                     Log.e(AppConfig.TAG, "Update subscription: Failed to get URL content with user agent", e)
                     ""
@@ -444,7 +440,13 @@ object AngConfigManager {
             if (configText.isEmpty()) {
                 return 0
             }
-            return parseConfigViaSub(configText, it.first, false)
+            val count = parseConfigViaSub(configText, it.first, false)
+            if (count > 0) {
+                it.second.lastUpdated = System.currentTimeMillis()
+                MmkvManager.encodeSubscription(it.first, it.second)
+                Log.i(AppConfig.TAG, "Subscription updated: ${it.second.remarks}, $count configs")
+            }
+            return count
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to update config via subscription", e)
             return 0
@@ -490,31 +492,4 @@ object AngConfigManager {
         MmkvManager.encodeSubscription("", subItem)
         return 1
     }
-
-    /**
-     * Creates an intelligent selection configuration based on multiple server configurations.
-     *
-     * @param context The application context used for configuration generation.
-     * @param guidList The list of server GUIDs to be included in the intelligent selection.
-     *                 Each GUID represents a server configuration that will be combined.
-     * @param subid The subscription ID to associate with the generated configuration.
-     *              This helps organize the configuration under a specific subscription.
-     * @return The GUID key of the newly created intelligent selection configuration,
-     *         or null if the operation fails (e.g., empty guidList or configuration parsing error).
-     */
-    fun createIntelligentSelection(
-        context: Context,
-        guidList: List<String>,
-        subid: String
-    ): String? {
-        if (guidList.isEmpty()) {
-            return null
-        }
-        val result = V2rayConfigManager.genV2rayConfig(context, guidList) ?: return null
-        val config = CustomFmt.parse(JsonUtil.toJson(result)) ?: return null
-        config.subscriptionId = subid
-        val key = MmkvManager.encodeServerConfig("", config)
-        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(result) ?: "")
-        return key
-    }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt

@@ -1,242 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.util.Log
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.extension.removeWhiteSpace
-import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.util.JsonUtil
-
-object MigrateManager {
-    private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
-    private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-
-    /**
-     * Migrates server configurations to profile items.
-     *
-     * @return True if migration was successful, false otherwise.
-     */
-    fun migrateServerConfig2Profile(): Boolean {
-        if (serverStorage.count().toInt() == 0) {
-            return false
-        }
-        val serverList = serverStorage.allKeys() ?: return false
-        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + serverList.count())
-
-        for (guid in serverList) {
-            var configOld = decodeServerConfigOld(guid) ?: continue
-            var config = decodeServerConfig(guid)
-            if (config != null) {
-                serverStorage.remove(guid)
-                continue
-            }
-            config = migrateServerConfig2ProfileSub(configOld) ?: continue
-            config.subscriptionId = configOld.subscriptionId
-
-            MmkvManager.encodeServerConfig(guid, config)
-
-            //check and remove old
-            decodeServerConfig(guid) ?: continue
-            serverStorage.remove(guid)
-            Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + config.remarks)
-        }
-        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-end")
-        return true
-    }
-
-    /**
-     * Migrates a server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrateServerConfig2ProfileSub(configOld: ServerConfig): ProfileItem? {
-        return when (configOld.getProxyOutbound()?.protocol) {
-            EConfigType.VMESS.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.VLESS.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.TROJAN.name.lowercase() -> migrate2ProfileCommon(configOld)
-            EConfigType.SHADOWSOCKS.name.lowercase() -> migrate2ProfileCommon(configOld)
-
-            EConfigType.SOCKS.name.lowercase() -> migrate2ProfileSocks(configOld)
-            EConfigType.HTTP.name.lowercase() -> migrate2ProfileHttp(configOld)
-            EConfigType.WIREGUARD.name.lowercase() -> migrate2ProfileWireguard(configOld)
-            EConfigType.HYSTERIA2.name.lowercase() -> migrate2ProfileHysteria2(configOld)
-
-            EConfigType.CUSTOM.name.lowercase() -> migrate2ProfileCustom(configOld)
-
-            else -> null
-        }
-    }
-
-    /**
-     * Migrates a common server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileCommon(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(configOld.configType)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.method = outbound.getSecurityEncryption()
-        config.password = outbound.getPassword()
-        config.flow = outbound?.settings?.vnext?.first()?.users?.first()?.flow ?: outbound?.settings?.servers?.first()?.flow
-
-        config.network = outbound?.streamSettings?.network ?: NetworkType.TCP.type
-        outbound.getTransportSettingDetails()?.let { transportDetails ->
-            config.headerType = transportDetails[0].orEmpty()
-            config.host = transportDetails[1].orEmpty()
-            config.path = transportDetails[2].orEmpty()
-        }
-
-        config.seed = outbound?.streamSettings?.kcpSettings?.seed
-        config.quicSecurity = outbound?.streamSettings?.quicSettings?.security
-        config.quicKey = outbound?.streamSettings?.quicSettings?.key
-        config.mode = if (outbound?.streamSettings?.grpcSettings?.multiMode == true) "multi" else "gun"
-        config.serviceName = outbound?.streamSettings?.grpcSettings?.serviceName
-        config.authority = outbound?.streamSettings?.grpcSettings?.authority
-
-        config.security = outbound.streamSettings?.security
-        val tlsSettings = outbound?.streamSettings?.realitySettings ?: outbound?.streamSettings?.tlsSettings
-        config.insecure = tlsSettings?.allowInsecure
-        config.sni = tlsSettings?.serverName
-        config.fingerPrint = tlsSettings?.fingerprint
-        config.alpn = tlsSettings?.alpn?.joinToString(",").removeWhiteSpace().toString()
-
-        config.publicKey = tlsSettings?.publicKey
-        config.shortId = tlsSettings?.shortId
-        config.spiderX = tlsSettings?.spiderX
-
-        return config
-    }
-
-    /**
-     * Migrates a SOCKS server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileSocks(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SOCKS)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.username = outbound.settings?.servers?.first()?.users?.first()?.user
-        config.password = outbound.getPassword()
-
-        return config
-    }
-
-    /**
-     * Migrates an HTTP server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileHttp(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.HTTP)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.username = outbound.settings?.servers?.first()?.users?.first()?.user
-        config.password = outbound.getPassword()
-
-        return config
-    }
-
-    /**
-     * Migrates a WireGuard server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileWireguard(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.WIREGUARD)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-
-        outbound.settings?.let { wireguard ->
-            config.secretKey = wireguard.secretKey
-            config.localAddress = (wireguard.address as List<*>).joinToString(",").removeWhiteSpace().toString()
-            config.publicKey = wireguard.peers?.getOrNull(0)?.publicKey
-            config.mtu = wireguard.mtu
-            config.reserved = wireguard.reserved?.joinToString(",").removeWhiteSpace().toString()
-        }
-        return config
-    }
-
-    /**
-     * Migrates a Hysteria2 server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileHysteria2(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.HYSTERIA2)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-        config.password = outbound.getPassword()
-
-        config.security = AppConfig.TLS
-        outbound.streamSettings?.tlsSettings?.let { tlsSetting ->
-            config.insecure = tlsSetting.allowInsecure
-            config.sni = tlsSetting.serverName
-            config.alpn = tlsSetting.alpn?.joinToString(",").removeWhiteSpace().orEmpty()
-
-        }
-        config.obfsPassword = outbound.settings?.obfsPassword
-
-        return config
-    }
-
-    /**
-     * Migrates a custom server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
-    private fun migrate2ProfileCustom(configOld: ServerConfig): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.CUSTOM)
-
-        val outbound = configOld.getProxyOutbound() ?: return null
-        config.remarks = configOld.remarks
-        config.server = outbound.getServerAddress()
-        config.serverPort = outbound.getServerPort().toString()
-
-        return config
-    }
-
-    /**
-     * Decodes the old server configuration.
-     *
-     * @param guid The server GUID.
-     * @return The old server configuration.
-     */
-    private fun decodeServerConfigOld(guid: String): ServerConfig? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = serverStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ServerConfig::class.java)
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt

@@ -8,6 +8,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.WebDavConfig
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 
@@ -26,6 +27,7 @@ object MmkvManager {
     private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
     private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
     private const val KEY_SUB_IDS = "SUB_IDS"
+    private const val KEY_WEBDAV_CONFIG = "WEBDAV_CONFIG"
 
     //private val profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
     private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
@@ -77,7 +79,7 @@ object MmkvManager {
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList() ?: mutableListOf()
         }
     }
 
@@ -314,7 +316,8 @@ object MmkvManager {
         decodeSubsList().forEach { key ->
             val json = subStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                subscriptions.add(Pair(key, JsonUtil.fromJson(json, SubscriptionItem::class.java)))
+                val item = JsonUtil.fromJson(json, SubscriptionItem::class.java)?: SubscriptionItem()
+                subscriptions.add(Pair(key, item))
             }
         }
         return subscriptions
@@ -381,7 +384,7 @@ object MmkvManager {
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList()?: mutableListOf()
         }
     }
 
@@ -399,7 +402,8 @@ object MmkvManager {
         assetStorage.allKeys()?.forEach { key ->
             val json = assetStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                assetUrlItems.add(Pair(key, JsonUtil.fromJson(json, AssetUrlItem::class.java)))
+                val item = JsonUtil.fromJson(json, AssetUrlItem::class.java)?: AssetUrlItem()
+                assetUrlItems.add(Pair(key, item))
             }
         }
         return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
@@ -448,7 +452,7 @@ object MmkvManager {
     fun decodeRoutingRulesets(): MutableList<RulesetItem>? {
         val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET)
         if (ruleset.isNullOrEmpty()) return null
-        return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
+        return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java)?.toMutableList()?: mutableListOf()
     }
 
     /**
@@ -465,6 +469,7 @@ object MmkvManager {
 
     //endregion
 
+    //region settings
     /**
      * Encodes the settings.
      *
@@ -487,6 +492,28 @@ object MmkvManager {
         return settingsStorage.encode(key, value)
     }
 
+    /**
+     * Encodes the settings.
+     *
+     * @param key The settings key.
+     * @param value The settings value.
+     * @return Whether the encoding was successful.
+     */
+    fun encodeSettings(key: String, value: Long): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
+    /**
+     * Encodes the settings.
+     *
+     * @param key The settings key.
+     * @param value The settings value.
+     * @return Whether the encoding was successful.
+     */
+    fun encodeSettings(key: String, value: Float): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
     /**
      * Encodes the settings.
      *
@@ -530,6 +557,39 @@ object MmkvManager {
         return settingsStorage.decodeString(key, defaultValue)
     }
 
+    /**
+     * Decodes the settings integer.
+     *
+     * @param key The settings key.
+     * @param defaultValue The default value.
+     * @return The settings value.
+     */
+    fun decodeSettingsInt(key: String, defaultValue: Int): Int {
+        return settingsStorage.decodeInt(key, defaultValue)
+    }
+
+    /**
+     * Decodes the settings long.
+     *
+     * @param key The settings key.
+     * @param defaultValue The default value.
+     * @return The settings value.
+     */
+    fun decodeSettingsLong(key: String, defaultValue: Long): Long {
+        return settingsStorage.decodeLong(key, defaultValue)
+    }
+
+    /**
+     * Decodes the settings float.
+     *
+     * @param key The settings key.
+     * @param defaultValue The default value.
+     * @return The settings value.
+     */
+    fun decodeSettingsFloat(key: String, defaultValue: Float): Float {
+        return settingsStorage.decodeFloat(key, defaultValue)
+    }
+
     /**
      * Decodes the settings boolean.
      *
@@ -561,10 +621,6 @@ object MmkvManager {
         return settingsStorage.decodeStringSet(key)
     }
 
-    //endregion
-
-    //region Others
-
     /**
      * Encodes the start on boot setting.
      *
@@ -585,4 +641,22 @@ object MmkvManager {
 
     //endregion
 
+    //region WebDAV
+
+    /**
+     * Encodes the WebDAV config as JSON into storage.
+     */
+    fun encodeWebDavConfig(config: WebDavConfig): Boolean {
+        return mainStorage.encode(KEY_WEBDAV_CONFIG, JsonUtil.toJson(config))
+    }
+
+    /**
+     * Decodes the WebDAV config from storage.
+     */
+    fun decodeWebDavConfig(): WebDavConfig? {
+        val json = mainStorage.decodeString(KEY_WEBDAV_CONFIG) ?: return null
+        return JsonUtil.fromJson(json, WebDavConfig::class.java)
+    }
+
+    //endregion
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvPreferenceDataStore.kt

@@ -0,0 +1,80 @@
+package com.v2ray.ang.handler
+
+import androidx.preference.PreferenceDataStore
+import com.v2ray.ang.AppConfig
+
+/**
+ * PreferenceDataStore implementation that bridges AndroidX Preference framework to MMKV storage.
+ * This ensures that all Preference UI operations read/write directly from/to MMKV,
+ * avoiding inconsistencies between SharedPreferences and MMKV.
+ */
+class MmkvPreferenceDataStore : PreferenceDataStore() {
+
+    override fun putString(key: String, value: String?) {
+        MmkvManager.encodeSettings(key, value)
+        notifySettingChanged(key)
+    }
+
+    override fun getString(key: String, defaultValue: String?): String? {
+        return MmkvManager.decodeSettingsString(key, defaultValue)
+    }
+
+    override fun putInt(key: String, value: Int) {
+        MmkvManager.encodeSettings(key, value)
+        notifySettingChanged(key)
+    }
+
+    override fun getInt(key: String, defaultValue: Int): Int {
+        return MmkvManager.decodeSettingsInt(key, defaultValue)
+    }
+
+    override fun putLong(key: String, value: Long) {
+        MmkvManager.encodeSettings(key, value)
+        notifySettingChanged(key)
+    }
+
+    override fun getLong(key: String, defaultValue: Long): Long {
+        return MmkvManager.decodeSettingsLong(key, defaultValue)
+    }
+
+    override fun putFloat(key: String, value: Float) {
+        MmkvManager.encodeSettings(key, value)
+        notifySettingChanged(key)
+    }
+
+    override fun getFloat(key: String, defaultValue: Float): Float {
+        return MmkvManager.decodeSettingsFloat(key, defaultValue)
+    }
+
+    override fun putBoolean(key: String, value: Boolean) {
+        MmkvManager.encodeSettings(key, value)
+        notifySettingChanged(key)
+    }
+
+    override fun getBoolean(key: String, defaultValue: Boolean): Boolean {
+        return MmkvManager.decodeSettingsBool(key, defaultValue)
+    }
+
+    override fun putStringSet(key: String, values: MutableSet<String>?) {
+        if (values == null) {
+            MmkvManager.encodeSettings(key, null as String?)
+        } else {
+            MmkvManager.encodeSettings(key, values)
+        }
+        notifySettingChanged(key)
+    }
+
+    override fun getStringSet(key: String, defaultValues: MutableSet<String>?): MutableSet<String>? {
+        return MmkvManager.decodeSettingsStringSet(key) ?: defaultValues
+    }
+
+    // Internal helper: notify other modules about setting changes
+    private fun notifySettingChanged(key: String) {
+        // Call SettingsManager.setNightMode if UI mode changed
+        if (key == AppConfig.PREF_UI_MODE_NIGHT) {
+            SettingsManager.setNightMode()
+        }
+        // Notify listeners that require service restart or reinit
+        SettingsChangeManager.makeRestartService()
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/handler/NotificationManager.kt

@@ -15,7 +15,6 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toSpeedString
-import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.ui.MainActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -90,11 +89,7 @@ object NotificationManager {
      */
     fun showNotification(currentConfig: ProfileItem?) {
         val service = getService() ?: return
-        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        } else {
-            PendingIntent.FLAG_UPDATE_CURRENT
-        }
+        val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
 
         val startMainIntent = Intent(service, MainActivity::class.java)
         val contentPendingIntent = PendingIntent.getActivity(service, NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent, flags)
@@ -147,11 +142,7 @@ object NotificationManager {
      */
     fun cancelNotification() {
         val service = getService() ?: return
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
-        } else {
-            service.stopForeground(true)
-        }
+        service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
 
         mBuilder = null
         speedNotificationJob?.cancel()
@@ -232,7 +223,7 @@ object NotificationManager {
      */
     private fun appendSpeedString(text: StringBuilder, name: String?, up: Double, down: Double) {
         var n = name ?: "no tag"
-        n = n.substring(0, min(n.length, 6))
+        n = n.take(min(n.length, 6))
         text.append(n)
         for (i in n.length..6 step 2) {
             text.append("\t")

V2rayNG/app/src/main/java/com/v2ray/ang/handler/PluginServiceManager.kt

@@ -1,141 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.content.Context
-import android.os.SystemClock
-import android.util.Log
-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.service.ProcessService
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import java.io.File
-
-object PluginServiceManager {
-    private const val HYSTERIA2 = "libhysteria2.so"
-
-    private val procService: ProcessService by lazy {
-        ProcessService()
-    }
-
-    /**
-     * Run the plugin based on the provided configuration.
-     *
-     * @param context The context to use.
-     * @param config The profile configuration.
-     * @param socksPort The port information.
-     */
-    fun runPlugin(context: Context, config: ProfileItem?, socksPort: Int?) {
-        Log.i(AppConfig.TAG, "Starting plugin execution")
-
-        if (config == null) {
-            Log.w(AppConfig.TAG, "Cannot run plugin: config is null")
-            return
-        }
-
-        try {
-            if (config.configType == EConfigType.HYSTERIA2) {
-                if (socksPort == null) {
-                    Log.w(AppConfig.TAG, "Cannot run plugin: socksPort is null")
-                    return
-                }
-                Log.i(AppConfig.TAG, "Running Hysteria2 plugin")
-                val configFile = genConfigHy2(context, config, socksPort) ?: return
-                val cmd = genCmdHy2(context, configFile)
-
-                procService.runProcess(context, cmd)
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Error running plugin", e)
-        }
-    }
-
-    /**
-     * Stop the running plugin.
-     */
-    fun stopPlugin() {
-        stopHy2()
-    }
-
-    /**
-     * Perform a real ping using Hysteria2.
-     *
-     * @param context The context to use.
-     * @param config The profile configuration.
-     * @return The ping delay in milliseconds, or -1 if it fails.
-     */
-    fun realPingHy2(context: Context, config: ProfileItem?): Long {
-        Log.i(AppConfig.TAG, "realPingHy2")
-        val retFailure = -1L
-
-        if (config?.configType?.equals(EConfigType.HYSTERIA2) == true) {
-            val socksPort = Utils.findFreePort(listOf(0))
-            val configFile = genConfigHy2(context, config, socksPort) ?: return retFailure
-            val cmd = genCmdHy2(context, configFile)
-
-            val proc = ProcessService()
-            proc.runProcess(context, cmd)
-            Thread.sleep(1000L)
-            val delay = SpeedtestManager.testConnection(context, socksPort)
-            proc.stopProcess()
-
-            return delay.first
-        }
-        return retFailure
-    }
-
-    /**
-     * Generate the configuration file for Hysteria2.
-     *
-     * @param context The context to use.
-     * @param config The profile configuration.
-     * @param socksPort The port information.
-     * @return The generated configuration file.
-     */
-    private fun genConfigHy2(context: Context, config: ProfileItem, socksPort: Int): File? {
-        Log.i(AppConfig.TAG, "runPlugin $HYSTERIA2")
-
-        val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return null
-
-        val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
-        Log.i(AppConfig.TAG, "runPlugin ${configFile.absolutePath}")
-
-        configFile.parentFile?.mkdirs()
-        configFile.writeText(JsonUtil.toJson(hy2Config))
-        Log.i(AppConfig.TAG, JsonUtil.toJson(hy2Config))
-
-        return configFile
-    }
-
-    /**
-     * Generate the command to run Hysteria2.
-     *
-     * @param context The context to use.
-     * @param configFile The configuration file.
-     * @return The command to run Hysteria2.
-     */
-    private fun genCmdHy2(context: Context, configFile: File): MutableList<String> {
-        return mutableListOf(
-            File(context.applicationInfo.nativeLibraryDir, HYSTERIA2).absolutePath,
-            "--disable-update-check",
-            "--config",
-            configFile.absolutePath,
-            "--log-level",
-            "warn",
-            "client"
-        )
-    }
-
-    /**
-     * Stop the Hysteria2 process.
-     */
-    private fun stopHy2() {
-        try {
-            Log.i(AppConfig.TAG, "$HYSTERIA2 destroy")
-            procService?.stopProcess()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to stop Hysteria2 process", e)
-        }
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsChangeManager.kt

@@ -0,0 +1,32 @@
+package com.v2ray.ang.handler
+
+import kotlinx.coroutines.flow.MutableStateFlow
+
+object SettingsChangeManager {
+    private val _restartService = MutableStateFlow(false)
+    private val _setupGroupTab = MutableStateFlow(false)
+
+    // Mark restartService as requiring a restart
+    fun makeRestartService() {
+        _restartService.value = true
+    }
+
+    // Read and clear the restartService flag
+    fun consumeRestartService(): Boolean {
+        val v = _restartService.value
+        _restartService.value = false
+        return v
+    }
+
+    // Mark reinitGroupTab as requiring tab reinitialization
+    fun makeSetupGroupTab() {
+        _setupGroupTab.value = true
+    }
+
+    // Read and clear the reinitGroupTab flag
+    fun consumeSetupGroupTab(): Boolean {
+        val v = _setupGroupTab.value
+        _setupGroupTab.value = false
+        return v
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt

@@ -53,7 +53,7 @@ object SettingsManager {
             return null
         }
 
-        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
+        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java)?.toMutableList()
     }
 
     /**
@@ -77,7 +77,7 @@ object SettingsManager {
         }
 
         try {
-            val rulesetList = JsonUtil.fromJson(content, Array<RulesetItem>::class.java).toMutableList()
+            val rulesetList = JsonUtil.fromJson(content, Array<RulesetItem>::class.java)?.toMutableList()
             if (rulesetList.isNullOrEmpty()) {
                 return false
             }
@@ -172,7 +172,7 @@ object SettingsManager {
         if (config.configType == EConfigType.CUSTOM) {
             val raw = MmkvManager.decodeServerRaw(guid) ?: return false
             val v2rayConfig = JsonUtil.fromJson(raw, V2rayConfig::class.java)
-            val exist = v2rayConfig.routing.rules.filter { it.outboundTag == TAG_DIRECT }.any {
+            val exist = v2rayConfig?.routing?.rules?.filter { it.outboundTag == TAG_DIRECT }?.any {
                 it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
             }
             return exist == true
@@ -205,7 +205,7 @@ object SettingsManager {
      */
     fun swapSubscriptions(fromPosition: Int, toPosition: Int) {
         val subsList = MmkvManager.decodeSubsList()
-        if (subsList.isNullOrEmpty()) return
+        if (subsList.isEmpty()) return
 
         Collections.swap(subsList, fromPosition, toPosition)
         MmkvManager.encodeSubsList(subsList)
@@ -338,12 +338,12 @@ object SettingsManager {
             Language.ENGLISH -> Locale.ENGLISH
             Language.CHINA -> Locale.CHINA
             Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
-            Language.VIETNAMESE -> Locale("vi")
-            Language.RUSSIAN -> Locale("ru")
-            Language.PERSIAN -> Locale("fa")
-            Language.ARABIC -> Locale("ar")
-            Language.BANGLA -> Locale("bn")
-            Language.BAKHTIARI -> Locale("bqi", "IR")
+            Language.VIETNAMESE -> Locale.forLanguageTag("vi")
+            Language.RUSSIAN -> Locale.forLanguageTag("ru")
+            Language.PERSIAN -> Locale.forLanguageTag("fa")
+            Language.ARABIC -> Locale.forLanguageTag("ar")
+            Language.BANGLA -> Locale.forLanguageTag("bn")
+            Language.BAKHTIARI -> Locale.forLanguageTag("bqi-IR")
         }
     }
 
@@ -370,4 +370,46 @@ 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)
+    }
+
+    /**
+     * Check if HEV TUN is being used.
+     * @return True if HEV TUN is used, false otherwise.
+     */
+    fun isUsingHevTun(): Boolean {
+        return MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL, true)
+    }
+
+    /**
+     * Ensure default settings are present in MMKV.
+     */
+    fun ensureDefaultSettings() {
+        // Write defaults in the exact order requested by the user
+        ensureDefaultValue(AppConfig.PREF_MODE, AppConfig.VPN)
+        ensureDefaultValue(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
+        ensureDefaultValue(AppConfig.PREF_VPN_MTU, AppConfig.VPN_MTU.toString())
+        ensureDefaultValue(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+        ensureDefaultValue(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
+        ensureDefaultValue(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
+        ensureDefaultValue(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
+        ensureDefaultValue(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)
+        ensureDefaultValue(AppConfig.PREF_IP_API_URL, AppConfig.IP_API_URL)
+        ensureDefaultValue(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT, AppConfig.HEVTUN_RW_TIMEOUT)
+        ensureDefaultValue(AppConfig.PREF_MUX_CONCURRENCY, "8")
+        ensureDefaultValue(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
+        ensureDefaultValue(AppConfig.PREF_FRAGMENT_LENGTH, "50-100")
+        ensureDefaultValue(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
+    }
+
+    private fun ensureDefaultValue(key: String, default: String) {
+        if (MmkvManager.decodeSettingsString(key).isNullOrEmpty()) {
+            MmkvManager.encodeSettings(key, default)
+        }
+    }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt

@@ -2,21 +2,18 @@ package com.v2ray.ang.handler
 
 import android.content.Context
 import android.os.SystemClock
-import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.IPAPIInfo
-import com.v2ray.ang.extension.responseLength
 import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.JsonUtil
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.isActive
-import libv2ray.Libv2ray
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.net.UnknownHostException
-import kotlin.coroutines.coroutineContext
 
 object SpeedtestManager {
 
@@ -33,7 +30,7 @@ object SpeedtestManager {
         var time = -1L
         for (k in 0 until 2) {
             val one = socketConnectTime(url, port)
-            if (!coroutineContext.isActive) {
+            if (!currentCoroutineContext().isActive) {
                 break
             }
             if (one != -1L && (time == -1L || one < time)) {
@@ -43,46 +40,6 @@ object SpeedtestManager {
         return time
     }
 
-    /**
-     * Measures the real ping time using the V2Ray library.
-     *
-     * @param config The configuration string for the V2Ray library.
-     * @return The ping time in milliseconds, or -1 if the ping failed.
-     */
-    fun realPing(config: String): Long {
-        return try {
-            Libv2ray.measureOutboundDelay(config, SettingsManager.getDelayTestUrl())
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to measure outbound delay", e)
-            -1L
-        }
-    }
-
-    /**
-     * Measures the ping time to a given URL using the system ping command.
-     *
-     * @param url The URL to ping.
-     * @return The ping time in milliseconds as a string, or "-1ms" if the ping failed.
-     */
-    fun ping(url: String): String {
-        try {
-            val command = "/system/bin/ping -c 3 $url"
-            val process = Runtime.getRuntime().exec(command)
-            val allText = process.inputStream.bufferedReader().use { it.readText() }
-            if (!TextUtils.isEmpty(allText)) {
-                val tempInfo = allText.substring(allText.indexOf("min/avg/max/mdev") + 19)
-                val temps =
-                    tempInfo.split("/".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-                if (temps.count() > 0 && temps[0].length < 10) {
-                    return temps[0].toFloat().toInt().toString() + "ms"
-                }
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to ping URL: $url", e)
-        }
-        return "-1ms"
-    }
-
     /**
      * Measures the time taken to establish a TCP connection to a given URL and port.
      *
@@ -143,14 +100,11 @@ object SpeedtestManager {
             val code = conn.responseCode
             elapsed = SystemClock.elapsedRealtime() - start
 
-            if (code == 204 || code == 200 && conn.responseLength == 0L) {
-                result = context.getString(R.string.connection_test_available, elapsed)
-            } else {
-                throw IOException(
-                    context.getString(
-                        R.string.connection_test_error_status_code,
-                        code
-                    )
+            result = when (code) {
+                204 -> context.getString(R.string.connection_test_available, elapsed)
+                200 if conn.contentLengthLong == 0L -> context.getString(R.string.connection_test_available, elapsed)
+                else -> throw IOException(
+                    context.getString(R.string.connection_test_error_status_code, code)
                 )
             }
         } catch (e: IOException) {
@@ -167,23 +121,27 @@ object SpeedtestManager {
     }
 
     fun getRemoteIPInfo(): String? {
+        val url = MmkvManager.decodeSettingsString(AppConfig.PREF_IP_API_URL)
+            .takeIf { !it.isNullOrBlank() } ?: AppConfig.IP_API_URL
+
         val httpPort = SettingsManager.getHttpPort()
-        var content = HttpUtil.getUrlContent(AppConfig.IP_API_URL, 5000, httpPort) ?: return null
+        val content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: return null
+        val ipInfo = JsonUtil.fromJson(content, IPAPIInfo::class.java) ?: return null
 
-        var ipInfo = JsonUtil.fromJson(content, IPAPIInfo::class.java) ?: return null
-        var ip = ipInfo.ip ?: ipInfo.clientIp ?: ipInfo.ip_addr ?: ipInfo.query
-        var country = ipInfo.country_code ?: ipInfo.country ?: ipInfo.countryCode
+        val ip = listOf(
+            ipInfo.ip,
+            ipInfo.clientIp,
+            ipInfo.ip_addr,
+            ipInfo.query
+        ).firstOrNull { !it.isNullOrBlank() }
 
-        return "(${country ?: "unknown"}) $ip"
+        val country = listOf(
+            ipInfo.country_code,
+            ipInfo.country,
+            ipInfo.countryCode,
+            ipInfo.location?.country_code
+        ).firstOrNull { !it.isNullOrBlank() }
+
+        return "(${country ?: "unknown"}) ${ip ?: "unknown"}"
     }
-
-    /**
-     * Gets the version of the V2Ray library.
-     *
-     * @return The version of the V2Ray library.
-     */
-    fun getLibVersion(): String {
-        return Libv2ray.checkVersionX()
-    }
-
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt

@@ -17,41 +17,48 @@ import java.io.FileOutputStream
 
 object UpdateCheckerManager {
     suspend fun checkForUpdate(includePreRelease: Boolean = false): CheckUpdateResult = withContext(Dispatchers.IO) {
-            val url = if (includePreRelease) {
-                AppConfig.APP_API_URL
-            } else {
-                AppConfig.APP_API_URL.concatUrl("latest")
-            }
+        val url = if (includePreRelease) {
+            AppConfig.APP_API_URL
+        } else {
+            AppConfig.APP_API_URL.concatUrl("latest")
+        }
 
-            var response = HttpUtil.getUrlContent(url, 5000)
-            if (response.isNullOrEmpty()) {
-                val httpPort = SettingsManager.getHttpPort()
-                response = HttpUtil.getUrlContent(url, 5000, httpPort) ?: throw IllegalStateException("Failed to get response")
-            }
+        var response = HttpUtil.getUrlContent(url, 5000)
+        if (response.isNullOrEmpty()) {
+            val httpPort = SettingsManager.getHttpPort()
+            response = HttpUtil.getUrlContent(url, 5000, httpPort)
+                ?: throw IllegalStateException("Failed to get response")
+        }
 
-            val latestRelease = if (includePreRelease) {
-                JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
-                    .firstOrNull()
-                    ?: throw IllegalStateException("No pre-release found")
-            } else {
-                JsonUtil.fromJson(response, GitHubRelease::class.java)
-            }
+        val latestRelease = if (includePreRelease) {
+            JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
+                ?.firstOrNull()
+                ?: throw IllegalStateException("No pre-release found")
+        } else {
+            JsonUtil.fromJson(response, GitHubRelease::class.java)
+        }
+        if (latestRelease == null) {
+            return@withContext CheckUpdateResult(hasUpdate = false)
+        }
 
-            val latestVersion = latestRelease.tagName.removePrefix("v")
-            Log.i(AppConfig.TAG, "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})")
+        val latestVersion = latestRelease.tagName.removePrefix("v")
+        Log.i(
+            AppConfig.TAG,
+            "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})"
+        )
 
-            return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
-                val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
-                CheckUpdateResult(
-                    hasUpdate = true,
-                    latestVersion = latestVersion,
-                    releaseNotes = latestRelease.body,
-                    downloadUrl = downloadUrl,
-                    isPreRelease = latestRelease.prerelease
-                )
-            } else {
-                CheckUpdateResult(hasUpdate = false)
-            }
+        return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
+            val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
+            CheckUpdateResult(
+                hasUpdate = true,
+                latestVersion = latestVersion,
+                releaseNotes = latestRelease.body,
+                downloadUrl = downloadUrl,
+                isPreRelease = latestRelease.prerelease
+            )
+        } else {
+            CheckUpdateResult(hasUpdate = false)
+        }
     }
 
     suspend fun downloadApk(context: Context, downloadUrl: String): File? = withContext(Dispatchers.IO) {
@@ -100,8 +107,19 @@ object UpdateCheckerManager {
     }
 
     private fun getDownloadUrl(release: GitHubRelease, abi: String): String {
-        return release.assets.find { it.name.contains(abi) }?.browserDownloadUrl
-            ?: release.assets.firstOrNull()?.browserDownloadUrl
+        val fDroid = "fdroid"
+
+        val assetsByAbi = release.assets.filter {
+            (it.name.contains(abi, true))
+        }
+
+        val asset = if (BuildConfig.APPLICATION_ID.contains(fDroid, ignoreCase = true)) {
+            assetsByAbi.firstOrNull { it.name.contains(fDroid) }
+        } else {
+            assetsByAbi.firstOrNull { !it.name.contains(fDroid) }
+        }
+
+        return asset?.browserDownloadUrl
             ?: throw IllegalStateException("No compatible APK found")
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayNativeManager.kt

@@ -0,0 +1,91 @@
+package com.v2ray.ang.handler
+
+import android.content.Context
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.util.Utils
+import go.Seq
+import libv2ray.CoreCallbackHandler
+import libv2ray.CoreController
+import libv2ray.Libv2ray
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * V2Ray Native Library Manager
+ *
+ * Thread-safe singleton wrapper for Libv2ray native methods.
+ * Provides initialization protection and unified API for V2Ray core operations.
+ */
+object V2RayNativeManager {
+    private val initialized = AtomicBoolean(false)
+
+    /**
+     * Initialize V2Ray core environment.
+     * This method is thread-safe and ensures initialization happens only once.
+     * Subsequent calls will be ignored silently.
+     *
+     */
+    fun initCoreEnv(context: Context?) {
+        if (initialized.compareAndSet(false, true)) {
+            try {
+                Seq.setContext(context?.applicationContext)
+                val assetPath = Utils.userAssetPath(context)
+                val deviceId = Utils.getDeviceIdForXUDPBaseKey()
+                Libv2ray.initCoreEnv(assetPath, deviceId)
+                Log.i(AppConfig.TAG, "V2Ray core environment initialized successfully")
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to initialize V2Ray core environment", e)
+                initialized.set(false)
+                throw e
+            }
+        } else {
+            Log.d(AppConfig.TAG, "V2Ray core environment already initialized, skipping")
+        }
+    }
+
+
+    /**
+     * Get V2Ray core version.
+     *
+     * @return Version string of the V2Ray core
+     */
+    fun getLibVersion(): String {
+        return try {
+            Libv2ray.checkVersionX()
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to check V2Ray version", e)
+            "Unknown"
+        }
+    }
+
+    /**
+     * Measure outbound connection delay.
+     *
+     * @param config The configuration JSON string
+     * @param testUrl The URL to test against
+     * @return Delay in milliseconds, or -1 if test failed
+     */
+    fun measureOutboundDelay(config: String, testUrl: String): Long {
+        return try {
+            Libv2ray.measureOutboundDelay(config, testUrl)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to measure outbound delay", e)
+            -1L
+        }
+    }
+
+    /**
+     * Create a new core controller instance.
+     *
+     * @param handler The callback handler for core events
+     * @return A new CoreController instance
+     */
+    fun newCoreController(handler: CoreCallbackHandler): CoreController {
+        return try {
+            Libv2ray.newCoreController(handler)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to create core controller", e)
+            throw e
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt

@@ -5,7 +5,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.Build
+import android.os.ParcelFileDescriptor
 import android.util.Log
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
@@ -17,28 +17,24 @@ 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.handler.PluginServiceManager
 import com.v2ray.ang.util.Utils
-import go.Seq
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import libv2ray.CoreCallbackHandler
 import libv2ray.CoreController
-import libv2ray.Libv2ray
 import java.lang.ref.SoftReference
 
 object V2RayServiceManager {
 
-    private val coreController: CoreController = Libv2ray.newCoreController(CoreCallback())
+    private val coreController: CoreController = V2RayNativeManager.newCoreController(CoreCallback())
     private val mMsgReceive = ReceiveMessageHandler()
     private var currentConfig: ProfileItem? = null
 
     var serviceControl: SoftReference<ServiceControl>? = null
         set(value) {
             field = value
-            Seq.setContext(value?.get()?.getService()?.applicationContext)
-            Libv2ray.initCoreEnv(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
+            V2RayNativeManager.initCoreEnv(value?.get()?.getService())
         }
 
     /**
@@ -72,7 +68,7 @@ object V2RayServiceManager {
      * @param context The context from which the service is stopped.
      */
     fun stopVService(context: Context) {
-        context.toast(R.string.toast_services_stop)
+        //context.toast(R.string.toast_services_stop)
         MessageUtil.sendMsg2Service(context, AppConfig.MSG_STATE_STOP, "")
     }
 
@@ -100,13 +96,14 @@ object V2RayServiceManager {
         val guid = MmkvManager.getSelectServer() ?: return
         val config = MmkvManager.decodeServerConfig(guid) ?: return
         if (config.configType != EConfigType.CUSTOM
+            && config.configType != EConfigType.POLICYGROUP
             && !Utils.isValidUrl(config.server)
             && !Utils.isPureIpAddress(config.server.orEmpty())
         ) return
 //        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
 //        if (!result.status) return
 
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING)) {
             context.toast(R.string.toast_warning_pref_proxysharing_short)
         } else {
             context.toast(R.string.toast_services_start)
@@ -116,11 +113,7 @@ object V2RayServiceManager {
         } else {
             Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
         }
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
-            context.startForegroundService(intent)
-        } else {
-            context.startService(intent)
-        }
+        ContextCompat.startForegroundService(context, intent)
     }
 
     /**
@@ -128,7 +121,7 @@ object V2RayServiceManager {
      * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
      * Starts the V2Ray core service.
      */
-    fun startCoreLoop(): Boolean {
+    fun startCoreLoop(vpnInterface: ParcelFileDescriptor?): Boolean {
         if (coreController.isRunning) {
             return false
         }
@@ -152,9 +145,13 @@ object V2RayServiceManager {
         }
 
         currentConfig = config
+        var tunFd = vpnInterface?.fd ?: 0
+        if (SettingsManager.isUsingHevTun()) {
+            tunFd = 0
+        }
 
         try {
-            coreController.startLoop(result.content)
+            coreController.startLoop(result.content, tunFd)
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to start Core loop", e)
             return false
@@ -171,7 +168,6 @@ object V2RayServiceManager {
             NotificationManager.showNotification(currentConfig)
             NotificationManager.startSpeedNotification(currentConfig)
 
-            PluginServiceManager.runPlugin(service, config, result.socksPort)
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to startup service", e)
             return false
@@ -205,7 +201,6 @@ object V2RayServiceManager {
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
         }
-        PluginServiceManager.stopPlugin()
 
         return true
     }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -3,8 +3,8 @@ package com.v2ray.ang.handler
 import android.content.Context
 import android.text.TextUtils
 import android.util.Log
+import com.google.gson.JsonArray
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
 import com.v2ray.ang.dto.ConfigResult
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
@@ -16,8 +16,8 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
 import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.HttpFmt
+import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
 import com.v2ray.ang.fmt.SocksFmt
 import com.v2ray.ang.fmt.TrojanFmt
@@ -30,6 +30,7 @@ import com.v2ray.ang.util.Utils
 
 object V2rayConfigManager {
     private var initConfigCache: String? = null
+    private var initConfigCacheWithTun: String? = null
 
     //region get config function
 
@@ -44,7 +45,9 @@ object V2rayConfigManager {
         try {
             val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
             return if (config.configType == EConfigType.CUSTOM) {
-                getV2rayCustomConfig(guid, config)
+                getV2rayCustomConfig(context, guid, config)
+            } else if (config.configType == EConfigType.POLICYGROUP) {
+                getV2rayGroupConfig(context, guid, config)
             } else {
                 getV2rayNormalConfig(context, guid, config)
             }
@@ -54,27 +57,6 @@ object V2rayConfigManager {
         }
     }
 
-    /**
-     * Generates a V2ray configuration from multiple server profiles.
-     *
-     * @param context The context of the caller.
-     * @param guidList A list of server GUIDs to be included in the generated configuration.
-     *                 Each GUID represents a unique server profile stored in the system.
-     * @return A V2rayConfig object containing the combined configuration of all specified servers,
-     *         or null if the operation fails (e.g., no valid configurations found, parsing errors)
-     */
-    fun genV2rayConfig(context: Context, guidList: List<String>): V2rayConfig? {
-        try {
-            val configList = guidList.mapNotNull { guid ->
-                MmkvManager.decodeServerConfig(guid)
-            }
-            return genV2rayMultipleConfig(context, configList)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to generate V2ray config", e)
-            return null
-        }
-    }
-
     /**
      * Retrieves the speedtest V2ray configuration for the given GUID.
      *
@@ -86,7 +68,10 @@ object V2rayConfigManager {
         try {
             val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
             return if (config.configType == EConfigType.CUSTOM) {
-                getV2rayCustomConfig(guid, config)
+                getV2rayCustomConfig(context, guid, config)
+            } else if (config.configType == EConfigType.POLICYGROUP) {
+                // The number of policy groups will not be very large, so no special handling is needed.
+                getV2rayGroupConfig(context, guid, config)
             } else {
                 getV2rayNormalConfig4Speedtest(context, guid, config)
             }
@@ -103,9 +88,87 @@ object V2rayConfigManager {
      * @param config The profile item containing the configuration details.
      * @return A ConfigResult object containing the result of the configuration retrieval.
      */
-    private fun getV2rayCustomConfig(guid: String, config: ProfileItem): ConfigResult {
+    private fun getV2rayCustomConfig(context: Context, guid: String, config: ProfileItem): ConfigResult {
         val raw = MmkvManager.decodeServerRaw(guid) ?: return ConfigResult(false)
-        return ConfigResult(true, guid, raw)
+        val result = ConfigResult(true, guid, raw)
+        if (SettingsManager.isUsingHevTun()) {
+            return result
+        }
+
+        // check if tun inbound exists
+        val json = JsonUtil.parseString(raw) ?: return result
+        val inboundsJson = if (json.has("inbounds") && json.get("inbounds")?.isJsonNull == false) {
+            json.getAsJsonArray("inbounds")
+        } else {
+            JsonArray()
+        }
+
+        for (i in 0 until inboundsJson.size()) {
+            val elem = inboundsJson.get(i)
+            if (elem.isJsonObject) {
+                val inb = elem.asJsonObject
+                val tag = if (inb.has("tag") && inb.get("tag")?.isJsonNull == false) inb.get("tag").asString else ""
+                if (tag == "tun") return result
+            }
+        }
+
+        // add tun inbound from template
+        val templateConfig = initV2rayConfig(context) ?: return result
+        val inboundTun = templateConfig.inbounds.firstOrNull { it.tag == "tun" } ?: return result
+        inboundTun.settings?.mtu = SettingsManager.getVpnMtu()
+
+        // add to json
+        inboundsJson.add(JsonUtil.parseString(JsonUtil.toJson(inboundTun)))
+        if (inboundsJson.size() == 1) {
+            json.add("inbounds", inboundsJson)
+        }
+
+        val updatedRaw = JsonUtil.toJsonPretty(json) ?: return result
+        return ConfigResult(true, guid, updatedRaw)
+    }
+
+    /**
+     * Retrieves the group V2ray configuration.
+     *
+     * @param context The context in which the function is called.
+     * @param guid The unique identifier for the V2ray configuration.
+     * @param config The profile item containing the configuration details.
+     * @return A ConfigResult object containing the result of the configuration retrieval.
+     */
+    private fun getV2rayGroupConfig(context: Context, guid: String, config: ProfileItem): ConfigResult {
+        val result = ConfigResult(false)
+
+        val serverList = MmkvManager.decodeServerList()
+        val configList = serverList
+            .mapNotNull { id -> MmkvManager.decodeServerConfig(id) }
+            .filter { profile ->
+                val subscriptionId = config.policyGroupSubscriptionId
+                if (subscriptionId.isNullOrBlank()) {
+                    true
+                } else {
+                    profile.subscriptionId == subscriptionId
+                }
+            }
+            .filter { profile ->
+                val filter = config.policyGroupFilter
+                if (filter.isNullOrBlank()) {
+                    true
+                } else {
+                    try {
+                        Regex(filter).containsMatchIn(profile.remarks)
+                    } catch (e: Exception) {
+                        profile.remarks.contains(filter)
+                    }
+                }
+            }
+
+        val v2rayConfig = getV2rayMultipleConfig(context, config, configList) ?: return result
+
+        result.status = true
+        result.content = JsonUtil.toJsonPretty(v2rayConfig) ?: ""
+        result.guid = guid
+
+        return result
     }
 
     /**
@@ -133,12 +196,8 @@ object V2rayConfigManager {
 
         getInbounds(v2rayConfig)
 
-        if (config.configType == EConfigType.HYSTERIA2) {
-            result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result
-        } else {
-            getOutbounds(v2rayConfig, config) ?: return result
-            getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        }
+        getOutbounds(v2rayConfig, config) ?: return result
+        getMoreOutbounds(v2rayConfig, config.subscriptionId)
 
         getRouting(v2rayConfig)
 
@@ -165,21 +224,12 @@ object V2rayConfigManager {
         return result
     }
 
-    private fun genV2rayMultipleConfig(context: Context, configList: List<ProfileItem>): V2rayConfig? {
+    private fun getV2rayMultipleConfig(context: Context, config: ProfileItem, configList: List<ProfileItem>): V2rayConfig? {
         val validConfigs = configList.asSequence().filter { it.server.isNotNullEmpty() }
             .filter { !Utils.isPureIpAddress(it.server!!) || Utils.isValidUrl(it.server!!) }
             .filter { it.configType != EConfigType.CUSTOM }
-            .filter { it.configType != EConfigType.HYSTERIA2 }
-            .filter { config ->
-                if (config.subscriptionId.isEmpty()) {
-                    return@filter true
-                }
-                val subItem = MmkvManager.decodeSubscription(config.subscriptionId)
-                if (subItem?.intelligentSelectionFilter.isNullOrEmpty() || config.remarks.isEmpty()) {
-                    return@filter true
-                }
-                Regex(pattern = subItem?.intelligentSelectionFilter!!).containsMatchIn(input = config.remarks)
-            }.toList()
+            .filter { it.configType != EConfigType.POLICYGROUP }
+            .toList()
 
         if (validConfigs.isEmpty()) {
             Log.w(AppConfig.TAG, "All configs are invalid")
@@ -188,21 +238,12 @@ object V2rayConfigManager {
 
         val v2rayConfig = initV2rayConfig(context) ?: return null
         v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
-
-        val subIds = configList.map { it.subscriptionId }.toHashSet()
-        val remarks = if (subIds.size == 1 && subIds.first().isNotEmpty()) {
-            val sub = MmkvManager.decodeSubscription(subIds.first())
-            (sub?.remarks ?: "") + context.getString(R.string.intelligent_selection)
-        } else {
-            context.getString(R.string.intelligent_selection)
-        }
-
-        v2rayConfig.remarks = remarks
+        v2rayConfig.remarks = config.remarks
 
         getInbounds(v2rayConfig)
 
         v2rayConfig.outbounds.removeAt(0)
-        val outboundsList = mutableListOf<V2rayConfig.OutboundBean>()
+        val outboundsList = mutableListOf<OutboundBean>()
         var index = 0
         for (config in validConfigs) {
             index++
@@ -221,12 +262,12 @@ object V2rayConfigManager {
 
         getDns(v2rayConfig)
 
-        getBalance(v2rayConfig)
+        getBalance(v2rayConfig, config)
 
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
             getCustomLocalDns(v2rayConfig)
         }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) {
+        if (!MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED)) {
             v2rayConfig.stats = null
             v2rayConfig.policy = null
         }
@@ -260,12 +301,8 @@ object V2rayConfigManager {
 
         val v2rayConfig = initV2rayConfig(context) ?: return result
 
-        if (config.configType == EConfigType.HYSTERIA2) {
-            result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result
-        } else {
-            getOutbounds(v2rayConfig, config) ?: return result
-            getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        }
+        getOutbounds(v2rayConfig, config) ?: return result
+        getMoreOutbounds(v2rayConfig, config.subscriptionId)
 
         v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
         v2rayConfig.inbounds.clear()
@@ -296,11 +333,20 @@ object V2rayConfigManager {
      * @return V2rayConfig object parsed from the JSON configuration, or null if the configuration is empty
      */
     private fun initV2rayConfig(context: Context): V2rayConfig? {
-        val assets = initConfigCache ?: Utils.readTextFromAssets(context, "v2ray_config.json")
-        if (TextUtils.isEmpty(assets)) {
-            return null
+        var assets = ""
+        if (SettingsManager.isUsingHevTun()) {
+            assets = initConfigCache ?: Utils.readTextFromAssets(context, "v2ray_config.json")
+            if (TextUtils.isEmpty(assets)) {
+                return null
+            }
+            initConfigCache = assets
+        } else {
+            assets = initConfigCacheWithTun ?: Utils.readTextFromAssets(context, "v2ray_config_with_tun.json")
+            if (TextUtils.isEmpty(assets)) {
+                return null
+            }
+            initConfigCacheWithTun = assets
         }
-        initConfigCache = assets
         val config = JsonUtil.fromJson(assets, V2rayConfig::class.java)
         return config
     }
@@ -322,34 +368,37 @@ object V2rayConfigManager {
     private fun getInbounds(v2rayConfig: V2rayConfig): Boolean {
         try {
             val socksPort = SettingsManager.getSocksPort()
+            val inbound1 = v2rayConfig.inbounds[0]
 
-            v2rayConfig.inbounds.forEach { curInbound ->
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
-                    //bind all inbounds to localhost if the user requests
-                    curInbound.listen = AppConfig.LOOPBACK
-                }
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
+                inbound1.listen = AppConfig.LOOPBACK
             }
-            v2rayConfig.inbounds[0].port = socksPort
+            inbound1.port = socksPort
             val fakedns = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
             val sniffAllTlsAndHttp =
                 MmkvManager.decodeSettingsBool(AppConfig.PREF_SNIFFING_ENABLED, true) != false
-            v2rayConfig.inbounds[0].sniffing?.enabled = fakedns || sniffAllTlsAndHttp
-            v2rayConfig.inbounds[0].sniffing?.routeOnly =
+            inbound1.sniffing?.enabled = fakedns || sniffAllTlsAndHttp
+            inbound1.sniffing?.routeOnly =
                 MmkvManager.decodeSettingsBool(AppConfig.PREF_ROUTE_ONLY_ENABLED, false)
             if (!sniffAllTlsAndHttp) {
-                v2rayConfig.inbounds[0].sniffing?.destOverride?.clear()
+                inbound1.sniffing?.destOverride?.clear()
             }
             if (fakedns) {
-                v2rayConfig.inbounds[0].sniffing?.destOverride?.add("fakedns")
+                inbound1.sniffing?.destOverride?.add("fakedns")
             }
 
-            if (Utils.isXray()) {
-                v2rayConfig.inbounds.removeAt(1)
-            } else {
-                val httpPort = SettingsManager.getHttpPort()
-                v2rayConfig.inbounds[1].port = httpPort
+            if (!Utils.isXray()) {
+                val inbound2 = JsonUtil.fromJson(JsonUtil.toJson(inbound1), V2rayConfig.InboundBean::class.java) ?: return false
+                inbound2.tag = EConfigType.HTTP.name.lowercase()
+                inbound2.port = SettingsManager.getHttpPort()
+                inbound2.protocol = EConfigType.HTTP.name.lowercase()
+                v2rayConfig.inbounds.add(inbound2)
             }
 
+            if (!SettingsManager.isUsingHevTun()) {
+                val inboundTun = v2rayConfig.inbounds.firstOrNull { e -> e.tag == "tun" }
+                inboundTun?.settings?.mtu = SettingsManager.getVpnMtu()
+            }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to configure inbounds", e)
             return false
@@ -470,27 +519,21 @@ 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 (SettingsManager.isUsingHevTun()) {
+                //hev-socks5-tunnel dns routing
+                v2rayConfig.routing.rules.add(
+                    0, RulesBean(
+                        inboundTag = arrayListOf("socks"),
+                        outboundTag = "dns-out",
+                        port = "53",
+                    )
                 )
-
-                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
+            } else {
+                v2rayConfig.routing.rules.add(
+                    0, RulesBean(
+                        inboundTag = arrayListOf("tun"),
+                        outboundTag = "dns-out",
+                        port = "53",
                     )
                 )
             }
@@ -498,7 +541,7 @@ object V2rayConfigManager {
             // DNS outbound
             if (v2rayConfig.outbounds.none { e -> e.protocol == "dns" && e.tag == "dns-out" }) {
                 v2rayConfig.outbounds.add(
-                    V2rayConfig.OutboundBean(
+                    OutboundBean(
                         protocol = "dns",
                         tag = "dns-out",
                         settings = null,
@@ -507,15 +550,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 +596,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 +638,25 @@ 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(
+                RulesBean(
+                    outboundTag = AppConfig.TAG_DIRECT,
+                    inboundTag = arrayListOf(AppConfig.TAG_DOMESTIC_DNS),
+                    domain = null
                 )
-            }
+            )
+            v2rayConfig.routing.rules.add(
+                RulesBean(
+                    outboundTag = AppConfig.TAG_PROXY,
+                    inboundTag = arrayListOf(AppConfig.TAG_DNS),
+                    domain = null
+                )
+            )
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to configure DNS", e)
             return false
@@ -665,44 +694,6 @@ object V2rayConfigManager {
         return true
     }
 
-    /**
-     * Configures special outbound settings for Hysteria2 protocol.
-     *
-     * Creates a SOCKS outbound connection on a free port for protocols requiring special handling.
-     *
-     * @param v2rayConfig The V2ray configuration object to be modified
-     * @param config The profile item containing connection details
-     * @return The port number for the SOCKS connection, or null if there was an error
-     */
-    private fun getPlusOutbounds(v2rayConfig: V2rayConfig, config: ProfileItem): Int? {
-        try {
-            val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
-
-            val outboundNew = OutboundBean(
-                mux = null,
-                protocol = EConfigType.SOCKS.name.lowercase(),
-                settings = OutSettingsBean(
-                    servers = listOf(
-                        OutSettingsBean.ServersBean(
-                            address = AppConfig.LOOPBACK,
-                            port = socksPort
-                        )
-                    )
-                )
-            )
-            if (v2rayConfig.outbounds.isNotEmpty()) {
-                v2rayConfig.outbounds[0] = outboundNew
-            } else {
-                v2rayConfig.outbounds.add(outboundNew)
-            }
-
-            return socksPort
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to configure plusOutbound", e)
-            return null
-        }
-    }
-
     /**
      * Configures additional outbound connections for proxy chaining.
      *
@@ -767,7 +758,7 @@ object V2rayConfigManager {
      * @param outbound The outbound connection to update
      * @return true if the update was successful, false otherwise
      */
-    private fun updateOutboundWithGlobalSettings(outbound: V2rayConfig.OutboundBean): Boolean {
+    private fun updateOutboundWithGlobalSettings(outbound: OutboundBean): Boolean {
         try {
             var muxEnabled = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
             val protocol = outbound.protocol
@@ -843,8 +834,7 @@ object V2rayConfigManager {
      *
      * @param v2rayConfig The V2ray configuration object to be modified with balancing settings
      */
-    private fun getBalance(v2rayConfig: V2rayConfig)
-    {
+    private fun getBalance(v2rayConfig: V2rayConfig, config: ProfileItem) {
         try {
             v2rayConfig.routing.rules.forEach { rule ->
                 if (rule.outboundTag == "proxy") {
@@ -853,7 +843,7 @@ object V2rayConfigManager {
                 }
             }
 
-            if (MmkvManager.decodeSettingsString(AppConfig.PREF_INTELLIGENT_SELECTION_METHOD, "0") == "0") {
+            if (config.policyGroupType == "0") {
                 val balancer = V2rayConfig.RoutingBean.BalancerBean(
                     tag = "proxy-round",
                     selector = listOf("proxy-"),
@@ -930,7 +920,7 @@ object V2rayConfigManager {
             }
 
             val fragmentOutbound =
-                V2rayConfig.OutboundBean(
+                OutboundBean(
                     protocol = AppConfig.PROTOCOL_FREEDOM,
                     tag = AppConfig.TAG_FRAGMENT,
                     mux = null
@@ -948,8 +938,8 @@ object V2rayConfigManager {
                 packets = "tlshello"
             }
 
-            fragmentOutbound.settings = OutboundBean.OutSettingsBean(
-                fragment = OutboundBean.OutSettingsBean.FragmentBean(
+            fragmentOutbound.settings = OutSettingsBean(
+                fragment = OutSettingsBean.FragmentBean(
                     packets = packets,
                     length = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH)
                         ?: "50-100",
@@ -957,7 +947,7 @@ object V2rayConfigManager {
                         ?: "10-20"
                 ),
                 noises = listOf(
-                    OutboundBean.OutSettingsBean.NoiseBean(
+                    OutSettingsBean.NoiseBean(
                         type = "rand",
                         packet = "10-20",
                         delay = "10-16",
@@ -1002,14 +992,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 {
@@ -1028,7 +1026,7 @@ object V2rayConfigManager {
      * @param profileItem The profile item to convert
      * @return OutboundBean configuration for the profile, or null if not supported
      */
-    private fun convertProfile2Outbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? {
+    private fun convertProfile2Outbound(profileItem: ProfileItem): OutboundBean? {
         return when (profileItem.configType) {
             EConfigType.VMESS -> VmessFmt.toOutbound(profileItem)
             EConfigType.CUSTOM -> null
@@ -1037,8 +1035,10 @@ object V2rayConfigManager {
             EConfigType.VLESS -> VlessFmt.toOutbound(profileItem)
             EConfigType.TROJAN -> TrojanFmt.toOutbound(profileItem)
             EConfigType.WIREGUARD -> WireguardFmt.toOutbound(profileItem)
-            EConfigType.HYSTERIA2 -> null
+            EConfigType.HYSTERIA2 -> Hysteria2Fmt.toOutbound(profileItem)
             EConfigType.HTTP -> HttpFmt.toOutbound(profileItem)
+            EConfigType.POLICYGROUP -> null
+            else -> null
         }
     }
 
@@ -1069,8 +1069,7 @@ object V2rayConfigManager {
             EConfigType.SHADOWSOCKS,
             EConfigType.SOCKS,
             EConfigType.HTTP,
-            EConfigType.TROJAN,
-            EConfigType.HYSTERIA2 ->
+            EConfigType.TROJAN ->
                 return OutboundBean(
                     protocol = configType.name.lowercase(),
                     settings = OutSettingsBean(
@@ -1088,7 +1087,18 @@ object V2rayConfigManager {
                     )
                 )
 
+            EConfigType.HYSTERIA,
+            EConfigType.HYSTERIA2 ->
+                return OutboundBean(
+                    protocol = EConfigType.HYSTERIA.name.lowercase(),
+                    settings = OutSettingsBean(
+                        servers = null
+                    ),
+                    streamSettings = StreamSettingsBean()
+                )
+
             EConfigType.CUSTOM -> null
+            EConfigType.POLICYGROUP -> null
         }
     }
 
@@ -1116,7 +1126,7 @@ object V2rayConfigManager {
         val xhttpExtra = profileItem.xhttpExtra
 
         var sni: String? = null
-        streamSettings.network = if (transport.isEmpty()) NetworkType.TCP.type else transport
+        streamSettings.network = transport.ifEmpty { NetworkType.TCP.type }
         when (streamSettings.network) {
             NetworkType.TCP.type -> {
                 val tcpSetting = StreamSettingsBean.TcpSettingsBean()
@@ -1205,6 +1215,27 @@ object V2rayConfigManager {
                 sni = authority
                 streamSettings.grpcSettings = grpcSetting
             }
+
+            NetworkType.HYSTERIA.type -> {
+                val hysteriaSetting = StreamSettingsBean.HysteriaSettingsBean(
+                    version = 2,
+                    auth = profileItem.password.orEmpty(),
+                    up = profileItem.bandwidthUp?.ifEmpty { "0" }.orEmpty(),
+                    down = profileItem.bandwidthDown?.ifEmpty { "0" }.orEmpty(),
+                    udphop = null
+                )
+                if (profileItem.portHopping.isNotNullEmpty()) {
+                    hysteriaSetting.udphop = StreamSettingsBean.HysteriaSettingsBean.HysteriaUdpHopBean(
+                        port = profileItem.portHopping,
+                        interval = profileItem.portHoppingInterval
+                            ?.trim()
+                            ?.toIntOrNull()
+                            ?.takeIf { it >= 5 }
+                            ?: 30
+                    )
+                }
+                streamSettings.hysteriaSettings = hysteriaSetting
+            }
         }
         return sni
     }
@@ -1232,6 +1263,8 @@ object V2rayConfigManager {
         }
         val fingerprint = profileItem.fingerPrint
         val alpns = profileItem.alpn
+        val echConfigList = profileItem.echConfigList
+        val echForceQuery = profileItem.echForceQuery
         val publicKey = profileItem.publicKey
         val shortId = profileItem.shortId
         val spiderX = profileItem.spiderX
@@ -1244,6 +1277,8 @@ object V2rayConfigManager {
             serverName = if (sni.isNullOrEmpty()) null else sni,
             fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
             alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            echConfigList = if (echConfigList.isNullOrEmpty()) null else echConfigList,
+            echForceQuery = if (echForceQuery.isNullOrEmpty()) null else echForceQuery,
             publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
             shortId = if (shortId.isNullOrEmpty()) null else shortId,
             spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,

V2rayNG/app/src/main/java/com/v2ray/ang/handler/WebDavManager.kt

@@ -0,0 +1,183 @@
+package com.v2ray.ang.handler
+
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.WebDavConfig
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.Credentials
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+import java.io.FileOutputStream
+import java.net.URL
+import java.util.concurrent.TimeUnit
+
+object WebDavManager {
+    private var cfg: WebDavConfig? = null
+    private var client: OkHttpClient? = null
+
+    /**
+     * Initialize the WebDAV manager with a configuration and build an OkHttp client.
+     *
+     * @param config WebDavConfig containing baseUrl, credentials, remoteBasePath and timeoutSeconds.
+     */
+    fun init(config: WebDavConfig) {
+        cfg = config
+        client = OkHttpClient.Builder()
+            .connectTimeout(config.timeoutSeconds, TimeUnit.SECONDS)
+            .readTimeout(config.timeoutSeconds, TimeUnit.SECONDS)
+            .writeTimeout(config.timeoutSeconds, TimeUnit.SECONDS)
+            .callTimeout(config.timeoutSeconds, TimeUnit.SECONDS)
+            .build()
+    }
+
+    /**
+     * Upload a local file to a remote file name under the configured remoteBasePath.
+     * The provided `remoteFileName` should be a file name (e.g. "backup_ng.zip").
+     * The method will attempt to create parent directories via MKCOL before PUT.
+     *
+     * @param localFile File to upload.
+     * @param remoteFileName Remote file name relative to configured remoteBasePath.
+     * @return true if upload succeeded (HTTP 2xx), false otherwise.
+     */
+    suspend fun uploadFile(localFile: File, remoteFileName: String): Boolean = withContext(Dispatchers.IO) {
+        val remote = buildRemoteUrl(remoteFileName)
+        try {
+            val cl = client ?: return@withContext false
+
+            // Ensure parent directories exist
+            val dirPath = remote.substringBeforeLast('/')
+            if (dirPath != remote) {
+                ensureRemoteDirs(dirPath)
+            }
+
+            // Determine content type based on file extension
+            val mediaType = when (localFile.extension.lowercase()) {
+                "zip" -> "application/zip"
+                "json" -> "application/json"
+                "txt" -> "text/plain"
+                else -> "application/octet-stream"
+            }.toMediaTypeOrNull()
+
+            val body = localFile.asRequestBody(mediaType)
+            val req = applyAuth(Request.Builder().url(remote).put(body)).build()
+            cl.newCall(req).execute().use { resp ->
+                val success = resp.isSuccessful
+                if (success) {
+                    Log.i(AppConfig.TAG, "WebDAV upload success: $remote")
+                } else {
+                    Log.e(AppConfig.TAG, "WebDAV upload failed: $remote (HTTP ${resp.code})")
+                }
+                return@withContext success
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "WebDAV upload exception: $remote", e)
+            return@withContext false
+        }
+    }
+
+    /**
+     * Download a remote file (relative to configured remoteBasePath) into a local file.
+     *
+     * @param remoteFileName Remote file name relative to configured remoteBasePath.
+     * @param destFile Local destination file to write to.
+     * @return true if download and write succeeded, false otherwise.
+     */
+    suspend fun downloadFile(remoteFileName: String, destFile: File): Boolean = withContext(Dispatchers.IO) {
+        val remote = buildRemoteUrl(remoteFileName)
+        try {
+            val cl = client ?: return@withContext false
+            val req = applyAuth(Request.Builder().url(remote).get()).build()
+            cl.newCall(req).execute().use { resp ->
+                if (!resp.isSuccessful) {
+                    Log.e(AppConfig.TAG, "WebDAV download failed: $remote (HTTP ${resp.code})")
+                    return@withContext false
+                }
+
+                resp.body.byteStream().use { input ->
+                    destFile.parentFile?.mkdirs()
+                    FileOutputStream(destFile).use { fos ->
+                        input.copyTo(fos)
+                    }
+                }
+
+                Log.i(AppConfig.TAG, "WebDAV download success: $remote")
+                return@withContext true
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "WebDAV download exception: $remote", e)
+            return@withContext false
+        }
+    }
+
+    /**
+     * Build a full remote URL by combining the configured base URL, the configured
+     * remote base path and a file name provided by the caller.
+     *
+     * Example: baseUrl="https://example.com/remote.php/dav", remoteBasePath="backups",
+     * remoteFileName="backup_ng.zip" => "https://example.com/remote.php/dav/backups/backup_ng.zip"
+     *
+     * @param remoteFileName A file name relative to the configured remoteBasePath (no leading slash required).
+     * @return Full URL string used for HTTP operations.
+     */
+    private fun buildRemoteUrl(remoteFileName: String): String {
+        val base = cfg?.baseUrl?.trimEnd('/') ?: ""
+        // Use configured remoteBasePath when not empty; otherwise fallback to AppConfig.WEBDAV_BACKUP_DIR
+        val basePathConfigured = cfg?.remoteBasePath?.trim('/')?.takeIf { it.isNotEmpty() }
+        val basePath = basePathConfigured ?: AppConfig.WEBDAV_BACKUP_DIR
+        val rel = remoteFileName.trimStart('/')
+        return if (basePath.isEmpty()) "$base/$rel" else "$base/$basePath/$rel"
+    }
+
+    /**
+     * Apply HTTP Basic authentication headers to the given request builder when
+     * username is configured in `cfg`.
+     *
+     * @param builder OkHttp Request.Builder to modify.
+     * @return The same builder instance with Authorization header applied if credentials exist.
+     */
+    private fun applyAuth(builder: Request.Builder): Request.Builder {
+        val username = cfg?.username
+        val password = cfg?.password
+        if (!username.isNullOrEmpty()) {
+            builder.header("Authorization", Credentials.basic(username, password ?: ""))
+        }
+        return builder
+    }
+
+    /**
+     * Ensure that each directory segment in the given directory URL exists on the
+     * WebDAV server. This issues MKCOL requests for each segment in a best-effort
+     * manner and ignores errors for segments that already exist.
+     *
+     * @param dirUrl Absolute URL to the directory that should exist (e.g. https://.../backups)
+     */
+    private fun ensureRemoteDirs(dirUrl: String) {
+        try {
+            val cl = client ?: return
+            val url = URL(dirUrl)
+            val segments = url.path.split("/").filter { it.isNotEmpty() }
+            var accum = ""
+            for (seg in segments) {
+                accum += "/$seg"
+                val mkUrl = URL(url.protocol, url.host, if (url.port == -1) -1 else url.port, accum).toString()
+                try {
+                    val req = applyAuth(Request.Builder().url(mkUrl).method("MKCOL", null)).build()
+                    cl.newCall(req).execute().use { resp ->
+                        // 201 Created or 405 Method Not Allowed (already exists) are acceptable
+                        if (resp.code != 201 && resp.code != 405 && resp.code != 409) {
+                            Log.w(AppConfig.TAG, "WebDAV MKCOL $mkUrl returned ${resp.code}")
+                        }
+                    }
+                } catch (_: Exception) {
+                    // best-effort, continue
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "WebDAV ensureRemoteDirs error", e)
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt

@@ -34,12 +34,12 @@ import kotlin.math.sign
  *
  * @author Paul Burke (ipaulpro)
  */
-class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter) : ItemTouchHelper.Callback() {
+class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter, private val allowSwipe: Boolean = false) : ItemTouchHelper.Callback() {
     private var mReturnAnimator: ValueAnimator? = null
 
     override fun isLongPressDragEnabled(): Boolean = true
 
-    override fun isItemViewSwipeEnabled(): Boolean = true
+    override fun isItemViewSwipeEnabled(): Boolean = allowSwipe
 
     override fun getMovementFlags(
         recyclerView: RecyclerView,
@@ -49,10 +49,10 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
         val swipeFlags: Int
         if (recyclerView.layoutManager is GridLayoutManager) {
             dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN or ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
-            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
+            swipeFlags = if (allowSwipe) ItemTouchHelper.START or ItemTouchHelper.END else 0
         } else {
             dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN
-            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
+            swipeFlags = if (allowSwipe) ItemTouchHelper.START or ItemTouchHelper.END else 0
         }
         return makeMovementFlags(dragFlags, swipeFlags)
     }

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/NativePlugin.kt

@@ -1,32 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
- * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
- * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-import android.content.pm.ResolveInfo
-
-class NativePlugin(resolveInfo: ResolveInfo) : ResolvedPlugin(resolveInfo) {
-    init {
-        check(resolveInfo.providerInfo != null)
-    }
-
-    override val componentInfo get() = resolveInfo.providerInfo!!
-}

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/Plugin.kt

@@ -1,43 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
- * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
- * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-import android.graphics.drawable.Drawable
-
-abstract class Plugin {
-    abstract val id: String
-    abstract val label: CharSequence
-    abstract val version: Int
-    abstract val versionName: String
-    open val icon: Drawable? get() = null
-    open val defaultConfig: String? get() = null
-    open val packageName: String get() = ""
-    open val directBootAware: Boolean get() = true
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return id == (other as Plugin).id
-    }
-
-    override fun hashCode() = id.hashCode()
-}

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginContract.kt

@@ -1,33 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-object PluginContract {
-
-    const val ACTION_NATIVE_PLUGIN = "io.nekohasekai.sagernet.plugin.ACTION_NATIVE_PLUGIN"
-    const val EXTRA_ENTRY = "io.nekohasekai.sagernet.plugin.EXTRA_ENTRY"
-    const val METADATA_KEY_ID = "io.nekohasekai.sagernet.plugin.id"
-    const val METADATA_KEY_EXECUTABLE_PATH = "io.nekohasekai.sagernet.plugin.executable_path"
-    const val METHOD_GET_EXECUTABLE = "sagernet:getExecutable"
-
-    const val COLUMN_PATH = "path"
-    const val COLUMN_MODE = "mode"
-    const val SCHEME = "plugin"
-}

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginList.kt

@@ -1,54 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
- * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
- * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-import android.content.Intent
-import android.content.pm.PackageManager
-import com.v2ray.ang.AngApplication
-
-class PluginList : ArrayList<Plugin>() {
-    init {
-        addAll(
-            AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
-            )
-                .filter { it.providerInfo.exported }.map { NativePlugin(it) })
-    }
-
-    val lookup = mutableMapOf<String, Plugin>().apply {
-        for (plugin in this@PluginList.toList()) {
-            fun check(old: Plugin?) {
-                if (old != null && old != plugin) {
-                    this@PluginList.remove(old)
-                }
-                /* if (old != null && old !== plugin) {
-                     val packages = this@PluginList.filter { it.id == plugin.id }
-                         .joinToString { it.packageName }
-                     val message = "Conflicting plugins found from: $packages"
-                     Toast.makeText(SagerNet.application, message, Toast.LENGTH_LONG).show()
-                     throw IllegalStateException(message)
-                 }*/
-            }
-            check(put(plugin.id, plugin))
-        }
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt

@@ -1,233 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-AngApplication@sekai.icu>             *
- * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
- * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.ContentResolver
-import android.content.Intent
-import android.content.pm.ComponentInfo
-import android.content.pm.PackageManager
-import android.content.pm.ProviderInfo
-import android.database.Cursor
-import android.net.Uri
-import android.os.Build
-import android.system.Os
-import androidx.core.os.bundleOf
-import com.v2ray.ang.AngApplication
-import com.v2ray.ang.extension.listenForPackageChanges
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.plugin.PluginContract.METADATA_KEY_ID
-import java.io.File
-import java.io.FileNotFoundException
-
-object PluginManager {
-
-    class PluginNotFoundException(val plugin: String) : FileNotFoundException(plugin)
-
-    private var receiver: BroadcastReceiver? = null
-    private var cachedPlugins: PluginList? = null
-    fun fetchPlugins() = synchronized(this) {
-        if (receiver == null) receiver = AngApplication.application.listenForPackageChanges {
-            synchronized(this) {
-                receiver = null
-                cachedPlugins = null
-            }
-        }
-        if (cachedPlugins == null) cachedPlugins = PluginList()
-        cachedPlugins!!
-    }
-
-    private fun buildUri(id: String, authority: String) = Uri.Builder()
-        .scheme(PluginContract.SCHEME)
-        .authority(authority)
-        .path("/$id")
-        .build()
-
-    data class InitResult(
-        val path: String,
-    )
-
-    @Throws(Throwable::class)
-    fun init(pluginId: String): InitResult? {
-        if (pluginId.isEmpty()) return null
-        var throwable: Throwable? = null
-
-        try {
-            val result = initNative(pluginId)
-            if (result != null) return result
-        } catch (t: Throwable) {
-            if (throwable == null) throwable = t  //Logs.w(t)
-        }
-
-        throw throwable ?: PluginNotFoundException(pluginId)
-    }
-
-    private fun initNative(pluginId: String): InitResult? {
-        var flags = PackageManager.GET_META_DATA
-        if (Build.VERSION.SDK_INT >= 24) {
-            flags =
-                flags or PackageManager.MATCH_DIRECT_BOOT_UNAWARE or PackageManager.MATCH_DIRECT_BOOT_AWARE
-        }
-        var providers = AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "com.github.dyhkwong.AngApplication")), flags
-        )
-            .filter { it.providerInfo.exported }
-        if (providers.isEmpty()) {
-            providers = AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "io.nekohasekai.AngApplication")), flags
-            )
-                .filter { it.providerInfo.exported }
-        }
-        if (providers.isEmpty()) {
-            providers = AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "moe.matsuri.lite")), flags
-            )
-                .filter { it.providerInfo.exported }
-        }
-        if (providers.isEmpty()) {
-            providers = AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "fr.husi")), flags
-            )
-                .filter { it.providerInfo.exported }
-        }
-        if (providers.isEmpty()) {
-            providers = AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
-            ).filter {
-                it.providerInfo.exported &&
-                        it.providerInfo.metaData.containsKey(METADATA_KEY_ID) &&
-                        it.providerInfo.metaData.getString(METADATA_KEY_ID) == pluginId
-            }
-            if (providers.size > 1) {
-                providers = listOf(providers[0]) // What if there is more than one?
-            }
-        }
-        if (providers.isEmpty()) return null
-        if (providers.size > 1) {
-            val message =
-                "Conflicting plugins found from: ${providers.joinToString { it.providerInfo.packageName }}"
-            AngApplication.application.toast(message)
-            throw IllegalStateException(message)
-        }
-        val provider = providers.single().providerInfo
-        var failure: Throwable? = null
-        try {
-            initNativeFaster(provider)?.also { return InitResult(it) }
-        } catch (t: Throwable) {
-            //   Logs.w("Initializing native plugin faster mode failed")
-            failure = t
-        }
-
-        val uri = Uri.Builder().apply {
-            scheme(ContentResolver.SCHEME_CONTENT)
-            authority(provider.authority)
-        }.build()
-        try {
-            return initNativeFast(
-                AngApplication.application.contentResolver,
-                pluginId,
-                uri
-            )?.let { InitResult(it) }
-        } catch (t: Throwable) {
-            //  Logs.w("Initializing native plugin fast mode failed")
-            failure?.also { t.addSuppressed(it) }
-            failure = t
-        }
-
-        try {
-            return initNativeSlow(
-                AngApplication.application.contentResolver,
-                pluginId,
-                uri
-            )?.let { InitResult(it) }
-        } catch (t: Throwable) {
-            failure?.also { t.addSuppressed(it) }
-            throw t
-        }
-    }
-
-    private fun initNativeFaster(provider: ProviderInfo): String? {
-        return provider.loadString(PluginContract.METADATA_KEY_EXECUTABLE_PATH)
-            ?.let { relativePath ->
-                File(provider.applicationInfo.nativeLibraryDir).resolve(relativePath).apply {
-                    check(canExecute())
-                }.absolutePath
-            }
-    }
-
-    private fun initNativeFast(cr: ContentResolver, pluginId: String, uri: Uri): String? {
-        return cr.call(uri, PluginContract.METHOD_GET_EXECUTABLE, null, bundleOf())
-            ?.getString(PluginContract.EXTRA_ENTRY)?.also {
-                check(File(it).canExecute())
-            }
-    }
-
-    @SuppressLint("Recycle")
-    private fun initNativeSlow(cr: ContentResolver, pluginId: String, uri: Uri): String? {
-        var initialized = false
-        fun entryNotFound(): Nothing =
-            throw IndexOutOfBoundsException("Plugin entry binary not found")
-
-        val pluginDir = File(AngApplication.application.noBackupFilesDir, "plugin")
-        (cr.query(
-            uri,
-            arrayOf(PluginContract.COLUMN_PATH, PluginContract.COLUMN_MODE),
-            null,
-            null,
-            null
-        )
-            ?: return null).use { cursor ->
-            if (!cursor.moveToFirst()) entryNotFound()
-            pluginDir.deleteRecursively()
-            if (!pluginDir.mkdirs()) throw FileNotFoundException("Unable to create plugin directory")
-            val pluginDirPath = pluginDir.absolutePath + '/'
-            do {
-                val path = cursor.getString(0)
-                val file = File(pluginDir, path)
-                check(file.absolutePath.startsWith(pluginDirPath))
-                cr.openInputStream(uri.buildUpon().path(path).build())!!.use { inStream ->
-                    file.outputStream().use { outStream -> inStream.copyTo(outStream) }
-                }
-                Os.chmod(
-                    file.absolutePath, when (cursor.getType(1)) {
-                        Cursor.FIELD_TYPE_INTEGER -> cursor.getInt(1)
-                        Cursor.FIELD_TYPE_STRING -> cursor.getString(1).toInt(8)
-                        else -> throw IllegalArgumentException("File mode should be of type int")
-                    }
-                )
-                if (path == pluginId) initialized = true
-            } while (cursor.moveToNext())
-        }
-        if (!initialized) entryNotFound()
-        return File(pluginDir, pluginId).absolutePath
-    }
-
-    fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(key)) {
-        is String -> value
-//        is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo)
-//            .getString(value)
-
-        null -> null
-        else -> error("meta-data $key has invalid type ${value.javaClass}")
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/ResolvedPlugin.kt

@@ -1,51 +0,0 @@
-/******************************************************************************
- *                                                                            *
- * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
- * Copyright (C) 2021 by Max Lv <max.c.lv@gmail.com>                          *
- * Copyright (C) 2021 by Mygod Studio <contact-shadowsocks-android@mygod.be>  *
- *                                                                            *
- * This program is free software: you can redistribute it and/or modify       *
- * it under the terms of the GNU General Public License as published by       *
- * the Free Software Foundation, either version 3 of the License, or          *
- *  (at your option) any later version.                                       *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program. If not, see <http://www.gnu.org/licenses/>.       *
- *                                                                            *
- ******************************************************************************/
-
-package com.v2ray.ang.plugin
-
-import android.content.pm.ComponentInfo
-import android.content.pm.PackageManager
-import android.content.pm.ResolveInfo
-import android.graphics.drawable.Drawable
-import android.os.Build
-import com.v2ray.ang.AngApplication
-import com.v2ray.ang.plugin.PluginManager.loadString
-
-abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin() {
-    protected abstract val componentInfo: ComponentInfo
-
-    override val id by lazy { componentInfo.loadString(PluginContract.METADATA_KEY_ID)!! }
-    override val version by lazy {
-        getPackageInfo(componentInfo.packageName).versionCode
-    }
-    override val versionName: String by lazy {
-        getPackageInfo(componentInfo.packageName).versionName!!
-    }
-    override val label: CharSequence get() = resolveInfo.loadLabel(AngApplication.application.packageManager)
-    override val icon: Drawable get() = resolveInfo.loadIcon(AngApplication.application.packageManager)
-    override val packageName: String get() = componentInfo.packageName
-    override val directBootAware get() = Build.VERSION.SDK_INT < 24 || componentInfo.directBootAware
-
-    fun getPackageInfo(packageName: String) = AngApplication.application.packageManager.getPackageInfo(
-        packageName, if (Build.VERSION.SDK_INT >= 28) PackageManager.GET_SIGNING_CERTIFICATES
-        else @Suppress("DEPRECATION") PackageManager.GET_SIGNATURES
-    )!!
-}

V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt

@@ -6,7 +6,6 @@ import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.widget.RemoteViews
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
@@ -42,11 +41,7 @@ class WidgetProvider : AppWidgetProvider() {
             context,
             R.id.layout_switch,
             intent,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
         remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent)
         if (isRunning) {

V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt

@@ -5,11 +5,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.drawable.Icon
-import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import android.util.Log
-import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
@@ -18,7 +16,6 @@ import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
 
-@RequiresApi(Build.VERSION_CODES.N)
 class QSTileService : TileService() {
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/service/RealPingWorkerService.kt

@@ -0,0 +1,85 @@
+package com.v2ray.ang.service
+
+import android.content.Context
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.V2RayNativeManager
+import com.v2ray.ang.handler.V2rayConfigManager
+import com.v2ray.ang.util.MessageUtil
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * Worker that runs a batch of real-ping tests independently.
+ * Each batch owns its own CoroutineScope/dispatcher and can be cancelled separately.
+ */
+class RealPingWorkerService(
+    private val context: Context,
+    private val guids: List<String>,
+    private val onFinish: (status: String) -> Unit = {}
+) {
+    private val job = SupervisorJob()
+    private val cpu = Runtime.getRuntime().availableProcessors().coerceAtLeast(1)
+    private val dispatcher = Executors.newFixedThreadPool(cpu * 4).asCoroutineDispatcher()
+    private val scope = CoroutineScope(job + dispatcher + CoroutineName("RealPingBatchWorker"))
+
+    private val runningCount = AtomicInteger(0)
+    private val totalCount = AtomicInteger(0)
+
+    fun start() {
+        val jobs = guids.map { guid ->
+            totalCount.incrementAndGet()
+            scope.launch {
+                runningCount.incrementAndGet()
+                try {
+                    val result = startRealPing(guid)
+                    MessageUtil.sendMsg2UI(context, AppConfig.MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
+                } finally {
+                    val count = totalCount.decrementAndGet()
+                    val left = runningCount.decrementAndGet()
+                    MessageUtil.sendMsg2UI(context, AppConfig.MSG_MEASURE_CONFIG_NOTIFY, "$left / $count")
+                }
+            }
+        }
+
+        scope.launch {
+            try {
+                joinAll(*jobs.toTypedArray())
+                onFinish("0")
+            } catch (_: CancellationException) {
+                onFinish("-1")
+            } finally {
+                close()
+            }
+        }
+    }
+
+    fun cancel() {
+        job.cancel()
+    }
+
+    private fun close() {
+        try {
+            dispatcher.close()
+        } catch (_: Throwable) {
+            // ignore
+        }
+    }
+
+    private fun startRealPing(guid: String): Long {
+        val retFailure = -1L
+        val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(context, guid)
+        if (!configResult.status) {
+            return retFailure
+        }
+        return V2RayNativeManager.measureOutboundDelay(configResult.content, SettingsManager.getDelayTestUrl())
+    }
+}
+

V2rayNG/app/src/main/java/com/v2ray/ang/service/TProxyService.kt

@@ -0,0 +1,100 @@
+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, "HevSocks5Tunnel 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)) {
+                appendLine("  ipv6: '${vpnConfig.ipv6Client}'")
+            }
+
+            appendLine("socks5:")
+            appendLine("  port: ${socksPort}")
+            appendLine("  address: ${AppConfig.LOOPBACK}")
+            appendLine("  udp: 'udp'")
+
+            // Read-write timeout settings
+            val timeoutSetting = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT
+            val parts = timeoutSetting.split(",")
+                .map { it.trim() }
+                .filter { it.isNotEmpty() }
+            val tcpTimeout = parts.getOrNull(0)?.toIntOrNull() ?: 300
+            val udpTimeout = parts.getOrNull(1)?.toIntOrNull() ?: 60
+
+            appendLine("misc:")
+            appendLine("  tcp-read-write-timeout: ${tcpTimeout * 1000}")
+            appendLine("  udp-read-write-timeout: ${udpTimeout * 1000}")
+            appendLine("  log-level: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "warn"}")
+        }
+    }
+
+    /**
+     * 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)
+        }
+    }
+}

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()
+}

V2rayNG/app/src/main/java/com/v2ray/ang/service/Tun2SocksService.kt

@@ -1,129 +0,0 @@
-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.AppConfig.VPN_MTU
-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
-) {
-    companion object {
-        private const val TUN2SOCKS = "libtun2socks.so"
-    }
-
-    private lateinit var process: Process
-
-    /**
-     * Starts the tun2socks process with the appropriate parameters.
-     */
-    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", VPN_MTU.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
-     */
-    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)
-        }
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt

@@ -3,9 +3,7 @@ package com.v2ray.ang.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-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
@@ -28,7 +26,7 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
      * @return The start mode.
      */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startCoreLoop()
+        V2RayServiceManager.startCoreLoop(null)
         return START_STICKY
     }
 
@@ -84,7 +82,6 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
      * Attaches the base context to the service.
      * @param newBase The new base context.
      */
-    @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
             MyContextWrapper.wrap(newBase, SettingsManager.getLocale())

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt

@@ -3,60 +3,25 @@ package com.v2ray.ang.service
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_CANCEL
-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.handler.V2RayNativeManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.Utils
-import go.Seq
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.launch
-import libv2ray.Libv2ray
-import java.util.concurrent.Executors
+import java.util.Collections
 
 class V2RayTestService : Service() {
-    private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()).asCoroutineDispatcher()) }
+
+    // manage active batch workers so each batch is independent and cancellable
+    private val activeWorkers = Collections.synchronizedList(mutableListOf<RealPingWorkerService>())
 
     /**
      * Initializes the V2Ray environment.
      */
     override fun onCreate() {
         super.onCreate()
-        Seq.setContext(this)
-        Libv2ray.initCoreEnv(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
-    }
-
-    /**
-     * Handles the start command for the service.
-     * @param intent The intent.
-     * @param flags The flags.
-     * @param startId The start ID.
-     * @return The start mode.
-     */
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        when (intent?.getIntExtra("key", 0)) {
-            MSG_MEASURE_CONFIG -> {
-                val guid = intent.serializable<String>("content") ?: ""
-                realTestScope.launch {
-                    val result = startRealPing(guid)
-                    MessageUtil.sendMsg2UI(this@V2RayTestService, MSG_MEASURE_CONFIG_SUCCESS, Pair(guid, result))
-                }
-            }
-
-            MSG_MEASURE_CONFIG_CANCEL -> {
-                realTestScope.coroutineContext[Job]?.cancelChildren()
-            }
-        }
-        return super.onStartCommand(intent, flags, startId)
+        V2RayNativeManager.initCoreEnv(this)
     }
 
     /**
@@ -69,23 +34,46 @@ class V2RayTestService : Service() {
     }
 
     /**
-     * Starts the real ping test.
-     * @param guid The GUID of the configuration.
-     * @return The ping result.
+     * Cleans up resources when the service is destroyed.
      */
-    private fun startRealPing(guid: String): Long {
-        val retFailure = -1L
-
-        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
-        if (config.configType == EConfigType.HYSTERIA2) {
-            val delay = PluginServiceManager.realPingHy2(this, config)
-            return delay
-        } else {
-            val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(this, guid)
-            if (!configResult.status) {
-                return retFailure
-            }
-            return SpeedtestManager.realPing(configResult.content)
-        }
+    override fun onDestroy() {
+        super.onDestroy()
+        // cancel any active workers
+        val snapshot = ArrayList(activeWorkers)
+        snapshot.forEach { it.cancel() }
+        activeWorkers.clear()
     }
-}
+
+    /**
+     * Handles the start command for the service.
+     * @param intent The intent.
+     * @param flags The flags.
+     * @param startId The start ID.
+     * @return The start mode.
+     */
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        when (intent?.getIntExtra("key", 0)) {
+            MSG_MEASURE_CONFIG -> {
+                val guidsList = intent.serializable<ArrayList<String>>("content")
+                if (guidsList != null && guidsList.isNotEmpty()) {
+                    lateinit var worker: RealPingWorkerService
+                    worker = RealPingWorkerService(this, guidsList) { status ->
+                        // notify UI and remove the worker from active list when finished
+                        MessageUtil.sendMsg2UI(this@V2RayTestService, AppConfig.MSG_MEASURE_CONFIG_FINISH, status)
+                        activeWorkers.remove(worker)
+                    }
+                    activeWorkers.add(worker)
+                    worker.start()
+                }
+            }
+
+            MSG_MEASURE_CONFIG_CANCEL -> {
+                // cancel all running batch workers independently
+                val snapshot = ArrayList(activeWorkers)
+                snapshot.forEach { it.cancel() }
+                activeWorkers.clear()
+            }
+        }
+        return super.onStartCommand(intent, flags, startId)
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt

@@ -17,7 +17,6 @@ import android.util.Log
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.LOOPBACK
-import com.v2ray.ang.AppConfig.VPN_MTU
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.NotificationManager
@@ -30,7 +29,7 @@ import java.lang.ref.SoftReference
 class V2RayVpnService : VpnService(), ServiceControl {
     private lateinit var mInterface: ParcelFileDescriptor
     private var isRunning = false
-    private var tun2SocksService: Tun2SocksService? = null
+    private var tun2SocksService: Tun2SocksControl? = null
 
     /**destroy
      * Unfortunately registerDefaultNetworkCallback is going to return our VPN interface: https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
@@ -91,9 +90,8 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (V2RayServiceManager.startCoreLoop()) {
-            startService()
-        }
+        setupVpnService()
+        startService()
         return START_STICKY
         //return super.onStartCommand(intent, flags, startId)
     }
@@ -103,7 +101,11 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     override fun startService() {
-        setupService()
+        if (mInterface == null) {
+            Log.e(AppConfig.TAG, "Failed to create VPN interface")
+            return
+        }
+        V2RayServiceManager.startCoreLoop(mInterface)
     }
 
     override fun stopService() {
@@ -114,7 +116,6 @@ class V2RayVpnService : VpnService(), ServiceControl {
         return protect(socket)
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
             MyContextWrapper.wrap(newBase, SettingsManager.getLocale())
@@ -126,7 +127,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
      * Sets up the VPN service.
      * Prepares the VPN and configures it if preparation is successful.
      */
-    private fun setupService() {
+    private fun setupVpnService() {
         val prepare = prepare(this)
         if (prepare != null) {
             return
@@ -145,20 +146,20 @@ class V2RayVpnService : VpnService(), ServiceControl {
      */
     private fun configureVpnService(): Boolean {
         val builder = Builder()
-        
+
         // 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)
 
@@ -173,21 +174,21 @@ class V2RayVpnService : VpnService(), ServiceControl {
         }
         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(VPN_MTU)
+        builder.setMtu(SettingsManager.getVpnMtu())
         builder.addAddress(vpnConfig.ipv4Client, 30)
-        
+
         // Configure routing rules
         if (bypassLan) {
             AppConfig.ROUTED_IP_LIST.forEach {
@@ -197,7 +198,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
         } else {
             builder.addRoute("0.0.0.0", 0)
         }
-        
+
         // Configure IPv6 if enabled
         if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
             builder.addAddress(vpnConfig.ipv6Client, 126)
@@ -208,7 +209,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                 builder.addRoute("::", 0)
             }
         }
-        
+
         // Configure DNS servers
         //if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
         //  builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
@@ -218,13 +219,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
                 builder.addDnsServer(it)
             }
         }
-        
+
         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) {
@@ -236,7 +237,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                 Log.e(AppConfig.TAG, "Failed to request default network", e)
             }
         }
-        
+
         // Android Q (API 29) and above: Configure metering and HTTP proxy
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             builder.setMetered(false)
@@ -296,14 +297,18 @@ class V2RayVpnService : VpnService(), ServiceControl {
      * Starts the tun2socks process with the appropriate parameters.
      */
     private fun runTun2socks() {
-        tun2SocksService = Tun2SocksService(
-            context = applicationContext,
-            vpnInterface = mInterface,
-            isRunningProvider = { isRunning },
-            restartCallback = { runTun2socks() }
-        ).also {
-            it.startTun2Socks()
+        if (SettingsManager.isUsingHevTun()) {
+            tun2SocksService = TProxyService(
+                context = applicationContext,
+                vpnInterface = mInterface,
+                isRunningProvider = { isRunning },
+                restartCallback = { runTun2socks() }
+            )
+        } else {
+            tun2SocksService = null
         }
+
+        tun2SocksService?.startTun2Socks()
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt

@@ -1,102 +1,20 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
-import android.content.Intent
-import android.os.Build
 import android.os.Bundle
-import android.util.Log
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityAboutBinding
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
+import com.v2ray.ang.handler.V2RayNativeManager
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.ZipUtil
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Locale
 
 class AboutActivity : BaseActivity() {
-
     private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
-    private val extDir by lazy { File(Utils.backupPath(this)) }
-
-    private val requestPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-            if (isGranted) {
-                try {
-                    showFileChooser()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.title_about)
-
-        binding.tvBackupSummary.text = this.getString(R.string.summary_configuration_backup, extDir)
-
-        binding.layoutBackup.setOnClickListener {
-            val ret = backupConfiguration(extDir.absolutePath)
-            if (ret.first) {
-                toastSuccess(R.string.toast_success)
-            } else {
-                toastError(R.string.toast_failure)
-            }
-        }
-
-        binding.layoutShare.setOnClickListener {
-            val ret = backupConfiguration(cacheDir.absolutePath)
-            if (ret.first) {
-                startActivity(
-                    Intent.createChooser(
-                        Intent(Intent.ACTION_SEND).setType("application/zip")
-                            .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                            .putExtra(
-                                Intent.EXTRA_STREAM,
-                                FileProvider.getUriForFile(
-                                    this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second)
-                                )
-                            ), getString(R.string.title_configuration_share)
-                    )
-                )
-            } else {
-                toastError(R.string.toast_failure)
-            }
-        }
-
-        binding.layoutRestore.setOnClickListener {
-            val permission =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    Manifest.permission.READ_MEDIA_IMAGES
-                } else {
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-                }
-
-            if (ContextCompat.checkSelfPermission(this, permission) == android.content.pm.PackageManager.PERMISSION_GRANTED) {
-                try {
-                    showFileChooser()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-                }
-            } else {
-                requestPermissionLauncher.launch(permission)
-            }
-        }
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_about))
 
         binding.layoutSoureCcode.setOnClickListener {
             Utils.openUri(this, AppConfig.APP_URL)
@@ -124,78 +42,11 @@ class AboutActivity : BaseActivity() {
             Utils.openUri(this, AppConfig.APP_PRIVACY_POLICY)
         }
 
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
+        "v${BuildConfig.VERSION_NAME} (${V2RayNativeManager.getLibVersion()})".also {
             binding.tvVersion.text = it
         }
-    }
-
-    private fun backupConfiguration(outputZipFilePos: String): Pair<Boolean, String> {
-        val dateFormated = SimpleDateFormat(
-            "yyyy-MM-dd-HH-mm-ss",
-            Locale.getDefault()
-        ).format(System.currentTimeMillis())
-        val folderName = "${getString(R.string.app_name)}_${dateFormated}"
-        val backupDir = this.cacheDir.absolutePath + "/$folderName"
-        val outputZipFilePath = "$outputZipFilePos/$folderName.zip"
-
-        val count = MMKV.backupAllToDirectory(backupDir)
-        if (count <= 0) {
-            return Pair(false, "")
-        }
-
-        if (ZipUtil.zipFromFolder(backupDir, outputZipFilePath)) {
-            return Pair(true, outputZipFilePath)
-        } else {
-            return Pair(false, "")
+        BuildConfig.APPLICATION_ID.also {
+            binding.tvAppId.text = it
         }
     }
-
-    private fun restoreConfiguration(zipFile: File): Boolean {
-        val backupDir = this.cacheDir.absolutePath + "/${System.currentTimeMillis()}"
-
-        if (!ZipUtil.unzipToFolder(zipFile, backupDir)) {
-            return false
-        }
-
-        val count = MMKV.restoreAllFromDirectory(backupDir)
-        return count > 0
-    }
-
-    private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-            type = "*/*"
-            addCategory(Intent.CATEGORY_OPENABLE)
-        }
-
-        try {
-            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } catch (ex: android.content.ActivityNotFoundException) {
-            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
-            toast(R.string.toast_require_file_manager)
-        }
-    }
-
-    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            val uri = result.data?.data
-            if (result.resultCode == RESULT_OK && uri != null) {
-                try {
-                    val targetFile =
-                        File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
-                    contentResolver.openInputStream(uri).use { input ->
-                        targetFile.outputStream().use { fileOut ->
-                            input?.copyTo(fileOut)
-                        }
-                    }
-                    if (restoreConfiguration(targetFile)) {
-                        toastSuccess(R.string.toast_success)
-                    } else {
-                        toastError(R.string.toast_failure)
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Error during file restore", e)
-                    toastError(R.string.toast_failure)
-                }
-            }
-        }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BackupActivity.kt

@@ -0,0 +1,359 @@
+package com.v2ray.ang.ui
+
+import android.Manifest
+import android.app.AlertDialog
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.lifecycle.lifecycleScope
+import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.WEBDAV_BACKUP_FILE_NAME
+import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityBackupBinding
+import com.v2ray.ang.databinding.DialogWebdavBinding
+import com.v2ray.ang.dto.WebDavConfig
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.extension.toastError
+import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
+import com.v2ray.ang.handler.WebDavManager
+import com.v2ray.ang.util.ZipUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class BackupActivity : BaseActivity() {
+    private val binding by lazy { ActivityBackupBinding.inflate(layoutInflater) }
+
+    private val config_backup_options: Array<out String> by lazy {
+        resources.getStringArray(R.array.config_backup_options)
+    }
+
+    private val requestPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            if (isGranted) {
+                try {
+                    showFileChooser()
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
+                }
+            } else {
+                toast(R.string.toast_permission_denied)
+            }
+        }
+
+    private val createBackupFile =
+        registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            if (uri != null) {
+                try {
+                    val ret = backupConfigurationToCache()
+                    if (ret.first) {
+                        // Copy the cached zip file to user-selected location
+                        contentResolver.openOutputStream(uri)?.use { output ->
+                            File(ret.second).inputStream().use { input ->
+                                input.copyTo(output)
+                            }
+                        }
+                        // Clean up cache file
+                        File(ret.second).delete()
+                        toastSuccess(R.string.toast_success)
+                    } else {
+                        toastError(R.string.toast_failure)
+                    }
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to backup configuration", e)
+                    toastError(R.string.toast_failure)
+                }
+            }
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+       //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_configuration_backup_restore))
+
+        binding.layoutBackup.setOnClickListener {
+            AlertDialog.Builder(this)
+                .setTitle(R.string.title_configuration_backup)
+                .setItems(config_backup_options) { dialog, which ->
+                    when (which) {
+                        0 -> backupViaLocal()
+                        1 -> backupViaWebDav()
+                    }
+                }
+                .show()
+        }
+
+        binding.layoutShare.setOnClickListener {
+            val ret = backupConfigurationToCache()
+            if (ret.first) {
+                startActivity(
+                    Intent.createChooser(
+                        Intent(Intent.ACTION_SEND).setType("application/zip")
+                            .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                            .putExtra(
+                                Intent.EXTRA_STREAM,
+                                FileProvider.getUriForFile(
+                                    this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second)
+                                )
+                            ), getString(R.string.title_configuration_share)
+                    )
+                )
+            } else {
+                toastError(R.string.toast_failure)
+            }
+        }
+
+        binding.layoutRestore.setOnClickListener {
+            AlertDialog.Builder(this)
+                .setTitle(R.string.title_configuration_restore)
+                .setItems(config_backup_options) { dialog, which ->
+                    when (which) {
+                        0 -> restoreViaLocal()
+                        1 -> restoreViaWebDav()
+                    }
+                }
+                .show()
+        }
+
+        binding.layoutWebdavConfigSetting.setOnClickListener {
+            showWebDavSettingsDialog()
+        }
+    }
+
+    /**
+     * Backup configuration to cache directory
+     * Returns Pair<success, zipFilePath>
+     */
+    private fun backupConfigurationToCache(): Pair<Boolean, String> {
+        val dateFormatted = SimpleDateFormat(
+            "yyyy-MM-dd-HH-mm-ss",
+            Locale.getDefault()
+        ).format(System.currentTimeMillis())
+        val folderName = "${getString(R.string.app_name)}_${dateFormatted}"
+        val backupDir = this.cacheDir.absolutePath + "/$folderName"
+        val outputZipFilePath = "${this.cacheDir.absolutePath}/$folderName.zip"
+
+        val count = MMKV.backupAllToDirectory(backupDir)
+        if (count <= 0) {
+            return Pair(false, "")
+        }
+
+        if (ZipUtil.zipFromFolder(backupDir, outputZipFilePath)) {
+            return Pair(true, outputZipFilePath)
+        } else {
+            return Pair(false, "")
+        }
+    }
+
+    private fun restoreConfiguration(zipFile: File): Boolean {
+        val backupDir = this.cacheDir.absolutePath + "/${System.currentTimeMillis()}"
+
+        if (!ZipUtil.unzipToFolder(zipFile, backupDir)) {
+            return false
+        }
+
+        val count = MMKV.restoreAllFromDirectory(backupDir)
+        SettingsChangeManager.makeSetupGroupTab()
+        SettingsChangeManager.makeRestartService()
+        return count > 0
+    }
+
+    private fun showFileChooser() {
+        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            type = "*/*"
+            addCategory(Intent.CATEGORY_OPENABLE)
+        }
+
+        try {
+            chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
+        } catch (ex: ActivityNotFoundException) {
+            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
+            toast(R.string.toast_require_file_manager)
+        }
+    }
+
+    private val chooseFile =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            val uri = result.data?.data
+            if (result.resultCode == RESULT_OK && uri != null) {
+                try {
+                    val targetFile =
+                        File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
+                    contentResolver.openInputStream(uri).use { input ->
+                        targetFile.outputStream().use { fileOut ->
+                            input?.copyTo(fileOut)
+                        }
+                    }
+                    if (restoreConfiguration(targetFile)) {
+                        toastSuccess(R.string.toast_success)
+                    } else {
+                        toastError(R.string.toast_failure)
+                    }
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Error during file restore", e)
+                    toastError(R.string.toast_failure)
+                }
+            }
+        }
+
+    private fun backupViaLocal() {
+        val dateFormatted = SimpleDateFormat(
+            "yyyy-MM-dd-HH-mm-ss",
+            Locale.getDefault()
+        ).format(System.currentTimeMillis())
+        val defaultFileName = "${getString(R.string.app_name)}_${dateFormatted}.zip"
+        createBackupFile.launch(defaultFileName)
+    }
+
+    private fun restoreViaLocal() {
+        val permission =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            }
+        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            try {
+                showFileChooser()
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to show file chooser", e)
+            }
+        } else {
+            requestPermissionLauncher.launch(permission)
+        }
+    }
+
+    private fun backupViaWebDav() {
+        val saved = MmkvManager.decodeWebDavConfig()
+        if (saved == null || saved.baseUrl.isEmpty()) {
+            toastError(R.string.title_webdav_config_setting_unknown)
+            return
+        }
+
+        showLoading()
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            var tempFile: File? = null
+            try {
+                val ret = backupConfigurationToCache()
+                if (!ret.first) {
+                    withContext(Dispatchers.Main) {
+                        toastError(R.string.toast_failure)
+                    }
+                    return@launch
+                }
+
+                tempFile = File(ret.second)
+                WebDavManager.init(saved)
+
+                val ok = try {
+                    WebDavManager.uploadFile(tempFile, WEBDAV_BACKUP_FILE_NAME)
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "WebDAV upload error", e)
+                    false
+                }
+
+                withContext(Dispatchers.Main) {
+                    if (ok) toastSuccess(R.string.toast_success) else toastError(R.string.toast_failure)
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "WebDAV backup error", e)
+                withContext(Dispatchers.Main) {
+                    toastError(R.string.toast_failure)
+                }
+            } finally {
+                try {
+                    tempFile?.delete()
+                } catch (_: Exception) {
+                }
+                withContext(Dispatchers.Main) {
+                    hideLoading()
+                }
+            }
+        }
+    }
+
+    private fun restoreViaWebDav() {
+        val saved = MmkvManager.decodeWebDavConfig()
+        if (saved == null || saved.baseUrl.isEmpty()) {
+            toastError(R.string.title_webdav_config_setting_unknown)
+            return
+        }
+
+        showLoading()
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            var target: File? = null
+            try {
+                target = File(cacheDir, "download_${System.currentTimeMillis()}.zip")
+                WebDavManager.init(saved)
+                val ok = WebDavManager.downloadFile(WEBDAV_BACKUP_FILE_NAME, target)
+                if (!ok) {
+                    withContext(Dispatchers.Main) {
+                        toastError(R.string.toast_failure)
+                    }
+                    return@launch
+                }
+
+                val restored = restoreConfiguration(target)
+                withContext(Dispatchers.Main) {
+                    if (restored) {
+                        toastSuccess(R.string.toast_success)
+                    } else {
+                        toastError(R.string.toast_failure)
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "WebDAV download error", e)
+                withContext(Dispatchers.Main) { toastError(R.string.toast_failure) }
+            } finally {
+                try {
+                    target?.delete()
+                } catch (_: Exception) {
+                }
+                withContext(Dispatchers.Main) {
+                    hideLoading()
+                }
+            }
+        }
+    }
+
+    private fun showWebDavSettingsDialog() {
+        val dialogBinding = DialogWebdavBinding.inflate(layoutInflater)
+
+        MmkvManager.decodeWebDavConfig()?.let { cfg ->
+            dialogBinding.etWebdavUrl.setText(cfg.baseUrl)
+            dialogBinding.etWebdavUser.setText(cfg.username ?: "")
+            dialogBinding.etWebdavPass.setText(cfg.password ?: "")
+            dialogBinding.etWebdavRemotePath.setText(cfg.remoteBasePath ?: "/")
+        }
+
+        AlertDialog.Builder(this)
+            .setTitle(R.string.title_webdav_config_setting)
+            .setView(dialogBinding.root)
+            .setPositiveButton(R.string.menu_item_save_config) { _, _ ->
+                val url = dialogBinding.etWebdavUrl.text.toString().trim()
+                val user = dialogBinding.etWebdavUser.text.toString().trim().ifEmpty { null }
+                val pass = dialogBinding.etWebdavPass.text.toString()
+                val remotePath = dialogBinding.etWebdavRemotePath.text.toString().trim().ifEmpty { AppConfig.WEBDAV_BACKUP_DIR }
+                val cfg = WebDavConfig(baseUrl = url, username = user, password = pass, remoteBasePath = remotePath)
+                MmkvManager.encodeWebDavConfig(cfg)
+                toastSuccess(R.string.toast_success)
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt

@@ -1,22 +1,42 @@
 package com.v2ray.ang.ui
 
 import android.content.Context
-import android.os.Build
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.MenuItem
-import androidx.annotation.RequiresApi
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.v2ray.ang.R
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.CustomDividerItemDecoration
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
 
 
+/**
+ * BaseActivity provides common helpers and UI wiring used across the app's activities.
+ *
+ * Responsibilities:
+ * - Inflate a shared base layout that contains a toolbar and a content container.
+ * - Provide convenient overloads of `setContentViewWithToolbar` to attach child layouts or
+ *   view-binding roots into the base container and initialize the toolbar.
+ * - Expose a global in-layout `ProgressBar` (cached) with `showLoading()` / `hideLoading()` helpers.
+ * - Provide a helper to add a custom divider to RecyclerViews.
+ * - Wrap base context according to user locale settings.
+ */
 abstract class BaseActivity : AppCompatActivity() {
+    // Progress indicator that sits at the bottom of the toolbar
+    private var progressBar: LinearProgressIndicator? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -27,6 +47,15 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
+    /**
+     * Handle action bar item selections.
+     *
+     * Currently this handles the home/up button by delegating to the activity's
+     * onBackPressedDispatcher to provide consistent back navigation behavior.
+     *
+     * @param item the selected menu item
+     * @return true if the event was handled, otherwise delegates to the superclass
+     */
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         android.R.id.home -> {
             // Handles the home button press by delegating to the onBackPressedDispatcher.
@@ -38,20 +67,31 @@ abstract class BaseActivity : AppCompatActivity() {
         else -> super.onOptionsItemSelected(item)
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    /**
+     * Wrap the base context with the user's locale settings.
+     *
+     * This ensures resources are loaded using the configured locale.
+     *
+     * @param newBase the original base context to wrap
+     */
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, SettingsManager.getLocale()))
     }
 
     /**
-     * Adds a custom divider to a RecyclerView.
+     * Adds a custom divider drawable to the provided RecyclerView.
      *
-     * @param recyclerView  The target RecyclerView to which the divider will be added.
-     * @param context       The context used to access resources.
-     * @param drawableResId The resource ID of the drawable to be used as the divider.
-     * @param orientation   The orientation of the divider (DividerItemDecoration.VERTICAL or DividerItemDecoration.HORIZONTAL).
+     * This is a convenience helper that constructs a [CustomDividerItemDecoration]
+     * using the given drawable resource id and adds it to the RecyclerView.
+     *
+     * @param recyclerView the target RecyclerView
+     * @param context the context used to resolve resources (may be activity or application context)
+     * @param drawableResId the drawable resource id to use as the divider
+     * @param orientation one of [DividerItemDecoration.VERTICAL] or [DividerItemDecoration.HORIZONTAL]
+     *
+     * @throws IllegalArgumentException if the drawable resource cannot be found
      */
-    fun addCustomDividerToRecyclerView(recyclerView: RecyclerView, context: Context?, drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
+    protected fun addCustomDividerToRecyclerView(recyclerView: RecyclerView, context: Context?, drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
         // Get the drawable from resources
         val drawable = ContextCompat.getDrawable(context!!, drawableResId)
         requireNotNull(drawable) { "Drawable resource not found" }
@@ -62,4 +102,115 @@ abstract class BaseActivity : AppCompatActivity() {
         // Add the divider to the RecyclerView
         recyclerView.addItemDecoration(dividerItemDecoration)
     }
+
+    /**
+     * Configure the toolbar instance using the default toolbar id if null is passed.
+     *
+     * This helper will set the toolbar as the action bar and configure the up button
+     * visibility plus optional title.
+     *
+     * @param toolbar the toolbar instance to configure (may be null, in which case the view
+     *                with id R.id.toolbar in the activity content will be used)
+     * @param showHomeAsUp whether the home/up affordance should be shown (default true)
+     * @param title optional title to set on the activity
+     */
+    protected fun setupToolbar(toolbar: Toolbar?, showHomeAsUp: Boolean = true, title: CharSequence? = null) {
+        val tb = toolbar ?: findViewById<Toolbar?>(R.id.toolbar)
+        tb?.let {
+            setSupportActionBar(it)
+            supportActionBar?.setDisplayHomeAsUpEnabled(showHomeAsUp)
+            title?.let { t -> this.title = t }
+        }
+        progressBar = findViewById(R.id.progress_bar)
+    }
+
+    /**
+     * Inflate the shared base layout, attach the child layout resource into the base
+     * content container, cache the in-layout ProgressBar and configure the toolbar.
+     *
+     * Typical usage in subclasses:
+     * setContentViewWithToolbar(R.layout.activity_settings, showHomeAsUp = true, title = "Settings")
+     *
+     * @param layoutResId child layout resource to inflate into the base content container
+     * @param showHomeAsUp whether to show the up/home affordance on the toolbar (default true)
+     * @param title optional activity title to set on the toolbar
+     */
+    protected fun setContentViewWithToolbar(layoutResId: Int, showHomeAsUp: Boolean = true, title: CharSequence? = null) {
+        val base = LayoutInflater.from(this).inflate(R.layout.activity_base, null)
+        val container = base.findViewById<FrameLayout>(R.id.content_container)
+        LayoutInflater.from(this).inflate(layoutResId, container, true)
+        progressBar = base.findViewById(R.id.progress_bar)
+        super.setContentView(base)
+        setupToolbar(base, showHomeAsUp, title)
+    }
+
+    /**
+     * Inflate the shared base layout, attach the provided child view (commonly a view-binding root)
+     * into the base content container, cache the in-layout ProgressBar and configure the toolbar.
+     *
+     * Typical usage with view binding:
+     * setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = "...")
+     *
+     * @param childView the already-inflated child view to add to the base content container
+     * @param showHomeAsUp whether to show the up/home affordance on the toolbar (default true)
+     * @param title optional activity title to set on the toolbar
+     */
+    protected fun setContentViewWithToolbar(childView: View, showHomeAsUp: Boolean = true, title: CharSequence? = null) {
+        val base = LayoutInflater.from(this).inflate(R.layout.activity_base, null)
+        val container = base.findViewById<FrameLayout>(R.id.content_container)
+        container.addView(childView, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+        progressBar = base.findViewById(R.id.progress_bar)
+        super.setContentView(base)
+        setupToolbar(base, showHomeAsUp, title)
+    }
+
+    /**
+     * Internal helper that configures the MaterialToolbar found in the inflated base root.
+     *
+     * @param baseRoot the root view of the inflated base layout
+     * @param showHomeAsUp whether to show the up/home affordance
+     * @param title optional title to set on the support action bar
+     */
+    private fun setupToolbar(baseRoot: View, showHomeAsUp: Boolean, title: CharSequence?) {
+        val toolbar = baseRoot.findViewById<MaterialToolbar>(R.id.toolbar)
+        toolbar?.let {
+            setSupportActionBar(it)
+            supportActionBar?.setDisplayHomeAsUpEnabled(showHomeAsUp)
+            title?.let { t -> supportActionBar?.title = t }
+        }
+    }
+
+    /**
+     * Show the base layout's ProgressBar.
+     *
+     * This method is safe to call from background threads; the visibility change will
+     * be posted to the UI thread via [runOnUiThread]. If the base layout was not set yet
+     * (progressBar == null) the call is a no-op.
+     */
+    protected fun showLoading() {
+        runOnUiThread {
+            progressBar?.visibility = View.VISIBLE
+        }
+    }
+
+    /**
+     * Hide the base layout's ProgressBar.
+     *
+     * Safe to call from background threads. No-op if the progress bar hasn't been cached.
+     */
+    protected fun hideLoading() {
+        runOnUiThread {
+            progressBar?.visibility = View.GONE
+        }
+    }
+
+    /**
+     * Returns true when the base ProgressBar is currently visible.
+     *
+     * @return true if the progress bar exists and its visibility is VISIBLE
+     */
+    protected fun isLoadingVisible(): Boolean {
+        return progressBar?.visibility == View.VISIBLE
+    }
+
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseFragment.kt

@@ -0,0 +1,53 @@
+package com.v2ray.ang.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import com.v2ray.ang.helper.CustomDividerItemDecoration
+
+abstract class BaseFragment<VB : ViewBinding> : Fragment() {
+    private var _binding: VB? = null
+    protected val binding: VB
+        get() = _binding!!
+
+    protected abstract fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?): VB
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = inflateBinding(inflater, container)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    /**
+     * Adds a custom divider to a RecyclerView.
+     *
+     * @param recyclerView  The target RecyclerView to which the divider will be added.
+     * @param drawableResId The resource ID of the drawable to be used as the divider.
+     * @param orientation   The orientation of the divider (DividerItemDecoration.VERTICAL or DividerItemDecoration.HORIZONTAL).
+     */
+    fun addCustomDividerToRecyclerView(recyclerView: RecyclerView,  drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
+        // Get the drawable from resources
+        val drawable = ContextCompat.getDrawable(requireContext(), drawableResId)
+        requireNotNull(drawable) { "Drawable resource not found" }
+
+        // Create a DividerItemDecoration with the specified orientation
+        val dividerItemDecoration = CustomDividerItemDecoration(drawable, orientation)
+
+        // Add the divider to the RecyclerView
+        recyclerView.addItemDecoration(dividerItemDecoration)
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt

@@ -13,8 +13,8 @@ import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.UpdateCheckerManager
+import com.v2ray.ang.handler.V2RayNativeManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.launch
 
@@ -24,9 +24,8 @@ class CheckUpdateActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.update_check_for_update)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.update_check_for_update))
 
         binding.layoutCheckUpdate.setOnClickListener {
             checkForUpdates(binding.checkPreRelease.isChecked)
@@ -37,7 +36,7 @@ class CheckUpdateActivity : BaseActivity() {
         }
         binding.checkPreRelease.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_CHECK_UPDATE_PRE_RELEASE, false)
 
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
+        "v${BuildConfig.VERSION_NAME} (${V2RayNativeManager.getLibVersion()})".also {
             binding.tvVersion.text = it
         }
 
@@ -46,6 +45,7 @@ class CheckUpdateActivity : BaseActivity() {
 
     private fun checkForUpdates(includePreRelease: Boolean) {
         toast(R.string.update_checking_for_update)
+        showLoading()
 
         lifecycleScope.launch {
             try {
@@ -59,6 +59,9 @@ class CheckUpdateActivity : BaseActivity() {
                 Log.e(AppConfig.TAG, "Failed to check for updates: ${e.message}")
                 toastError(e.message ?: getString(R.string.toast_failure))
             }
+            finally {
+                hideLoading()
+            }
         }
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/FragmentAdapter.kt

@@ -1,17 +0,0 @@
-package com.v2ray.ang.ui
-
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
-
-class FragmentAdapter(fragmentActivity: FragmentActivity, private val mFragments: List<Fragment>) :
-    FragmentStateAdapter(fragmentActivity) {
-
-    override fun createFragment(position: Int): Fragment {
-        return mFragments[position]
-    }
-
-    override fun getItemCount(): Int {
-        return mFragments.size
-    }
-}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupPagerAdapter.kt

@@ -0,0 +1,20 @@
+package com.v2ray.ang.ui
+
+import android.annotation.SuppressLint
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.v2ray.ang.dto.GroupMapItem
+
+/**
+ * Pager adapter for subscription groups.
+ */
+class GroupPagerAdapter(activity: FragmentActivity, var groups: List<GroupMapItem>) : FragmentStateAdapter(activity) {
+    override fun getItemCount(): Int = groups.size
+    override fun createFragment(position: Int) = GroupServerFragment.newInstance(groups[position].id)
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun update(groups: List<GroupMapItem>) {
+        this.groups = groups
+        notifyDataSetChanged()
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt

@@ -0,0 +1,68 @@
+package com.v2ray.ang.ui
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.TAG
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.FragmentGroupServerBinding
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
+import com.v2ray.ang.viewmodel.MainViewModel
+
+class GroupServerFragment : BaseFragment<FragmentGroupServerBinding>() {
+    private val mainViewModel: MainViewModel by activityViewModels()
+    private lateinit var adapter: MainRecyclerAdapter
+    private var itemTouchHelper: ItemTouchHelper? = null
+    private val subId: String by lazy { arguments?.getString(ARG_SUB_ID).orEmpty() }
+
+    companion object {
+        private const val ARG_SUB_ID = "subscriptionId"
+        fun newInstance(subId: String) = GroupServerFragment().apply {
+            arguments = Bundle().apply { putString(ARG_SUB_ID, subId) }
+        }
+    }
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentGroupServerBinding.inflate(inflater, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        adapter = MainRecyclerAdapter(requireActivity() as MainActivity)
+        binding.recyclerView.setHasFixedSize(true)
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)) {
+            binding.recyclerView.layoutManager = GridLayoutManager(requireContext(), 2)
+        } else {
+            binding.recyclerView.layoutManager = GridLayoutManager(requireContext(), 1)
+        }
+        addCustomDividerToRecyclerView(binding.recyclerView, R.drawable.custom_divider)
+        binding.recyclerView.adapter = adapter
+
+        itemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter, allowSwipe = false))
+        itemTouchHelper?.attachToRecyclerView(binding.recyclerView)
+
+        mainViewModel.updateListAction.observe(viewLifecycleOwner) { index ->
+            if (mainViewModel.subscriptionId != subId) {
+                return@observe
+            }
+            Log.d(TAG, "GroupServerFragment updateListAction subId=$subId")
+            adapter.setData(mainViewModel.serversCache, index)
+        }
+        mainViewModel.isRunning.observe(viewLifecycleOwner) { isRunning ->
+            adapter.isRunning = isRunning
+        }
+
+        Log.d(TAG, "GroupServerFragment onViewCreated: subId=$subId")
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mainViewModel.subscriptionIdChanged(subId)
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt

@@ -30,9 +30,8 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.title_logcat)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_logcat))
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -56,7 +55,7 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
                 lst.add("-v")
                 lst.add("time")
                 lst.add("-s")
-                lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err")
+                lst.add("GoLog,${ANG_PACKAGE},AndroidRuntime,System.err")
                 val process = withContext(Dispatchers.IO) {
                     Runtime.getRuntime().exec(lst.toTypedArray())
                 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.databinding.ItemRecyclerLogcatBinding
+import com.v2ray.ang.util.Utils
 
 class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
     private var mActivity: LogcatActivity = activity
@@ -24,6 +25,11 @@ class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter
                 holder.itemSubSettingBinding.logTag.text = content.first().split("(", limit = 2).first().trim()
                 holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
             }
+
+            holder.itemView.setOnLongClickListener {
+                Utils.setClipboard(mActivity, log)
+                true
+            }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Error binding log view data", e)
         }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt

@@ -1,7 +1,6 @@
 package com.v2ray.ang.ui
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
@@ -23,10 +22,8 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.ItemTouchHelper
 import com.google.android.material.navigation.NavigationView
-import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
@@ -35,9 +32,8 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 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.handler.SettingsChangeManager
 import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
@@ -51,31 +47,23 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         ActivityMainBinding.inflate(layoutInflater)
     }
 
-    private val adapter by lazy { MainRecyclerAdapter(this) }
+    val mainViewModel: MainViewModel by viewModels()
+    private lateinit var groupPagerAdapter: GroupPagerAdapter
+    private var tabMediator: TabLayoutMediator? = null
+
     private val requestVpnPermission = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
             startV2Ray()
         }
     }
-    private val requestSubSettingActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        initGroupTab()
-    }
-    private val tabGroupListener = object : TabLayout.OnTabSelectedListener {
-        override fun onTabSelected(tab: TabLayout.Tab?) {
-            val selectId = tab?.tag.toString()
-            if (selectId != mainViewModel.subscriptionId) {
-                mainViewModel.subscriptionIdChanged(selectId)
-            }
+    private val requestActivityLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (SettingsChangeManager.consumeRestartService() && mainViewModel.isRunning.value == true) {
+            restartV2Ray()
         }
-
-        override fun onTabUnselected(tab: TabLayout.Tab?) {
-        }
-
-        override fun onTabReselected(tab: TabLayout.Tab?) {
+        if (SettingsChangeManager.consumeSetupGroupTab()) {
+            setupGroupTab()
         }
     }
-    private var mItemTouchHelper: ItemTouchHelper? = null
-    val mainViewModel: MainViewModel by viewModels()
 
     // register activity result for requesting permission
     private val requestPermissionLauncher =
@@ -127,62 +115,20 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        title = getString(R.string.title_server)
-        setSupportActionBar(binding.toolbar)
+        setupToolbar(binding.toolbar, false, getString(R.string.title_server))
 
-        binding.fab.setOnClickListener {
-            if (mainViewModel.isRunning.value == true) {
-                V2RayServiceManager.stopVService(this)
-            } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
-                val intent = VpnService.prepare(this)
-                if (intent == null) {
-                    startV2Ray()
-                } else {
-                    requestVpnPermission.launch(intent)
-                }
-            } else {
-                startV2Ray()
-            }
-        }
-        binding.layoutTest.setOnClickListener {
-            if (mainViewModel.isRunning.value == true) {
-                setTestState(getString(R.string.connection_test_testing))
-                mainViewModel.testCurrentServerRealPing()
-            } else {
-//                tv_test_state.text = getString(R.string.connection_test_fail)
-            }
-        }
-
-        binding.recyclerView.setHasFixedSize(true)
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)) {
-            binding.recyclerView.layoutManager = GridLayoutManager(this, 2)
-        } else {
-            binding.recyclerView.layoutManager = GridLayoutManager(this, 1)
-        }
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
-        binding.recyclerView.adapter = adapter
-
-        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
-        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
+        // setup viewpager and tablayout
+        groupPagerAdapter = GroupPagerAdapter(this, emptyList())
+        binding.viewPager.adapter = groupPagerAdapter
+        binding.viewPager.isUserInputEnabled = true
 
+        // setup navigation drawer
         val toggle = ActionBarDrawerToggle(
             this, binding.drawerLayout, binding.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close
         )
         binding.drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
         binding.navView.setNavigationItemSelectedListener(this)
-
-        initGroupTab()
-        setupViewModel()
-        migrateLegacy()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                pendingAction = Action.POST_NOTIFICATIONS
-                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-            }
-        }
-
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
@@ -194,72 +140,73 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 }
             }
         })
-    }
 
-    @SuppressLint("NotifyDataSetChanged")
-    private fun setupViewModel() {
-        mainViewModel.updateListAction.observe(this) { index ->
-            if (index >= 0) {
-                adapter.notifyItemChanged(index)
-            } else {
-                adapter.notifyDataSetChanged()
+        binding.fab.setOnClickListener { handleFabAction() }
+        binding.layoutTest.setOnClickListener { handleLayoutTestClick() }
+
+        setupGroupTab()
+        setupViewModel()
+        mainViewModel.reloadServerList()
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+                pendingAction = Action.POST_NOTIFICATIONS
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
             }
         }
+    }
+
+    private fun setupViewModel() {
         mainViewModel.updateTestResultAction.observe(this) { setTestState(it) }
         mainViewModel.isRunning.observe(this) { isRunning ->
-            adapter.isRunning = isRunning
-            if (isRunning) {
-                binding.fab.setImageResource(R.drawable.ic_stop_24dp)
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_active))
-                setTestState(getString(R.string.connection_connected))
-                binding.layoutTest.isFocusable = true
-            } else {
-                binding.fab.setImageResource(R.drawable.ic_play_24dp)
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
-                setTestState(getString(R.string.connection_not_connected))
-                binding.layoutTest.isFocusable = false
-            }
+            applyRunningState(false, isRunning)
         }
         mainViewModel.startListenBroadcast()
         mainViewModel.initAssets(assets)
     }
 
-    private fun migrateLegacy() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val result = MigrateManager.migrateServerConfig2Profile()
-            launch(Dispatchers.Main) {
-                if (result) {
-                    toast(getString(R.string.migration_success))
-                    mainViewModel.reloadServerList()
-                } else {
-                    //toast(getString(R.string.migration_fail))
-                }
-            }
+    private fun setupGroupTab() {
+        val groups = mainViewModel.getSubscriptions(this)
+        groupPagerAdapter.update(groups)
 
+        tabMediator?.detach()
+        tabMediator = TabLayoutMediator(binding.tabGroup, binding.viewPager) { tab, position ->
+            groupPagerAdapter.groups.getOrNull(position)?.let {
+                tab.text = it.remarks
+                tab.tag = it.id
+            }
+        }.also { it.attach() }
+
+        val targetIndex = groups.indexOfFirst { it.id == mainViewModel.subscriptionId }.takeIf { it >= 0 } ?: (groups.size - 1)
+        binding.viewPager.setCurrentItem(targetIndex, false)
+
+        binding.tabGroup.isVisible = groups.size > 1
+    }
+
+    private fun handleFabAction() {
+        applyRunningState(isLoading = true, isRunning = false)
+
+        if (mainViewModel.isRunning.value == true) {
+            V2RayServiceManager.stopVService(this)
+        } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
+            val intent = VpnService.prepare(this)
+            if (intent == null) {
+                startV2Ray()
+            } else {
+                requestVpnPermission.launch(intent)
+            }
+        } else {
+            startV2Ray()
         }
     }
 
-    private fun initGroupTab() {
-        binding.tabGroup.removeOnTabSelectedListener(tabGroupListener)
-        binding.tabGroup.removeAllTabs()
-        binding.tabGroup.isVisible = false
-
-        val (listId, listRemarks) = mainViewModel.getSubscriptions(this)
-        if (listId == null || listRemarks == null) {
-            return
+    private fun handleLayoutTestClick() {
+        if (mainViewModel.isRunning.value == true) {
+            setTestState(getString(R.string.connection_test_testing))
+            mainViewModel.testCurrentServerRealPing()
+        } else {
+            // service not running: keep existing no-op (could show a message if desired)
         }
-
-        for (it in listRemarks.indices) {
-            val tab = binding.tabGroup.newTab()
-            tab.text = listRemarks[it]
-            tab.tag = listId[it]
-            binding.tabGroup.addTab(tab)
-        }
-        val selectIndex =
-            listId.indexOf(mainViewModel.subscriptionId).takeIf { it >= 0 } ?: (listId.count() - 1)
-        binding.tabGroup.selectTab(binding.tabGroup.getTabAt(selectIndex))
-        binding.tabGroup.addOnTabSelectedListener(tabGroupListener)
-        binding.tabGroup.isVisible = true
     }
 
     private fun startV2Ray() {
@@ -270,7 +217,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         V2RayServiceManager.startVService(this)
     }
 
-    private fun restartV2Ray() {
+    fun restartV2Ray() {
         if (mainViewModel.isRunning.value == true) {
             V2RayServiceManager.stopVService(this)
         }
@@ -280,12 +227,36 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
     }
 
-    public override fun onResume() {
-        super.onResume()
-        mainViewModel.reloadServerList()
+    private fun setTestState(content: String?) {
+        binding.tvTestState.text = content
     }
 
-    public override fun onPause() {
+    private  fun applyRunningState(isLoading: Boolean, isRunning: Boolean) {
+        if (isLoading) {
+            binding.fab.setImageResource(R.drawable.ic_fab_check)
+            return
+        }
+
+        if (isRunning) {
+            binding.fab.setImageResource(R.drawable.ic_stop_24dp)
+            binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_active))
+            binding.fab.contentDescription = getString(R.string.action_stop_service)
+            setTestState(getString(R.string.connection_connected))
+            binding.layoutTest.isFocusable = true
+        } else {
+            binding.fab.setImageResource(R.drawable.ic_play_24dp)
+            binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_inactive))
+            binding.fab.contentDescription = getString(R.string.tasker_start_service)
+            setTestState(getString(R.string.connection_not_connected))
+            binding.layoutTest.isFocusable = false
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+    }
+
+    override fun onPause() {
         super.onPause()
     }
 
@@ -328,6 +299,11 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
+        R.id.import_manually_policy_group -> {
+            importManually(EConfigType.POLICYGROUP.value)
+            true
+        }
+
         R.id.import_manually_vmess -> {
             importManually(EConfigType.VMESS.value)
             true
@@ -385,11 +361,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
-        R.id.intelligent_selection_all -> {
-            mainViewModel.createIntelligentSelectionAll()
-            true
-        }
-
         R.id.service_restart -> {
             restartV2Ray()
             true
@@ -425,12 +396,20 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importManually(createConfigType: Int) {
-        startActivity(
-            Intent()
-                .putExtra("createConfigType", createConfigType)
-                .putExtra("subscriptionId", mainViewModel.subscriptionId)
-                .setClass(this, ServerActivity::class.java)
-        )
+        if (createConfigType == EConfigType.POLICYGROUP.value) {
+            startActivity(
+                Intent()
+                    .putExtra("subscriptionId", mainViewModel.subscriptionId)
+                    .setClass(this, ServerGroupActivity::class.java)
+            )
+        } else {
+            startActivity(
+                Intent()
+                    .putExtra("createConfigType", createConfigType)
+                    .putExtra("subscriptionId", mainViewModel.subscriptionId)
+                    .setClass(this, ServerActivity::class.java)
+            )
+        }
     }
 
     /**
@@ -463,7 +442,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importBatchConfig(server: String?) {
-        binding.pbWaiting.show()
+        showLoading()
 
         lifecycleScope.launch(Dispatchers.IO) {
             try {
@@ -476,15 +455,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                             mainViewModel.reloadServerList()
                         }
 
-                        countSub > 0 -> initGroupTab()
+                        countSub > 0 -> setupGroupTab()
                         else -> toastError(R.string.toast_failure)
                     }
-                    binding.pbWaiting.hide()
+                    hideLoading()
                 }
             } catch (e: Exception) {
                 withContext(Dispatchers.Main) {
                     toastError(R.string.toast_failure)
-                    binding.pbWaiting.hide()
+                    hideLoading()
                 }
                 Log.e(AppConfig.TAG, "Failed to import batch config", e)
             }
@@ -509,7 +488,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * import config from sub
      */
     private fun importConfigViaSub(): Boolean {
-        binding.pbWaiting.show()
+        showLoading()
 
         lifecycleScope.launch(Dispatchers.IO) {
             val count = mainViewModel.updateConfigViaSubAll()
@@ -521,14 +500,14 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 } else {
                     toastError(R.string.toast_failure)
                 }
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
         return true
     }
 
     private fun exportAll() {
-        binding.pbWaiting.show()
+        showLoading()
         lifecycleScope.launch(Dispatchers.IO) {
             val ret = mainViewModel.exportAllServer()
             launch(Dispatchers.Main) {
@@ -536,7 +515,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                     toast(getString(R.string.title_export_config_count, ret))
                 else
                     toastError(R.string.toast_failure)
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
     }
@@ -544,13 +523,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     private fun delAllConfig() {
         AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
             .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
+                showLoading()
                 lifecycleScope.launch(Dispatchers.IO) {
                     val ret = mainViewModel.removeAllServer()
                     launch(Dispatchers.Main) {
                         mainViewModel.reloadServerList()
                         toast(getString(R.string.title_del_config_count, ret))
-                        binding.pbWaiting.hide()
+                        hideLoading()
                     }
                 }
             }
@@ -563,13 +542,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     private fun delDuplicateConfig() {
         AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
             .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
+                showLoading()
                 lifecycleScope.launch(Dispatchers.IO) {
                     val ret = mainViewModel.removeDuplicateServer()
                     launch(Dispatchers.Main) {
                         mainViewModel.reloadServerList()
                         toast(getString(R.string.title_del_duplicate_config_count, ret))
-                        binding.pbWaiting.hide()
+                        hideLoading()
                     }
                 }
             }
@@ -582,13 +561,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     private fun delInvalidConfig() {
         AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
             .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
+                showLoading()
                 lifecycleScope.launch(Dispatchers.IO) {
                     val ret = mainViewModel.removeInvalidServer()
                     launch(Dispatchers.Main) {
                         mainViewModel.reloadServerList()
                         toast(getString(R.string.title_del_config_count, ret))
-                        binding.pbWaiting.hide()
+                        hideLoading()
                     }
                 }
             }
@@ -599,12 +578,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun sortByTestResults() {
-        binding.pbWaiting.show()
+        showLoading()
         lifecycleScope.launch(Dispatchers.IO) {
             mainViewModel.sortByTestResults()
             launch(Dispatchers.Main) {
                 mainViewModel.reloadServerList()
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
     }
@@ -654,19 +633,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
     }
 
-    private fun setTestState(content: String?) {
-        binding.tvTestState.text = content
-    }
-
-//    val mConnection = object : ServiceConnection {
-//        override fun onServiceDisconnected(name: ComponentName?) {
-//        }
-//
-//        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-//            sendMsg(AppConfig.MSG_REGISTER_CLIENT, "")
-//        }
-//    }
-
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_BUTTON_B) {
             moveTaskToBack(false)
@@ -679,22 +645,24 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         // Handle navigation view item clicks here.
         when (item.itemId) {
-            R.id.sub_setting -> requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
-            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
-            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
-            R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java))
-            R.id.settings -> startActivity(
-                Intent(this, SettingsActivity::class.java)
-                    .putExtra("isRunning", mainViewModel.isRunning.value == true)
-            )
-
+            R.id.sub_setting -> requestActivityLauncher.launch(Intent(this, SubSettingActivity::class.java))
+            R.id.per_app_proxy_settings -> requestActivityLauncher.launch(Intent(this, PerAppProxyActivity::class.java))
+            R.id.routing_setting -> requestActivityLauncher.launch(Intent(this, RoutingSettingActivity::class.java))
+            R.id.user_asset_setting -> requestActivityLauncher.launch(Intent(this, UserAssetActivity::class.java))
+            R.id.settings -> requestActivityLauncher.launch(Intent(this, SettingsActivity::class.java))
             R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.APP_PROMOTION_URL)}?t=${System.currentTimeMillis()}")
             R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
             R.id.check_for_update -> startActivity(Intent(this, CheckUpdateActivity::class.java))
+            R.id.backup_restore -> requestActivityLauncher.launch(Intent(this, BackupActivity::class.java))
             R.id.about -> startActivity(Intent(this, AboutActivity::class.java))
         }
 
         binding.drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
+
+    override fun onDestroy() {
+        tabMediator?.detach()
+        super.onDestroy()
+    }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt

@@ -1,5 +1,6 @@
 package com.v2ray.ang.ui
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.text.TextUtils
@@ -19,6 +20,7 @@ import com.v2ray.ang.databinding.ItemRecyclerFooterBinding
 import com.v2ray.ang.databinding.ItemRecyclerMainBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
@@ -26,10 +28,9 @@ 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.handler.V2RayServiceManager
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import java.util.Collections
 
 class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
     companion object {
@@ -46,18 +47,30 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     }
     var isRunning = false
     private val doubleColumnDisplay = MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)
+    private var data: MutableList<ServersCache> = mutableListOf()
 
-    /**
-     * Gets the total number of items in the adapter (servers count + footer view)
-     * @return The total item count
-     */
-    override fun getItemCount() = mActivity.mainViewModel.serversCache.size + 1
+    @SuppressLint("NotifyDataSetChanged")
+    fun setData(newData: MutableList<ServersCache>?, position: Int = -1) {
+        if (android.os.Looper.myLooper() != android.os.Looper.getMainLooper()) {
+            mActivity.runOnUiThread { setData(newData, position) }
+            return
+        }
+        data = newData?.toMutableList() ?: mutableListOf()
+
+        if (position >= 0 && position in data.indices) {
+            notifyItemChanged(position)
+        } else {
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun getItemCount() = data.size + 1
 
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         if (holder is MainViewHolder) {
-            val guid = mActivity.mainViewModel.serversCache[position].guid
-            val profile = mActivity.mainViewModel.serversCache[position].profile
-            val isCustom = profile.configType == EConfigType.CUSTOM
+            val guid = data[position].guid
+            val profile = data[position].profile
+            val isCustom = profile.configType == EConfigType.CUSTOM || profile.configType == EConfigType.POLICYGROUP
 
             holder.itemView.setBackgroundColor(Color.TRANSPARENT)
 
@@ -77,7 +90,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
 
             //layoutIndicator
             if (guid == MmkvManager.getSelectServer()) {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorAccent)
+                holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorIndicator)
             } else {
                 holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
             }
@@ -144,14 +157,18 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      */
     private fun getAddress(profile: ProfileItem): String {
         // Hide xxx:xxx:***/xxx.xxx.xxx.***
-        return "${
-            profile.server?.let {
-                if (it.contains(":"))
-                    it.split(":").take(2).joinToString(":", postfix = ":***")
-                else
-                    it.split('.').dropLast(1).joinToString(".", postfix = ".***")
-            }
-        } : ${profile.serverPort}"
+        val server = profile.server
+        val port = profile.serverPort
+        if (server.isNullOrBlank() && port.isNullOrBlank()) return ""
+
+        val addrPart = server?.let {
+            if (it.contains(":"))
+                it.split(":").take(2).joinToString(":", postfix = ":***")
+            else
+                it.split('.').dropLast(1).joinToString(".", postfix = ".***")
+        } ?: ""
+
+        return "$addrPart : ${port ?: ""}"
     }
 
     /**
@@ -201,6 +218,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     private fun showQRCode(guid: String) {
         val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(mActivity))
         ivBinding.ivQcode.setImageBitmap(AngConfigManager.share2QRCode(guid))
+        if (share_method.isNotEmpty()) {
+            ivBinding.ivQcode.contentDescription = share_method[0]
+        } else {
+            ivBinding.ivQcode.contentDescription = "QR Code"
+        }
         AlertDialog.Builder(mActivity).setView(ivBinding.root).show()
     }
 
@@ -245,6 +267,8 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             .putExtra("createConfigType", profile.configType.value)
         if (profile.configType == EConfigType.CUSTOM) {
             mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
+        } else if (profile.configType == EConfigType.POLICYGROUP) {
+            mActivity.startActivity(intent.setClass(mActivity, ServerGroupActivity::class.java))
         } else {
             mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java))
         }
@@ -257,21 +281,22 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      * @param position The position in the list
      */
     private fun removeServer(guid: String, position: Int) {
-        if (guid != MmkvManager.getSelectServer()) {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
-                AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        removeServerSub(guid, position)
-                    }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        //do noting
-                    }
-                    .show()
-            } else {
-                removeServerSub(guid, position)
-            }
-        } else {
+        if (guid == MmkvManager.getSelectServer()) {
             application.toast(R.string.toast_action_not_allowed)
+            return
+        }
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE)) {
+            AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    removeServerSub(guid, position)
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
+        } else {
+            removeServerSub(guid, position)
         }
     }
 
@@ -282,8 +307,12 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      */
     private fun removeServerSub(guid: String, position: Int) {
         mActivity.mainViewModel.removeServer(guid)
-        notifyItemRemoved(position)
-        notifyItemRangeChanged(position, mActivity.mainViewModel.serversCache.size)
+        val idx = data.indexOfFirst { it.guid == guid }
+        if (idx >= 0) {
+            data.removeAt(idx)
+            notifyItemRemoved(idx)
+            notifyItemRangeChanged(idx, data.size - idx)
+        }
     }
 
     /**
@@ -300,15 +329,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             }
             notifyItemChanged(mActivity.mainViewModel.getPosition(guid))
             if (isRunning) {
-                V2RayServiceManager.stopVService(mActivity)
-                mActivity.lifecycleScope.launch {
-                    try {
-                        delay(500)
-                        V2RayServiceManager.startVService(mActivity)
-                    } catch (e: Exception) {
-                        Log.e(AppConfig.TAG, "Failed to restart V2Ray service", e)
-                    }
-                }
+                mActivity.restartV2Ray()
             }
         }
     }
@@ -324,7 +345,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (position == mActivity.mainViewModel.serversCache.size) {
+        return if (position == data.size) {
             VIEW_TYPE_FOOTER
         } else {
             VIEW_TYPE_ITEM
@@ -349,6 +370,9 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
 
     override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
         mActivity.mainViewModel.swapServer(fromPosition, toPosition)
+        if (fromPosition < data.size && toPosition < data.size) {
+            Collections.swap(data, fromPosition, toPosition)
+        }
         notifyItemMoved(fromPosition, toPosition)
         return true
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt

@@ -7,6 +7,7 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
+import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import com.v2ray.ang.AppConfig
@@ -18,10 +19,12 @@ import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.AppManagerUtil
 import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
+import com.v2ray.ang.viewmodel.PerAppProxyViewModel
 import es.dmoral.toasty.Toasty
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -33,48 +36,16 @@ class PerAppProxyActivity : BaseActivity() {
 
     private var adapter: PerAppProxyAdapter? = null
     private var appsAll: List<AppInfo>? = null
+    private val viewModel: PerAppProxyViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.per_app_proxy_settings)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.per_app_proxy_settings))
 
         addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
 
-        lifecycleScope.launch {
-            try {
-                binding.pbWaiting.show()
-                val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-                val apps = withContext(Dispatchers.IO) {
-                    val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity)
-
-                    if (blacklist != null) {
-                        appsList.forEach { app ->
-                            app.isSelected = if (blacklist.contains(app.packageName)) 1 else 0
-                        }
-                        appsList.sortedWith { p1, p2 ->
-                            when {
-                                p1.isSelected > p2.isSelected -> -1
-                                p1.isSelected == p2.isSelected -> 0
-                                else -> 1
-                            }
-                        }
-                    } else {
-                        val collator = Collator.getInstance()
-                        appsList.sortedWith(compareBy(collator) { it.appName })
-                    }
-                }
-
-                appsAll = apps
-                adapter = PerAppProxyAdapter(this@PerAppProxyActivity, apps, blacklist)
-                binding.recyclerView.adapter = adapter
-                binding.pbWaiting.hide()
-            } catch (e: Exception) {
-                binding.pbWaiting.hide()
-                Log.e(ANG_PACKAGE, "Error loading apps", e)
-            }
-        }
+        initList()
 
         binding.switchPerAppProxy.setOnCheckedChangeListener { _, isChecked ->
             MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY, isChecked)
@@ -91,10 +62,47 @@ class PerAppProxyActivity : BaseActivity() {
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        adapter?.let {
-            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY_SET, it.blacklist)
+    private fun initList() {
+        showLoading()
+
+        lifecycleScope.launch {
+            try {
+                val apps = withContext(Dispatchers.IO) {
+                    val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity)
+
+                    val blacklistSet = viewModel.getAll()
+                    if (blacklistSet.isNotEmpty()) {
+                        appsList.forEach { app ->
+                            app.isSelected = if (blacklistSet.contains(app.packageName)) 1 else 0
+                        }
+                        appsList.sortedWith { p1, p2 ->
+                            when {
+                                p1.isSelected > p2.isSelected -> -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 {
+                        val collator = Collator.getInstance()
+                        appsList.sortedWith(compareBy(collator) { it.appName })
+                    }
+                }
+
+                appsAll = apps
+                adapter = PerAppProxyAdapter(this@PerAppProxyActivity, apps, viewModel)
+                binding.recyclerView.adapter = adapter
+
+            } catch (e: Exception) {
+                Log.e(ANG_PACKAGE, "Error loading apps", e)
+            } finally {
+                hideLoading()
+            }
         }
     }
 
@@ -114,37 +122,32 @@ class PerAppProxyActivity : BaseActivity() {
             })
         }
 
-
         return super.onCreateOptionsMenu(menu)
     }
 
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.select_all -> adapter?.let { it ->
-            val pkgNames = it.apps.map { it.packageName }
-            if (it.blacklist.containsAll(pkgNames)) {
-                it.apps.forEach {
-                    val packageName = it.packageName
-                    adapter?.blacklist?.remove(packageName)
-                }
-            } else {
-                it.apps.forEach {
-                    val packageName = it.packageName
-                    adapter?.blacklist?.add(packageName)
-                }
-            }
-            it.notifyDataSetChanged()
+        R.id.select_all -> {
+            selectAllApp()
+            allowPerAppProxy()
             true
-        } == true
+        }
+        R.id.invert_selection -> {
+            invertSelection()
+            allowPerAppProxy()
+            true
+        }
 
         R.id.select_proxy_app -> {
-            selectProxyApp()
+            selectProxyAppAuto()
+            allowPerAppProxy()
             true
         }
 
         R.id.import_proxy_app -> {
             importProxyApp()
+            allowPerAppProxy()
             true
         }
 
@@ -156,9 +159,32 @@ class PerAppProxyActivity : BaseActivity() {
         else -> super.onOptionsItemSelected(item)
     }
 
-    private fun selectProxyApp() {
+    private fun selectAllApp() {
+        adapter?.let { adapter ->
+            val pkgNames = adapter.apps.map { it.packageName }
+            val allSelected = pkgNames.all { viewModel.contains(it) }
+
+            if (allSelected) {
+                viewModel.removeAll(pkgNames)
+            } else {
+                viewModel.addAll(pkgNames)
+            }
+            refreshData()
+        }
+    }
+
+    private fun invertSelection() {
+        adapter?.let { adapter ->
+            adapter.apps.forEach { app ->
+                viewModel.toggle(app.packageName)
+            }
+            refreshData()
+        }
+    }
+
+    private fun selectProxyAppAuto() {
         toast(R.string.msg_downloading_content)
-        binding.pbWaiting.show()
+        showLoading()
 
         val url = AppConfig.ANDROID_PACKAGE_NAME_LIST_URL
         lifecycleScope.launch(Dispatchers.IO) {
@@ -168,10 +194,10 @@ class PerAppProxyActivity : BaseActivity() {
                 content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: ""
             }
             launch(Dispatchers.Main) {
-                Log.i(AppConfig.TAG, content)
+                //Log.i(AppConfig.TAG, content)
                 selectProxyApp(content, true)
                 toastSuccess(R.string.toast_success)
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
     }
@@ -186,50 +212,49 @@ class PerAppProxyActivity : BaseActivity() {
     private fun exportProxyApp() {
         var lst = binding.switchBypassApps.isChecked.toString()
 
-        adapter?.blacklist?.forEach block@{
-            lst = lst + System.getProperty("line.separator") + it
+        viewModel.getAll().forEach { pkg ->
+            lst = lst + System.lineSeparator() + pkg
         }
         Utils.setClipboard(applicationContext, lst)
         toastSuccess(R.string.toast_success)
     }
 
+    private fun allowPerAppProxy() {
+        binding.switchPerAppProxy.isChecked = true
+        SettingsChangeManager.makeRestartService()
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun selectProxyApp(content: String, force: Boolean): Boolean {
         try {
             val proxyApps = if (TextUtils.isEmpty(content)) {
-                Utils.readTextFromAssets(v2RayApplication, "proxy_packagename.txt")
+                Utils.readTextFromAssets(v2RayApplication, "proxy_package_name")
             } else {
                 content
             }
             if (TextUtils.isEmpty(proxyApps)) return false
 
-            adapter?.blacklist?.clear()
+            viewModel.clear()
 
             if (binding.switchBypassApps.isChecked) {
-                adapter?.let { it ->
-                    it.apps.forEach block@{
-                        val packageName = it.packageName
-                        Log.i(AppConfig.TAG, packageName)
+                adapter?.let { adapter ->
+                    adapter.apps.forEach { app ->
+                        val packageName = app.packageName
                         if (!inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
-                            println(packageName)
-                            return@block
+                            viewModel.add(packageName)
                         }
                     }
-                    it.notifyDataSetChanged()
+                    refreshData()
                 }
             } else {
-                adapter?.let { it ->
-                    it.apps.forEach block@{
-                        val packageName = it.packageName
-                        Log.i(AppConfig.TAG, packageName)
+                adapter?.let { adapter ->
+                    adapter.apps.forEach { app ->
+                        val packageName = app.packageName
                         if (inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
-                            println(packageName)
-                            return@block
+                            viewModel.add(packageName)
                         }
                     }
-                    it.notifyDataSetChanged()
+                    refreshData()
                 }
             }
         } catch (e: Exception) {
@@ -240,6 +265,7 @@ class PerAppProxyActivity : BaseActivity() {
     }
 
     private fun inProxyApps(proxyApps: String, packageName: String, force: Boolean): Boolean {
+        println(packageName)
         if (force) {
             if (packageName == "com.google.android.webview") return false
             if (packageName.startsWith("com.google")) return true
@@ -266,7 +292,7 @@ class PerAppProxyActivity : BaseActivity() {
             }
         }
 
-        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
+        adapter = PerAppProxyAdapter(this, apps, adapter?.viewModel ?: viewModel)
         binding.recyclerView.adapter = adapter
         refreshData()
         return true

V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt

@@ -6,8 +6,9 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.databinding.ItemRecyclerBypassListBinding
 import com.v2ray.ang.dto.AppInfo
+import com.v2ray.ang.viewmodel.PerAppProxyViewModel
 
-class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, blacklist: MutableSet<String>?) :
+class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, val viewModel: PerAppProxyViewModel) :
     RecyclerView.Adapter<PerAppProxyAdapter.BaseViewHolder>() {
 
     companion object {
@@ -15,8 +16,6 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
         private const val VIEW_TYPE_ITEM = 1
     }
 
-    val blacklist = if (blacklist == null) HashSet() else HashSet(blacklist)
-
     override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
         if (holder is AppViewHolder) {
             val appInfo = apps[position - 1]
@@ -38,11 +37,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
                 )
                 BaseViewHolder(view)
             }
-//            VIEW_TYPE_ITEM -> AppViewHolder(ctx.layoutInflater
-//                    .inflate(R.layout.item_recycler_bypass_list, parent, false))
-
             else -> AppViewHolder(ItemRecyclerBypassListBinding.inflate(LayoutInflater.from(ctx), parent, false))
-
         }
     }
 
@@ -52,13 +47,11 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
 
     inner class AppViewHolder(private val itemBypassBinding: ItemRecyclerBypassListBinding) : BaseViewHolder(itemBypassBinding.root),
         View.OnClickListener {
-        private val inBlacklist: Boolean get() = blacklist.contains(appInfo.packageName)
         private lateinit var appInfo: AppInfo
 
         fun bind(appInfo: AppInfo) {
             this.appInfo = appInfo
 
-            // Set app icon and name
             itemBypassBinding.icon.setImageDrawable(appInfo.appIcon)
             itemBypassBinding.name.text = if (appInfo.isSystemApp) {
                 String.format("** %s", appInfo.appName)
@@ -66,23 +59,16 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
                 appInfo.appName
             }
 
-            // Set package name and checkbox state
             itemBypassBinding.packageName.text = appInfo.packageName
-            itemBypassBinding.checkBox.isChecked = inBlacklist
+            itemBypassBinding.checkBox.isChecked = viewModel.contains(appInfo.packageName)
 
-            // Handle item click to toggle blacklist status
             itemView.setOnClickListener(this)
         }
 
-
         override fun onClick(v: View?) {
-            if (inBlacklist) {
-                blacklist.remove(appInfo.packageName)
-                itemBypassBinding.checkBox.isChecked = false
-            } else {
-                blacklist.add(appInfo.packageName)
-                itemBypassBinding.checkBox.isChecked = true
-            }
+            val packageName = appInfo.packageName
+            viewModel.toggle(packageName)
+            itemBypassBinding.checkBox.isChecked = viewModel.contains(packageName)
         }
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt

@@ -25,8 +25,8 @@ class RoutingEditActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.routing_settings_rule_title)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.routing_settings_rule_title))
 
         val rulesetItem = SettingsManager.getRoutingRuleset(position)
         if (rulesetItem != null) {
@@ -106,10 +106,10 @@ class RoutingEditActivity : BaseActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        val del_config = menu.findItem(R.id.del_config)
+        val delConfig = menu.findItem(R.id.del_config)
 
         if (position < 0) {
-            del_config?.isVisible = false
+            delConfig?.isVisible = false
         }
 
         return super.onCreateOptionsMenu(menu)

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt

@@ -8,6 +8,7 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -15,7 +16,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
-import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
@@ -24,6 +24,7 @@ import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
+import com.v2ray.ang.viewmodel.RoutingSettingsViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -31,8 +32,8 @@ import kotlinx.coroutines.withContext
 class RoutingSettingActivity : BaseActivity() {
     private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
 
-    var rulesets: MutableList<RulesetItem> = mutableListOf()
-    private val adapter by lazy { RoutingSettingRecyclerAdapter(this) }
+    private val viewModel: RoutingSettingsViewModel by viewModels()
+    private lateinit var adapter: RoutingSettingRecyclerAdapter
     private var mItemTouchHelper: ItemTouchHelper? = null
     private val routing_domain_strategy: Array<out String> by lazy {
         resources.getStringArray(R.array.routing_domain_strategy)
@@ -53,9 +54,10 @@ class RoutingSettingActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.routing_settings_title))
 
-        title = getString(R.string.routing_settings_title)
+        adapter = RoutingSettingRecyclerAdapter(this, viewModel)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -197,8 +199,7 @@ class RoutingSettingActivity : BaseActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     fun refreshData() {
-        rulesets.clear()
-        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
+        viewModel.reload()
         adapter.notifyDataSetChanged()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt

@@ -8,18 +8,22 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.databinding.ItemRecyclerRoutingSettingBinding
-import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
+import com.v2ray.ang.viewmodel.RoutingSettingsViewModel
 
-class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : RecyclerView.Adapter<RoutingSettingRecyclerAdapter.MainViewHolder>(),
+class RoutingSettingRecyclerAdapter(
+    val activity: RoutingSettingActivity,
+    private val viewModel: RoutingSettingsViewModel
+) : RecyclerView.Adapter<RoutingSettingRecyclerAdapter.MainViewHolder>(),
     ItemTouchHelperAdapter {
 
     private var mActivity: RoutingSettingActivity = activity
-    override fun getItemCount() = mActivity.rulesets.size
+    override fun getItemCount() = viewModel.getAll().size
 
     override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
-        val ruleset = mActivity.rulesets[position]
+        val rulesets = viewModel.getAll()
+        val ruleset = rulesets[position]
 
         holder.itemRoutingSettingBinding.remarks.text = ruleset.remarks
         holder.itemRoutingSettingBinding.domainIp.text = (ruleset.domain ?: ruleset.ip ?: ruleset.port)?.toString()
@@ -38,7 +42,7 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy
         holder.itemRoutingSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
             if (!it.isPressed) return@setOnCheckedChangeListener
             ruleset.enabled = isChecked
-            SettingsManager.saveRoutingRuleset(position, ruleset)
+            viewModel.update(position, ruleset)
         }
     }
 
@@ -66,7 +70,7 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy
     }
 
     override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-        SettingsManager.swapRoutingRuleset(fromPosition, toPosition)
+        viewModel.swap(fromPosition, toPosition)
         notifyItemMoved(fromPosition, toPosition)
         return true
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt

@@ -13,6 +13,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityNoneBinding
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
@@ -21,7 +22,7 @@ import io.github.g00fy2.quickie.ScanCustomCode
 import io.github.g00fy2.quickie.config.ScannerConfig
 
 class ScannerActivity : BaseActivity() {
-
+    private val binding by lazy {  ActivityNoneBinding.inflate(layoutInflater) }
 
     private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
     private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -59,7 +60,9 @@ class ScannerActivity : BaseActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.menu_item_import_config_qrcode))
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_START_SCAN_IMMEDIATE)) {
             launchScan()
         }
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt

@@ -82,6 +82,9 @@ class ServerActivity : BaseActivity() {
     private val xhttpMode: Array<out String> by lazy {
         resources.getStringArray(R.array.xhttp_mode)
     }
+    private val echForceQuerys: Array<out String> by lazy {
+        resources.getStringArray(R.array.ech_force_query_value)
+    }
 
 
     // Kotlin synthetics was used, but since it is removed in 1.8. We switch to old manual approach.
@@ -130,24 +133,31 @@ class ServerActivity : BaseActivity() {
     private val et_bandwidth_up: EditText? by lazy { findViewById(R.id.et_bandwidth_up) }
     private val et_extra: EditText? by lazy { findViewById(R.id.et_extra) }
     private val layout_extra: LinearLayout? by lazy { findViewById(R.id.layout_extra) }
+    private val et_ech_config_list: EditText? by lazy { findViewById(R.id.et_ech_config_list) }
+    private val container_ech_config_list: LinearLayout? by lazy { findViewById(R.id.lay_ech_config_list) }
+    private val sp_ech_force_query: Spinner? by lazy { findViewById(R.id.sp_ech_force_query) }
+    private val container_ech_force_query: LinearLayout? by lazy { findViewById(R.id.lay_ech_force_query) }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        title = getString(R.string.title_server)
 
         val config = MmkvManager.decodeServerConfig(editGuid)
-        when (config?.configType ?: createConfigType) {
-            EConfigType.VMESS -> setContentView(R.layout.activity_server_vmess)
-            EConfigType.CUSTOM -> return
-            EConfigType.SHADOWSOCKS -> setContentView(R.layout.activity_server_shadowsocks)
-            EConfigType.SOCKS -> setContentView(R.layout.activity_server_socks)
-            EConfigType.HTTP -> setContentView(R.layout.activity_server_socks)
-            EConfigType.VLESS -> setContentView(R.layout.activity_server_vless)
-            EConfigType.TROJAN -> setContentView(R.layout.activity_server_trojan)
-            EConfigType.WIREGUARD -> setContentView(R.layout.activity_server_wireguard)
-            EConfigType.HYSTERIA2 -> setContentView(R.layout.activity_server_hysteria2)
-        }
+
+        val layoutId = when (config?.configType ?: createConfigType) {
+            EConfigType.VMESS -> R.layout.activity_server_vmess
+            EConfigType.CUSTOM -> null
+            EConfigType.SHADOWSOCKS -> R.layout.activity_server_shadowsocks
+            EConfigType.SOCKS, EConfigType.HTTP -> R.layout.activity_server_socks
+            EConfigType.VLESS -> R.layout.activity_server_vless
+            EConfigType.TROJAN -> R.layout.activity_server_trojan
+            EConfigType.WIREGUARD -> R.layout.activity_server_wireguard
+            EConfigType.HYSTERIA2 -> R.layout.activity_server_hysteria2
+            EConfigType.POLICYGROUP -> null
+            else -> null
+        } ?: return
+        setContentViewWithToolbar(layoutId, showHomeAsUp = true, title = (config?.configType ?: createConfigType).toString())
+
         sp_network?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
                 parent: AdapterView<*>?,
@@ -262,7 +272,9 @@ class ServerActivity : BaseActivity() {
                             container_public_key,
                             container_short_id,
                             container_spider_x,
-                            container_mldsa65_verify
+                            container_mldsa65_verify,
+                            container_ech_config_list,
+                            container_ech_force_query
                         ).forEach { it?.visibility = View.GONE }
                     }
 
@@ -271,9 +283,11 @@ class ServerActivity : BaseActivity() {
                         listOf(
                             container_sni,
                             container_fingerprint,
-                            container_alpn
+                            container_alpn,
+                            container_allow_insecure,
+                            container_ech_config_list,
+                            container_ech_force_query
                         ).forEach { it?.visibility = View.VISIBLE }
-                        container_allow_insecure?.visibility = View.VISIBLE
                         listOf(
                             container_public_key,
                             container_short_id,
@@ -284,11 +298,16 @@ class ServerActivity : BaseActivity() {
 
                     // Case 3: Other reality values
                     else -> {
-                        listOf(container_sni, container_fingerprint).forEach {
-                            it?.visibility = View.VISIBLE
-                        }
-                        container_alpn?.visibility = View.GONE
-                        container_allow_insecure?.visibility = View.GONE
+                        listOf(
+                            container_sni,
+                            container_fingerprint
+                        ).forEach { it?.visibility = View.VISIBLE }
+                        listOf(
+                            container_alpn,
+                            container_allow_insecure,
+                            container_ech_config_list,
+                            container_ech_force_query
+                        ).forEach { it?.visibility = View.GONE }
                         listOf(
                             container_public_key,
                             container_short_id,
@@ -356,10 +375,6 @@ class ServerActivity : BaseActivity() {
         val streamSecurity = Utils.arrayFind(streamSecuritys, config.security.orEmpty())
         if (streamSecurity >= 0) {
             sp_stream_security?.setSelection(streamSecurity)
-            container_sni?.visibility = View.VISIBLE
-            container_fingerprint?.visibility = View.VISIBLE
-            container_alpn?.visibility = View.VISIBLE
-
             et_sni?.text = Utils.getEditable(config.sni)
             config.fingerPrint?.let { it ->
                 val utlsIndex = Utils.arrayFind(uTlsItems, it)
@@ -370,42 +385,23 @@ class ServerActivity : BaseActivity() {
                 alpnIndex.let { sp_stream_alpn?.setSelection(if (it >= 0) it else 0) }
             }
             if (config.security == TLS) {
-                container_allow_insecure?.visibility = View.VISIBLE
                 val allowinsecure = Utils.arrayFind(allowinsecures, config.insecure.toString())
                 if (allowinsecure >= 0) {
                     sp_allow_insecure?.setSelection(allowinsecure)
                 }
-                listOf(
-                    container_public_key,
-                    container_short_id,
-                    container_spider_x,
-                    container_mldsa65_verify
-                ).forEach { it?.visibility = View.GONE }
+                et_ech_config_list?.text = Utils.getEditable(config.echConfigList)
+                config.echForceQuery?.let { it ->
+                    val index = Utils.arrayFind(echForceQuerys, it)
+                    index.let { sp_ech_force_query?.setSelection(if (it >= 0) it else 0) }
+                }
             } else if (config.security == REALITY) {
-                container_public_key?.visibility = View.VISIBLE
                 et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
-                container_short_id?.visibility = View.VISIBLE
                 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()) {
-            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) {
             sp_network?.setSelection(network)
@@ -568,6 +564,8 @@ class ServerActivity : BaseActivity() {
         val shortId = et_short_id?.text?.toString()
         val spiderX = et_spider_x?.text?.toString()
         val mldsa65Verify = et_mldsa65_verify?.text?.toString()
+        val echConfigList = et_ech_config_list?.text?.toString()
+        val echForceQueryIndex = sp_ech_force_query?.selectedItemPosition ?: 0
 
         val allowInsecure =
             if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
@@ -585,6 +583,8 @@ class ServerActivity : BaseActivity() {
         config.shortId = shortId
         config.spiderX = spiderX
         config.mldsa65Verify = mldsa65Verify
+        config.echConfigList = echConfigList
+        config.echForceQuery = echForceQuerys[echForceQueryIndex]
     }
 
     private fun transportTypes(network: String?): Array<out String> {
@@ -617,7 +617,7 @@ class ServerActivity : BaseActivity() {
     private fun deleteServer(): Boolean {
         if (editGuid.isNotEmpty()) {
             if (editGuid != MmkvManager.getSelectServer()) {
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE)) {
                     AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                         .setPositiveButton(android.R.string.ok) { _, _ ->
                             MmkvManager.removeServer(editGuid)

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt

@@ -31,8 +31,8 @@ class ServerCustomConfigActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.title_server)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = EConfigType.CUSTOM.toString())
 
         if (!Utils.getDarkModeStatus(this)) {
             binding.editor.colorScheme = EditorTheme.INTELLIJ_LIGHT

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt

@@ -0,0 +1,165 @@
+package com.v2ray.ang.ui
+
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.ArrayAdapter
+import androidx.appcompat.app.AlertDialog
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityServerGroupBinding
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.Utils
+
+class ServerGroupActivity : BaseActivity() {
+    private val binding by lazy { ActivityServerGroupBinding.inflate(layoutInflater) }
+
+    private val editGuid by lazy { intent.getStringExtra("guid").orEmpty() }
+    private val isRunning by lazy {
+        intent.getBooleanExtra("isRunning", false)
+                && editGuid.isNotEmpty()
+                && editGuid == MmkvManager.getSelectServer()
+    }
+    private val subscriptionId by lazy {
+        intent.getStringExtra("subscriptionId")
+    }
+    private val subIds = mutableListOf<String>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = EConfigType.POLICYGROUP.toString())
+
+        val config = MmkvManager.decodeServerConfig(editGuid)
+        populateSubscriptionSpinner()
+
+        if (config != null) {
+            bindingServer(config)
+        } else {
+            clearServer()
+        }
+    }
+
+    /**
+     * Binding selected server config
+     */
+    private fun bindingServer(config: ProfileItem): Boolean {
+        binding.etRemarks.text = Utils.getEditable(config.remarks)
+        binding.etPolicyGroupFilter.text = Utils.getEditable(config.policyGroupFilter)
+
+        val type = config.policyGroupType?.toInt() ?: 0
+        binding.spPolicyGroupType.setSelection(type)
+
+        val pos = subIds.indexOf(config.policyGroupSubscriptionId ?: "").let { if (it >= 0) it else 0 }
+        binding.spPolicyGroupSubId.setSelection(pos)
+
+        return true
+    }
+
+    /**
+     * clear or init server config
+     */
+    private fun clearServer(): Boolean {
+        binding.etRemarks.text = null
+        binding.etPolicyGroupFilter.text = null
+        return true
+    }
+
+    /**
+     * save server config
+     */
+    private fun saveServer(): Boolean {
+        if (TextUtils.isEmpty(binding.etRemarks.text.toString())) {
+            toast(R.string.server_lab_remarks)
+            return false
+        }
+
+        val config = MmkvManager.decodeServerConfig(editGuid) ?: ProfileItem.create(EConfigType.POLICYGROUP)
+        config.remarks = binding.etRemarks.text.toString().trim()
+        config.policyGroupFilter = binding.etPolicyGroupFilter.text.toString().trim()
+
+        config.policyGroupType = binding.spPolicyGroupType.selectedItemPosition.toString()
+
+        val selPos = binding.spPolicyGroupSubId.selectedItemPosition
+        config.policyGroupSubscriptionId = if (selPos >= 0 && selPos < subIds.size) subIds[selPos] else null
+
+        if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
+            config.subscriptionId = subscriptionId.orEmpty()
+        }
+        MmkvManager.encodeServerConfig(editGuid, config)
+        toastSuccess(R.string.toast_success)
+        finish()
+        return true
+    }
+
+    /**
+     * save server config
+     */
+    private fun deleteServer(): Boolean {
+        if (editGuid.isNotEmpty()) {
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    MmkvManager.removeServer(editGuid)
+                    finish()
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    // do nothing
+                }
+                .show()
+        }
+        return true
+    }
+
+    private fun populateSubscriptionSpinner() {
+        val subs = MmkvManager.decodeSubscriptions()
+        val displayList = mutableListOf(getString(R.string.filter_config_all)) //none
+        subIds.clear()
+        subIds.add("") // index 0 => All
+        subs.forEach { (id, item) ->
+            val name = when {
+                item.remarks.isNotBlank() -> item.remarks
+                else -> id
+            }
+            displayList.add(name)
+            subIds.add(id)
+        }
+        val subAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, displayList)
+        subAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        binding.spPolicyGroupSubId.adapter = subAdapter
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.action_server, menu)
+        val delButton = menu.findItem(R.id.del_config)
+        val saveButton = menu.findItem(R.id.save_config)
+
+        if (editGuid.isNotEmpty()) {
+            if (isRunning) {
+                delButton?.isVisible = false
+                saveButton?.isVisible = false
+            }
+        } else {
+            delButton?.isVisible = false
+        }
+
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.del_config -> {
+            deleteServer()
+            true
+        }
+
+        R.id.save_config -> {
+            saveServer()
+            true
+        }
+
+        else -> super.onOptionsItemSelected(item)
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt

@@ -1,10 +1,7 @@
 package com.v2ray.ang.ui
 
-import android.content.Intent
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.View
-import androidx.activity.viewModels
 import androidx.preference.CheckBoxPreference
 import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
@@ -18,33 +15,28 @@ 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.handler.MmkvPreferenceDataStore
 import com.v2ray.ang.handler.SubscriptionUpdater
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.viewmodel.SettingsViewModel
 import java.util.concurrent.TimeUnit
 
 class SettingsActivity : BaseActivity() {
-    private val settingsViewModel: SettingsViewModel by viewModels()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_settings)
-
-        title = getString(R.string.title_settings)
-
-        settingsViewModel.startListenPreferenceChange()
+        setContentViewWithToolbar(R.layout.activity_settings, showHomeAsUp = true, title = getString(R.string.title_settings))
     }
 
     class SettingsFragment : PreferenceFragmentCompat() {
 
-        private val perAppProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_PER_APP_PROXY) }
         private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) }
         private val fakeDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_FAKE_DNS_ENABLED) }
         private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
-        private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
+
+        //        private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
         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) }
@@ -58,36 +50,21 @@ class SettingsActivity : BaseActivity() {
 
         private val autoUpdateCheck by lazy { findPreference<CheckBoxPreference>(AppConfig.SUBSCRIPTION_AUTO_UPDATE) }
         private val autoUpdateInterval by lazy { findPreference<EditTextPreference>(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL) }
-
-        private val socksPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_SOCKS_PORT) }
-        private val remoteDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_REMOTE_DNS) }
-        private val domesticDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DOMESTIC_DNS) }
-        private val dnsHosts by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DNS_HOSTS) }
-        private val delayTestUrl by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DELAY_TEST_URL) }
         private val mode by lazy { findPreference<ListPreference>(AppConfig.PREF_MODE) }
 
         override fun onCreatePreferences(bundle: Bundle?, s: String?) {
+            // Use MMKV as the storage backend for all Preferences
+            // This prevents inconsistencies between SharedPreferences and MMKV
+            preferenceManager.preferenceDataStore = MmkvPreferenceDataStore()
+
             addPreferencesFromResource(R.xml.pref_settings)
 
-            perAppProxy?.setOnPreferenceClickListener {
-                startActivity(Intent(activity, PerAppProxyActivity::class.java))
-                perAppProxy?.isChecked = true
-                false
-            }
+            initPreferenceSummaries()
+
             localDns?.setOnPreferenceChangeListener { _, any ->
                 updateLocalDns(any as Boolean)
                 true
             }
-            localDnsPort?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                localDnsPort?.summary =
-                    if (TextUtils.isEmpty(nval)) AppConfig.PORT_LOCAL_DNS else nval
-                true
-            }
-            vpnDns?.setOnPreferenceChangeListener { _, any ->
-                vpnDns?.summary = any as String
-                true
-            }
 
             mux?.setOnPreferenceChangeListener { _, newValue ->
                 updateMux(newValue as Boolean)
@@ -106,18 +83,6 @@ class SettingsActivity : BaseActivity() {
                 updateFragment(newValue as Boolean)
                 true
             }
-            fragmentPackets?.setOnPreferenceChangeListener { _, newValue ->
-                updateFragmentPackets(newValue as String)
-                true
-            }
-            fragmentLength?.setOnPreferenceChangeListener { _, newValue ->
-                updateFragmentLength(newValue as String)
-                true
-            }
-            fragmentInterval?.setOnPreferenceChangeListener { _, newValue ->
-                updateFragmentInterval(newValue as String)
-                true
-            }
 
             autoUpdateCheck?.setOnPreferenceChangeListener { _, newValue ->
                 val value = newValue as Boolean
@@ -128,156 +93,78 @@ class SettingsActivity : BaseActivity() {
                 }
                 true
             }
-            autoUpdateInterval?.setOnPreferenceChangeListener { _, any ->
-                var nval = any as String
-
-                // It must be greater than 15 minutes because WorkManager couldn't run tasks under 15 minutes intervals
-                nval =
-                    if (TextUtils.isEmpty(nval) || nval.toLongEx() < 15) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
-                autoUpdateInterval?.summary = nval
-                configureUpdateTask(nval.toLongEx())
-                true
-            }
-
-            socksPort?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                socksPort?.summary = if (TextUtils.isEmpty(nval)) AppConfig.PORT_SOCKS else nval
-                true
-            }
-
-            remoteDns?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                remoteDns?.summary = if (nval == "") AppConfig.DNS_PROXY else nval
-                true
-            }
-            domesticDns?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                domesticDns?.summary = if (nval == "") AppConfig.DNS_DIRECT else nval
-                true
-            }
-            dnsHosts?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                dnsHosts?.summary = nval
-                true
-            }
-            delayTestUrl?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                delayTestUrl?.summary = if (nval == "") AppConfig.DELAY_TEST_URL else nval
-                true
-            }
             mode?.setOnPreferenceChangeListener { _, newValue ->
                 updateMode(newValue.toString())
                 true
             }
             mode?.dialogLayoutResource = R.layout.preference_with_help_link
-            //loglevel.summary = "LogLevel"
 
         }
 
+        private fun initPreferenceSummaries() {
+            fun updateSummary(pref: androidx.preference.Preference) {
+                when (pref) {
+                    is EditTextPreference -> {
+                        pref.summary = pref.text.orEmpty()
+                        pref.setOnPreferenceChangeListener { p, newValue ->
+                            p.summary = (newValue as? String).orEmpty()
+                            true
+                        }
+                    }
+
+                    is ListPreference -> {
+                        pref.summary = pref.entry ?: ""
+                        pref.setOnPreferenceChangeListener { p, newValue ->
+                            val lp = p as ListPreference
+                            val idx = lp.findIndexOfValue(newValue as? String)
+                            lp.summary = (if (idx >= 0) lp.entries[idx] else newValue) as CharSequence?
+                            true
+                        }
+                    }
+
+                    is CheckBoxPreference, is androidx.preference.SwitchPreferenceCompat -> {
+                    }
+                }
+            }
+
+            fun traverse(group: androidx.preference.PreferenceGroup) {
+                for (i in 0 until group.preferenceCount) {
+                    when (val p = group.getPreference(i)) {
+                        is androidx.preference.PreferenceGroup -> traverse(p)
+                        else -> updateSummary(p)
+                    }
+                }
+            }
+
+            preferenceScreen?.let { traverse(it) }
+        }
+
         override fun onStart() {
             super.onStart()
+            // Initialize mode-dependent UI states
             updateMode(MmkvManager.decodeSettingsString(AppConfig.PREF_MODE, VPN))
-            localDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
-            fakeDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED, false)
-            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)
 
+            // Initialize mux-dependent UI states
             updateMux(MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false))
-            mux?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
-            muxConcurrency?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8")
-            muxXudpConcurrency?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
 
+            // Initialize fragment-dependent UI states
             updateFragment(MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false))
-            fragment?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false)
-            fragmentPackets?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello")
-            fragmentLength?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100")
-            fragmentInterval?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
 
-            autoUpdateCheck?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
-            autoUpdateInterval?.summary =
-                MmkvManager.decodeSettingsString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+            // Initialize auto-update interval state
             autoUpdateInterval?.isEnabled = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
 
-            socksPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
-            remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
-            domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
-            dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
-            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)
-
-            initSharedPreference()
-        }
-
-        private fun initSharedPreference() {
-            listOf(
-                localDnsPort,
-                vpnDns,
-                muxConcurrency,
-                muxXudpConcurrency,
-                fragmentLength,
-                fragmentInterval,
-                autoUpdateInterval,
-                socksPort,
-                remoteDns,
-                domesticDns,
-                delayTestUrl
-            ).forEach { key ->
-                key?.text = key?.summary.toString()
-            }
-
-            listOf(
-                AppConfig.PREF_SNIFFING_ENABLED,
-            ).forEach { key ->
-                findPreference<CheckBoxPreference>(key)?.isChecked =
-                    MmkvManager.decodeSettingsBool(key, true)
-            }
-
-            listOf(
-                AppConfig.PREF_ROUTE_ONLY_ENABLED,
-                AppConfig.PREF_IS_BOOTED,
-                AppConfig.PREF_BYPASS_APPS,
-                AppConfig.PREF_SPEED_ENABLED,
-                AppConfig.PREF_CONFIRM_REMOVE,
-                AppConfig.PREF_START_SCAN_IMMEDIATE,
-                AppConfig.PREF_DOUBLE_COLUMN_DISPLAY,
-                AppConfig.PREF_PREFER_IPV6,
-                AppConfig.PREF_PROXY_SHARING,
-                AppConfig.PREF_ALLOW_INSECURE
-            ).forEach { key ->
-                findPreference<CheckBoxPreference>(key)?.isChecked =
-                    MmkvManager.decodeSettingsBool(key, false)
-            }
-
-            listOf(
-                AppConfig.PREF_VPN_BYPASS_LAN,
-                AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX,
-                AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
-                AppConfig.PREF_MUX_XUDP_QUIC,
-                AppConfig.PREF_FRAGMENT_PACKETS,
-                AppConfig.PREF_LANGUAGE,
-                AppConfig.PREF_UI_MODE_NIGHT,
-                AppConfig.PREF_LOGLEVEL,
-                AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD,
-                AppConfig.PREF_INTELLIGENT_SELECTION_METHOD,
-                AppConfig.PREF_MODE
-            ).forEach { key ->
-                if (MmkvManager.decodeSettingsString(key) != null) {
-                    findPreference<ListPreference>(key)?.value = MmkvManager.decodeSettingsString(key)
-                }
-            }
         }
 
         private fun updateMode(mode: String?) {
             val vpn = mode == VPN
-            perAppProxy?.isEnabled = vpn
-            perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false)
             localDns?.isEnabled = vpn
             fakeDns?.isEnabled = vpn
             appendHttpProxy?.isEnabled = vpn
-            localDnsPort?.isEnabled = vpn
+//            localDnsPort?.isEnabled = vpn
             vpnDns?.isEnabled = vpn
             vpnBypassLan?.isEnabled = vpn
             vpnInterfaceAddress?.isEnabled = vpn
+            vpnMtu?.isEnabled = vpn
             if (vpn) {
                 updateLocalDns(
                     MmkvManager.decodeSettingsBool(
@@ -290,7 +177,7 @@ class SettingsActivity : BaseActivity() {
 
         private fun updateLocalDns(enabled: Boolean) {
             fakeDns?.isEnabled = enabled
-            localDnsPort?.isEnabled = enabled
+//            localDnsPort?.isEnabled = enabled
             vpnDns?.isEnabled = !enabled
         }
 
@@ -347,23 +234,6 @@ class SettingsActivity : BaseActivity() {
             fragmentPackets?.isEnabled = enabled
             fragmentLength?.isEnabled = enabled
             fragmentInterval?.isEnabled = enabled
-            if (enabled) {
-                updateFragmentPackets(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello"))
-                updateFragmentLength(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100"))
-                updateFragmentInterval(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20"))
-            }
-        }
-
-        private fun updateFragmentPackets(value: String?) {
-            fragmentPackets?.summary = value.toString()
-        }
-
-        private fun updateFragmentLength(value: String?) {
-            fragmentLength?.summary = value.toString()
-        }
-
-        private fun updateFragmentInterval(value: String?) {
-            fragmentInterval?.summary = value.toString()
         }
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt

@@ -13,6 +13,7 @@ import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,9 +28,10 @@ class SubEditActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.title_sub_setting)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_sub_setting))
 
+        SettingsChangeManager.makeSetupGroupTab()
         val subItem = MmkvManager.decodeSubscription(editSubId)
         if (subItem != null) {
             bindingServer(subItem)
@@ -44,8 +46,8 @@ class SubEditActivity : BaseActivity() {
     private fun bindingServer(subItem: SubscriptionItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(subItem.remarks)
         binding.etUrl.text = Utils.getEditable(subItem.url)
+        binding.etUserAgent.text = Utils.getEditable(subItem.userAgent)
         binding.etFilter.text = Utils.getEditable(subItem.filter)
-        binding.etIntelligentSelectionFilter.text = Utils.getEditable(subItem.intelligentSelectionFilter)
         binding.chkEnable.isChecked = subItem.enabled
         binding.autoUpdateCheck.isChecked = subItem.autoUpdate
         binding.allowInsecureUrl.isChecked = subItem.allowInsecureUrl
@@ -61,7 +63,6 @@ class SubEditActivity : BaseActivity() {
         binding.etRemarks.text = null
         binding.etUrl.text = null
         binding.etFilter.text = null
-        binding.etIntelligentSelectionFilter.text = null
         binding.chkEnable.isChecked = true
         binding.etPreProfile.text = null
         binding.etNextProfile.text = null
@@ -76,8 +77,8 @@ class SubEditActivity : BaseActivity() {
 
         subItem.remarks = binding.etRemarks.text.toString()
         subItem.url = binding.etUrl.text.toString()
+        subItem.userAgent = binding.etUserAgent.text.toString()
         subItem.filter = binding.etFilter.text.toString()
-        subItem.intelligentSelectionFilter = binding.etIntelligentSelectionFilter.text.toString()
         subItem.enabled = binding.chkEnable.isChecked
         subItem.autoUpdate = binding.autoUpdateCheck.isChecked
         subItem.prevProfile = binding.etPreProfile.text.toString()
@@ -113,7 +114,7 @@ class SubEditActivity : BaseActivity() {
      */
     private fun deleteServer(): Boolean {
         if (editSubId.isNotEmpty()) {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE)) {
                 AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
                         lifecycleScope.launch(Dispatchers.IO) {

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt

@@ -5,17 +5,17 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
-import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
-import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
+import com.v2ray.ang.viewmodel.SubscriptionsViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -23,15 +23,16 @@ import kotlinx.coroutines.launch
 class SubSettingActivity : BaseActivity() {
     private val binding by lazy { ActivitySubSettingBinding.inflate(layoutInflater) }
 
-    var subscriptions: List<Pair<String, SubscriptionItem>> = listOf()
-    private val adapter by lazy { SubSettingRecyclerAdapter(this) }
+    private val viewModel: SubscriptionsViewModel by viewModels()
+    private lateinit var adapter: SubSettingRecyclerAdapter
     private var mItemTouchHelper: ItemTouchHelper? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_sub_setting))
 
-        title = getString(R.string.title_sub_setting)
+        adapter = SubSettingRecyclerAdapter(this, viewModel)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -59,7 +60,7 @@ class SubSettingActivity : BaseActivity() {
         }
 
         R.id.sub_update -> {
-            binding.pbWaiting.show()
+            showLoading()
 
             lifecycleScope.launch(Dispatchers.IO) {
                 val count = AngConfigManager.updateConfigViaSubAll()
@@ -67,10 +68,11 @@ class SubSettingActivity : BaseActivity() {
                 launch(Dispatchers.Main) {
                     if (count > 0) {
                         toastSuccess(R.string.toast_success)
+                        refreshData()
                     } else {
                         toastError(R.string.toast_failure)
                     }
-                    binding.pbWaiting.hide()
+                    hideLoading()
                 }
             }
 
@@ -83,7 +85,7 @@ class SubSettingActivity : BaseActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     fun refreshData() {
-        subscriptions = MmkvManager.decodeSubscriptions()
+        viewModel.reload()
         adapter.notifyDataSetChanged()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt

@@ -8,7 +8,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
@@ -16,15 +15,16 @@ import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.util.QRCodeDecoder
 import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
+import com.v2ray.ang.viewmodel.SubscriptionsViewModel
 
-class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {
+class SubSettingRecyclerAdapter(
+    val activity: SubSettingActivity,
+    private val viewModel: SubscriptionsViewModel
+) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {
 
     private var mActivity: SubSettingActivity = activity
 
@@ -32,14 +32,16 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
         mActivity.resources.getStringArray(R.array.share_sub_method)
     }
 
-    override fun getItemCount() = mActivity.subscriptions.size
+    override fun getItemCount() = viewModel.getAll().size
 
     override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
-        val subId = mActivity.subscriptions[position].first
-        val subItem = mActivity.subscriptions[position].second
+        val subscriptions = viewModel.getAll()
+        val subId = subscriptions[position].first
+        val subItem = subscriptions[position].second
         holder.itemSubSettingBinding.tvName.text = subItem.remarks
         holder.itemSubSettingBinding.tvUrl.text = subItem.url
         holder.itemSubSettingBinding.chkEnable.isChecked = subItem.enabled
+        holder.itemSubSettingBinding.tvLastUpdated.text = Utils.formatTimestamp(subItem.lastUpdated)
         holder.itemView.setBackgroundColor(Color.TRANSPARENT)
 
         holder.itemSubSettingBinding.layoutEdit.setOnClickListener {
@@ -56,18 +58,19 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
         holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
             if (!it.isPressed) return@setOnCheckedChangeListener
             subItem.enabled = isChecked
-            MmkvManager.encodeSubscription(subId, subItem)
-
+            viewModel.update(subId, subItem)
         }
 
         if (TextUtils.isEmpty(subItem.url)) {
             holder.itemSubSettingBinding.layoutUrl.visibility = View.GONE
             holder.itemSubSettingBinding.layoutShare.visibility = View.INVISIBLE
             holder.itemSubSettingBinding.chkEnable.visibility = View.INVISIBLE
+            holder.itemSubSettingBinding.layoutLastUpdated.visibility = View.INVISIBLE
         } else {
             holder.itemSubSettingBinding.layoutUrl.visibility = View.VISIBLE
             holder.itemSubSettingBinding.layoutShare.visibility = View.VISIBLE
             holder.itemSubSettingBinding.chkEnable.visibility = View.VISIBLE
+            holder.itemSubSettingBinding.layoutLastUpdated.visibility = View.VISIBLE
             holder.itemSubSettingBinding.layoutShare.setOnClickListener {
                 AlertDialog.Builder(mActivity)
                     .setItems(share_method.asList().toTypedArray()) { _, i ->
@@ -100,7 +103,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
     }
 
     private fun removeSubscription(subId: String, position: Int) {
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE)) {
             AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     removeSubscriptionSub(subId, position)
@@ -115,14 +118,10 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
     }
 
     private fun removeSubscriptionSub(subId: String, position: Int) {
-        mActivity.lifecycleScope.launch(Dispatchers.IO) {
-            MmkvManager.removeSubscription(subId)
-            launch(Dispatchers.Main) {
-                notifyItemRemoved(position)
-                notifyItemRangeChanged(position, mActivity.subscriptions.size)
-                mActivity.refreshData()
-            }
-        }
+        viewModel.remove(subId)
+        notifyItemRemoved(position)
+        notifyItemRangeChanged(position, viewModel.getAll().size)
+        mActivity.refreshData()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
@@ -149,7 +148,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
     }
 
     override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-        SettingsManager.swapSubscriptions(fromPosition, toPosition)
+        viewModel.swap(fromPosition, toPosition)
         notifyItemMoved(fromPosition, toPosition)
         return true
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt

@@ -92,8 +92,8 @@ class TaskerActivity : BaseActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.action_server, menu)
-        val del_config = menu.findItem(R.id.del_config)
-        del_config?.isVisible = false
+        val delConfig = menu.findItem(R.id.del_config)
+        delConfig?.isVisible = false
         return super.onCreateOptionsMenu(menu)
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt

@@ -83,8 +83,8 @@ class UserAssetActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.title_user_asset_setting)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_user_asset_setting))
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -219,7 +219,7 @@ class UserAssetActivity : BaseActivity() {
     }
 
     private fun downloadGeoFiles() {
-        binding.pbWaiting.show()
+        showLoading()
         toast(R.string.msg_downloading_content)
 
         val httpPort = SettingsManager.getHttpPort()
@@ -247,7 +247,7 @@ class UserAssetActivity : BaseActivity() {
                 } else {
                     toast(getString(R.string.toast_failure))
                 }
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
     }

V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt

@@ -32,8 +32,8 @@ class UserAssetUrlActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-        title = getString(R.string.title_user_asset_add_url)
+        //setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_user_asset_add_url))
 
         val assetItem = MmkvManager.decodeAsset(editAssetId)
         val assetUrlQrcode = intent.getStringExtra(ASSET_URL_QRCODE)

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 {
@@ -126,7 +128,7 @@ object HttpUtil {
      * @throws IOException If an I/O error occurs.
      */
     @Throws(IOException::class)
-    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 15000, httpPort: Int = 0): String {
+    fun getUrlContentWithUserAgent(url: String?, userAgent: String?,  timeout: Int = 15000, httpPort: Int = 0): String {
         var currentUrl = url
         var redirects = 0
         val maxRedirects = 3
@@ -134,13 +136,18 @@ object HttpUtil {
         while (redirects++ < maxRedirects) {
             if (currentUrl == null) continue
             val conn = createProxyConnection(currentUrl, httpPort, timeout, timeout) ?: continue
-            conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
+            val finalUserAgent = if (userAgent.isNullOrBlank()) {
+                "v2rayNG/${BuildConfig.VERSION_NAME}"
+            } else {
+                userAgent
+            }
+            conn.setRequestProperty("User-agent", finalUserAgent)
             conn.connect()
 
             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 +226,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
+                }
+            }
+        }
+    }
 }
 

V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt

@@ -32,7 +32,7 @@ object JsonUtil {
      * @param cls The class of the object to parse into.
      * @return The parsed object.
      */
-    fun <T> fromJson(src: String, cls: Class<T>): T {
+    fun <T> fromJson(src: String, cls: Class<T>): T? {
         return gson.fromJson(src, cls)
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt

@@ -4,9 +4,7 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.content.res.Resources
-import android.os.Build
 import android.os.LocaleList
-import androidx.annotation.RequiresApi
 import java.util.Locale
 
 open class MyContextWrapper(base: Context?) : ContextWrapper(base) {
@@ -18,21 +16,18 @@ open class MyContextWrapper(base: Context?) : ContextWrapper(base) {
          * @param newLocale The new locale to set.
          * @return A ContextWrapper with the new locale.
          */
-        @RequiresApi(Build.VERSION_CODES.N)
         fun wrap(context: Context, newLocale: Locale?): ContextWrapper {
             var mContext = context
             val res: Resources = mContext.resources
             val configuration: Configuration = res.configuration
-            mContext = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                configuration.setLocale(newLocale)
-                val localeList = LocaleList(newLocale)
-                LocaleList.setDefault(localeList)
-                configuration.setLocales(localeList)
-                mContext.createConfigurationContext(configuration)
-            } else {
-                configuration.setLocale(newLocale)
-                mContext.createConfigurationContext(configuration)
-            }
+
+            val locale = newLocale ?: Locale.getDefault()
+            configuration.setLocale(locale)
+            val localeList = LocaleList(locale)
+            LocaleList.setDefault(localeList)
+            configuration.setLocales(localeList)
+
+            mContext = mContext.createConfigurationContext(configuration)
             return ContextWrapper(mContext)
         }
     }

V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt

@@ -25,6 +25,8 @@ import java.net.ServerSocket
 import java.net.URI
 import java.net.URLDecoder
 import java.net.URLEncoder
+import java.text.SimpleDateFormat
+import java.util.Date
 import java.util.Locale
 import java.util.UUID
 
@@ -134,11 +136,16 @@ object Utils {
      * Encode a string to base64.
      *
      * @param text The string to encode.
+     * @param removePadding
      * @return The base64 encoded string, or an empty string if encoding fails.
      */
-    fun encode(text: String): String {
+    fun encode(text: String, removePadding : Boolean = false): String {
         return try {
-            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
+            var encoded = Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
+            if (removePadding) {
+                encoded = encoded.trimEnd('=')
+            }
+            encoded
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to encode text to base64", e)
             ""
@@ -368,24 +375,6 @@ object Utils {
         }
     }
 
-    /**
-     * Get the path to the backup directory.
-     *
-     * @param context The context to use.
-     * @return The path to the backup directory.
-     */
-    fun backupPath(context: Context?): String {
-        if (context == null) return ""
-
-        return try {
-            context.getExternalFilesDir(AppConfig.DIR_BACKUPS)?.absolutePath
-                ?: context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to get backup path", e)
-            ""
-        }
-    }
-
     /**
      * Get the device ID for XUDP base key.
      *
@@ -432,11 +421,7 @@ object Utils {
      *
      * @return The system locale.
      */
-    fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        LocaleList.getDefault()[0]
-    } else {
-        Locale.getDefault()
-    }
+    fun getSysLocale(): Locale = LocaleList.getDefault().get(0) ?: Locale.getDefault()
 
     /**
      * Fix illegal characters in a URL.
@@ -566,5 +551,21 @@ object Utils {
             return false
         }
     }
-}
 
+    /**
+     * Format a timestamp (milliseconds since epoch) into a date string.
+     * Returns empty string for null or non-positive timestamps.
+     * @param ts timestamp in milliseconds or null
+     * @param pattern SimpleDateFormat pattern, default "yyyy-MM-dd HH:mm"
+     */
+    fun formatTimestamp(ts: Long?, pattern: String = "yyyy-MM-dd HH:mm", locale: Locale = Locale.getDefault()): String {
+        if (ts == null || ts <= 0L) return ""
+        return try {
+            val sdf = SimpleDateFormat(pattern, locale)
+            sdf.format(Date(ts))
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to format timestamp", e)
+            ""
+        }
+    }
+}

V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt

@@ -14,6 +14,7 @@ import androidx.lifecycle.viewModelScope
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.dto.GroupMapItem
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.extension.serializable
@@ -30,6 +31,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.Collections
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
@@ -144,7 +146,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun updateCache() {
         serversCache.clear()
         for (guid in serverList) {
-            var profile = MmkvManager.decodeServerConfig(guid) ?: continue
+            val profile = MmkvManager.decodeServerConfig(guid) ?: continue
 //            var profile = MmkvManager.decodeProfileConfig(guid)
 //            if (profile == null) {
 //                val config = MmkvManager.decodeServerConfig(guid) ?: continue
@@ -236,9 +238,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
         val serversCopy = serversCache.toList()
         viewModelScope.launch(Dispatchers.Default) {
-            for (item in serversCopy) {
-                MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid)
+            val guids = ArrayList<String>(serversCopy.map { it.guid })
+            if (guids.isEmpty()) {
+                return@launch
             }
+            MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, guids)
         }
     }
 
@@ -257,8 +261,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         if (subscriptionId != id) {
             subscriptionId = id
             MmkvManager.encodeSettings(AppConfig.CACHE_SUBSCRIPTION_ID, subscriptionId)
-            reloadServerList()
         }
+        reloadServerList()
     }
 
     /**
@@ -266,22 +270,25 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
      * @param context The context.
      * @return A pair of lists containing the subscription IDs and remarks.
      */
-    fun getSubscriptions(context: Context): Pair<MutableList<String>?, MutableList<String>?> {
+    fun getSubscriptions(context: Context): List<GroupMapItem> {
         val subscriptions = MmkvManager.decodeSubscriptions()
         if (subscriptionId.isNotEmpty()
             && !subscriptions.map { it.first }.contains(subscriptionId)
         ) {
             subscriptionIdChanged("")
         }
-        if (subscriptions.isEmpty()) {
-            return null to null
-        }
-        val listId = subscriptions.map { it.first }.toMutableList()
-        listId.add(0, "")
-        val listRemarks = subscriptions.map { it.second.remarks }.toMutableList()
-        listRemarks.add(0, context.getString(R.string.filter_config_all))
 
-        return listId to listRemarks
+        val groups = mutableListOf<GroupMapItem>()
+        groups.add(
+            GroupMapItem(
+                id = "",
+                remarks = context.getString(R.string.filter_config_all)
+            )
+        )
+        subscriptions.forEach { (id, item) ->
+            groups.add(GroupMapItem(id = id, remarks = item.remarks))
+        }
+        return groups
     }
 
     /**
@@ -384,29 +391,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         MmkvManager.encodeServerList(serverList)
     }
 
-    /**
-     * Creates an intelligent selection configuration containing all currently filtered servers.
-     */
-    fun createIntelligentSelectionAll() {
-        viewModelScope.launch(Dispatchers.IO) {
-            val key = AngConfigManager.createIntelligentSelection(
-                getApplication<AngApplication>(),
-                serversCache.map { it.guid }.toList(),
-                subscriptionId
-            )
-
-            launch(Dispatchers.Main) {
-                if (key.isNullOrEmpty()) {
-                    getApplication<AngApplication>().toastError(R.string.toast_failure)
-                } else {
-                    getApplication<AngApplication>().toastSuccess(R.string.toast_success)
-                    MmkvManager.setSelectServer(key)
-                    reloadServerList()
-                }
-            }
-        }
-    }
-
     /**
      * Initializes assets.
      * @param assets The asset manager.
@@ -430,6 +414,22 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         reloadServerList()
     }
 
+    fun onTestsFinished() {
+        viewModelScope.launch(Dispatchers.Default) {
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_AUTO_REMOVE_INVALID_AFTER_TEST)) {
+                removeInvalidServer()
+            }
+
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_AUTO_SORT_AFTER_TEST)) {
+                sortByTestResults()
+            }
+
+            withContext(Dispatchers.Main) {
+                reloadServerList()
+            }
+        }
+    }
+
     private val mMsgReceiver = object : BroadcastReceiver() {
         override fun onReceive(ctx: Context?, intent: Intent?) {
             when (intent?.getIntExtra("key", 0)) {
@@ -464,6 +464,19 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                     MmkvManager.encodeServerTestDelayMillis(resultPair.first, resultPair.second)
                     updateListAction.value = getPosition(resultPair.first)
                 }
+
+                AppConfig.MSG_MEASURE_CONFIG_NOTIFY -> {
+                    val content = intent.getStringExtra("content")
+                    updateTestResultAction.value =
+                        getApplication<AngApplication>().getString(R.string.connection_runing_task_left, content)
+                }
+
+                AppConfig.MSG_MEASURE_CONFIG_FINISH -> {
+                    val content = intent.getStringExtra("content")
+                    if (content == "0") {
+                        onTestsFinished()
+                    }
+                }
             }
         }
     }