up 2.0.17

Bumps [android-actions/setup-android](https://github.com/android-actions/setup-android) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/android-actions/setup-android/releases)
- [Commits](https://github.com/android-actions/setup-android/compare/v3.2.0...v4.0.0)

---
updated-dependencies:
- dependency-name: android-actions/setup-android
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -16,17 +16,17 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         submodules: 'recursive'
         fetch-depth: '0'
 
     - name: Setup Android SDK
-      uses: android-actions/setup-android@v3.2.0
+      uses: android-actions/setup-android@v4.0.0
       with:
         log-accepted-android-sdk-licenses: false
-        cmdline-tools-version: '12266719'
+        cmdline-tools-version: '13114758'
-        packages: 'platforms;android-35 build-tools;35.0.0 platform-tools'
+        packages: 'platforms;android-36.1 build-tools;36.1.0 platform-tools'
 
     - name: Install NDK
       run: |
@@ -38,26 +38,26 @@ jobs:
         \
             ndkVersion = "28.2.13676358"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
 
-    - name: Restore cached libtun2socks
+    - name: Restore cached libhevtun
-      id: cache-libtun2socks-restore
+      id: cache-libhevtun-restore
       uses: actions/cache/restore@v4
       with:
         path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }}
+        key: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }}
 
-    - name: Build libtun2socks
+    - name: Build libhevtun
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true'
       run: |
-        bash compile-tun2socks.sh && bash compile-hevtun.sh
+        bash compile-hevtun.sh
     
-    - name: Save libtun2socks
+    - name: Save libhevtun
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      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/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }}
+        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,38 +77,8 @@ 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
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '21'
@@ -129,21 +99,21 @@ jobs:
         ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}
     
     - name: Upload arm64-v8a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v7
       if: ${{  success() }}
       with:
         name: arm64-v8a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
 
     - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v7
       if: ${{  success() }}
       with:
         name: armeabi-v7a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
 
     - name: Upload x86 APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v7
       if: ${{  success() }}
       with:
         name: x86-apk

.github/workflows/fastlane.yml

@@ -11,6 +11,6 @@ jobs:
   go:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Validate Fastlane Supply Metadata
         uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.1.0

.gitmodules

@@ -1,15 +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,7 +2,7 @@
 
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)
 
-[![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
+[![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)

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
+        minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
-        versionCode = 684
+        versionCode = 717
-        versionName = "1.10.32"
+        versionName = "2.0.17"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
@@ -148,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)
@@ -158,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/xml/shortcuts.xml

@@ -8,6 +8,7 @@
         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"
@@ -22,6 +23,7 @@
         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"

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:theme="@style/AppThemeDayNight.NoActionBar"
-        android:usesCleartextTraffic="true"
+        android:usesCleartextTraffic="true">
-        tools:targetApi="m">
 
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-            android:launchMode="singleTask"
+            android:launchMode="singleTask">
-            android:theme="@style/AppThemeDayNight.NoActionBar">
             <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>
@@ -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"
+            android:process=":RunSoLibV2RayDaemon">
-            tools:targetApi="24">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>

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,116 @@
+{
+  "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
+    },
+    "sniffing": {
+      "enabled": true,
+      "destOverride": [
+        "http",
+        "tls"
+      ]
+    }
+  }
+],
+  "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,14 +34,15 @@ class AngApplication : MultiDexApplication() {
 
         MMKV.initialize(this)
 
-        SettingsManager.setNightMode()
         // Initialize WorkManager with the custom configuration
         WorkManager.initialize(this, workManagerConfiguration)
 
-        SettingsManager.initRoutingRulesets(this)
+        // Ensure critical preference defaults are present in MMKV early
+        SettingsManager.initApp(this)
+        SettingsManager.setNightMode()
 
         es.dmoral.toasty.Toasty.Config.getInstance()
-            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
+            .setGravity(android.view.Gravity.BOTTOM, 0, 300)
             .apply()
     }
 }

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

@@ -9,11 +9,16 @@ 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"
 
+    // Default subscription ID for ungrouped servers
+    const val DEFAULT_SUBSCRIPTION_ID = "__default_subscription__"
+
     /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
     const val PREF_ROUTE_ONLY_ENABLED = "pref_route_only_enabled"
@@ -46,6 +51,7 @@ object AppConfig {
     const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
     const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"
     const val PREF_DOUBLE_COLUMN_DISPLAY = "pref_double_column_display"
+    const val PREF_GROUP_ALL_DISPLAY = "pref_group_all_display"
     const val PREF_LANGUAGE = "pref_language"
     const val PREF_UI_MODE_NIGHT = "pref_ui_mode_night"
     const val PREF_PREFER_IPV6 = "pref_prefer_ipv6"
@@ -56,20 +62,21 @@ 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"
+    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"
-    const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"
 
     /** Protocol identifiers. */
     const val PROTOCOL_FREEDOM = "freedom"
@@ -93,6 +100,7 @@ object AppConfig {
     const val TAG_FRAGMENT = "fragment"
     const val TAG_DNS = "dns-module"
     const val TAG_DOMESTIC_DNS = "domestic-dns"
+    const val TAG_BALANCER = "proxy-round"
 
     /** Network-related constants. */
     const val UPLINK = "uplink"
@@ -124,6 +132,12 @@ object AppConfig {
     const val GEOIP_PRIVATE = "geoip:private"
     const val GEOIP_CN = "geoip:cn"
 
+    /** Geo data file names. */
+    const val GEOSITE_DAT = "geosite.dat"
+    const val GEOIP_DAT = "geoip.dat"
+    const val GEOIP_ONLY_CN_PRIVATE_DAT = "geoip-only-cn-private.dat"
+    const val GEOIP_ONLY_CN_PRIVATE_URL = "$GITHUB_RAW_URL/Loyalsoldier/geoip/release/$GEOIP_ONLY_CN_PRIVATE_DAT"
+
     /** Ports and addresses for various services. */
     const val PORT_LOCAL_DNS = "10853"
     const val PORT_SOCKS = "10808"
@@ -148,6 +162,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"
@@ -165,6 +181,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://"
 

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/BaseAdapterListener.kt

@@ -0,0 +1,32 @@
+package com.v2ray.ang.contracts
+
+/**
+ * A common Adapter -> host callback interface that includes common actions: edit, remove and refresh.
+ * Extend this interface or define more specific interfaces for different adapters as needed.
+ */
+interface BaseAdapterListener {
+    /**
+     * Request the host to edit the specified item.
+     * @param guid Unique identifier (GUID) of the item
+     * @param position Current position in the adapter (optional; host should validate it)
+     */
+    fun onEdit(guid: String, position: Int)
+
+    /**
+     * Request the host to remove the specified item. Position is provided for optional animation or validation.
+     * @param guid Unique identifier (GUID) of the item
+     * @param position Current position in the adapter (optional; host should validate it)
+     */
+    fun onRemove(guid: String, position: Int)
+
+    /**
+     * Request the host to share the specified URL.
+     * @param url The URL to be shared
+     */
+    fun onShare(url: String)
+
+    /**
+     * Request the host to refresh data (for example, reload from the ViewModel or call notifyDataSetChanged).
+     */
+    fun onRefreshData()
+}

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/MainAdapterListener.kt

@@ -0,0 +1,13 @@
+package com.v2ray.ang.contracts
+
+import com.v2ray.ang.dto.ProfileItem
+
+interface MainAdapterListener :BaseAdapterListener {
+
+    fun onEdit(guid: String, position: Int, profile: ProfileItem)
+
+    fun onSelectServer(guid: String)
+
+    fun onShare(guid: String, profile: ProfileItem, position: Int, more: Boolean)
+
+}

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/ServiceControl.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.contracts
 
 import android.app.Service
 

V2rayNG/app/src/main/java/com/v2ray/ang/contracts/Tun2SocksControl.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.contracts
 
 /**
  * Interface that defines the control operations for tun2socks implementations.

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

@@ -0,0 +1,6 @@
+package com.v2ray.ang.dto
+
+data class AssetUrlCache(
+    val guid: String,
+    val assetUrl: AssetUrlItem
+)

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/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/ProfileItem.kt

@@ -5,6 +5,7 @@ import com.v2ray.ang.AppConfig.PORT_SOCKS
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.TAG_PROXY
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.util.Utils
 
 data class ProfileItem(
@@ -14,6 +15,7 @@ data class ProfileItem(
     var addedTime: Long = System.currentTimeMillis(),
 
     var remarks: String = "",
+    var description: String? = null,
     var server: String? = null,
     var serverPort: String? = null,
 
@@ -40,6 +42,9 @@ data class ProfileItem(
     var alpn: String? = null,
     var fingerPrint: String? = null,
     var insecure: Boolean? = null,
+    var echConfigList: String? = null,
+    var echForceQuery: String? = null,
+    var pinnedCA256: String? = null,
 
     var publicKey: String? = null,
     var shortId: String? = null,
@@ -59,6 +64,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 {
@@ -115,7 +124,7 @@ data class ProfileItem(
                 && this.obfsPassword == obj.obfsPassword
                 && this.portHopping == obj.portHopping
                 && this.portHoppingInterval == obj.portHoppingInterval
-                && this.pinSHA256 == obj.pinSHA256
+                && this.pinnedCA256 == obj.pinnedCA256
                 )
     }
 }

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/SubscriptionCache.kt

@@ -0,0 +1,6 @@
+package com.v2ray.ang.dto
+
+data class SubscriptionCache(
+    val guid: String,
+    val subscription: SubscriptionItem
+)

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

@@ -11,7 +11,6 @@ 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/SubscriptionUpdateResult.kt

@@ -0,0 +1,24 @@
+package com.v2ray.ang.dto
+
+/**
+ * Result of subscription update operation
+ */
+data class SubscriptionUpdateResult(
+    val configCount: Int = 0,      // Total configs updated
+    val successCount: Int = 0,     // Subscriptions updated successfully
+    val failureCount: Int = 0,     // Subscriptions failed to update
+    val skipCount: Int = 0         // Subscriptions skipped (disabled)
+) {
+    /**
+     * Combine two results by adding their counts
+     */
+    operator fun plus(other: SubscriptionUpdateResult): SubscriptionUpdateResult {
+        return SubscriptionUpdateResult(
+            configCount = this.configCount + other.configCount,
+            successCount = this.successCount + other.successCount,
+            failureCount = this.failureCount + other.failureCount,
+            skipCount = this.skipCount + other.skipCount
+        )
+    }
+}
+

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

@@ -0,0 +1,10 @@
+package com.v2ray.ang.dto
+
+import java.io.Serializable
+
+data class TestServiceMessage(
+    val key: Int,
+    val subscriptionId: String = "",
+    val serverGuids: List<String> = emptyList()
+) : Serializable
+

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

@@ -2,7 +2,7 @@ package com.v2ray.ang.dto
 
 import com.google.gson.annotations.SerializedName
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.util.Utils
+import com.v2ray.ang.enums.EConfigType
 
 data class V2rayConfig(
     var remarks: String? = null,
@@ -34,19 +34,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,
+        var sniffing: SniffingBean? = null,
         val streamSettings: Any? = null,
         val allocate: Any? = null
     ) {
 
         data class InSettingsBean(
-            val auth: String? = null,
+            var auth: String? = null,
-            val udp: Boolean? = null,
+            var udp: Boolean? = null,
-            val userLevel: Int? = null,
+            var userLevel: Int? = null,
-            val address: String? = null,
+            var name: String? = null,
-            val port: Int? = null,
+            @SerializedName("MTU")
-            val network: String? = null
+            var mtu: Int? = null
         )
 
         data class SniffingBean(
@@ -76,7 +76,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,
@@ -89,6 +89,7 @@ data class V2rayConfig(
             var reserved: List<Int>? = null,
             var mtu: Int? = null,
             var obfsPassword: String? = null,
+            var version: Int? = null,
         ) {
 
             data class VnextBean(
@@ -160,7 +161,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 finalmask: FinalMaskBean? = null,
             val dsSettings: Any? = null,
             var sockopt: SockoptBean? = null
         ) {
@@ -200,15 +202,8 @@ data class V2rayConfig(
                 var downlinkCapacity: Int = 100,
                 var congestion: Boolean = false,
                 var readBufferSize: Int = 1,
-                var writeBufferSize: Int = 1,
+                var writeBufferSize: Int = 1
-                var header: HeaderBean = HeaderBean(),
+            )
-                var seed: String? = null
-            ) {
-                data class HeaderBean(
-                    var type: String = "none",
-                    var domain: String? = null
-                )
-            }
 
             data class WsSettingsBean(
                 var path: String? = null,
@@ -246,9 +241,10 @@ data class V2rayConfig(
                 var mark: Int? = null,
                 var dialerProxy: String? = null,
                 var domainStrategy: String? = null,
-                var happyEyeballs: happyEyeballsBean? = null,
+                var happyEyeballs: HappyEyeballsBean? = null,
-                )
+            )
-            data class happyEyeballsBean(
+
+            data class HappyEyeballsBean(
                 var prioritizeIPv6: Boolean? = null,
                 var maxConcurrentTry: Int? = 4,
                 var tryDelayMs: Int? = 250, // ms
@@ -267,6 +263,9 @@ data class V2rayConfig(
                 val certificates: List<Any>? = null,
                 val disableSystemRoot: Boolean? = null,
                 val enableSessionResumption: Boolean? = null,
+                var echConfigList: String? = null,
+                var echForceQuery: String? = null,
+                var pinnedPeerCertSha256: String? = null,
                 // REALITY settings
                 val show: Boolean = false,
                 var publicKey: String? = null,
@@ -291,18 +290,33 @@ data class V2rayConfig(
                 var health_check_timeout: Int? = null
             )
 
-            data class Hy2steriaSettingsBean(
+            data class HysteriaSettingsBean(
-                var password: String? = null,
+                var version: Int,
-                var use_udp_extension: Boolean? = true,
+                var auth: String? = null,
-                var congestion: Hy2CongestionBean? = null
+                var up: String? = null,
+                var down: String? = null,
+                var udphop: HysteriaUdpHopBean? = null
             ) {
-                data class Hy2CongestionBean(
+                data class HysteriaUdpHopBean(
-                    var type: String? = "bbr",
+                    var port: String? = null,
-                    var up_mbps: Int? = null,
+                    var interval: Int? = null
-                    var down_mbps: Int? = null,
                 )
             }
 
+            data class FinalMaskBean(
+                var tcp: List<MaskBean>? = null,
+                var udp: List<MaskBean>? = null
+            ) {
+                data class MaskBean(
+                    var type: String,
+                    var settings: MaskSettingsBean? = null
+                ) {
+                    data class MaskSettingsBean(
+                        var password: String? = null,
+                        var domain: String? = null
+                    )
+                }
+            }
         }
 
         data class MuxBean(
@@ -321,11 +335,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
         }
@@ -339,142 +356,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 {
+        fun ensureSockopt(): StreamSettingsBean.SockoptBean {
-            val address = getServerAddress().orEmpty()
+            val stream = streamSettings ?: StreamSettingsBean().also {
-            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 {
                 streamSettings = it
             }
 
-            val sockopt = stream.sockopt ?: V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean().also {
+            val sockopt = stream.sockopt ?: StreamSettingsBean.SockoptBean().also {
                 stream.sockopt = it
             }
 

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/enums/EConfigType.kt

@@ -1,8 +1,7 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 import com.v2ray.ang.AppConfig
 
-
 enum class EConfigType(val value: Int, val protocolScheme: String) {
     VMESS(1, AppConfig.VMESS),
     CUSTOM(2, AppConfig.CUSTOM),
@@ -14,9 +13,11 @@ 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/enums/Language.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class Language(val code: String) {
     AUTO("auto"),

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

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 enum class NetworkType(val type: String) {
     TCP("tcp"),
@@ -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/enums/PermissionType.kt

@@ -0,0 +1,44 @@
+package com.v2ray.ang.enums
+
+import android.Manifest
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+/**
+ * Permission types used in the app, handling API level differences.
+ */
+enum class PermissionType {
+    /** Camera permission (used for scanning QR codes) */
+    CAMERA {
+        override fun getPermission(): String = Manifest.permission.CAMERA
+    },
+
+    /** Read storage / media permission (adapts to Android version) */
+    READ_STORAGE {
+        override fun getPermission(): String {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Manifest.permission.READ_MEDIA_IMAGES
+            } else {
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            }
+        }
+    },
+
+    /** Notification permission (Android 13+) */
+    POST_NOTIFICATIONS {
+        @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+        override fun getPermission(): String = Manifest.permission.POST_NOTIFICATIONS
+    };
+
+    /** Return the actual Android permission string */
+    abstract fun getPermission(): String
+
+    /** Return a human-readable label for the permission */
+    fun getLabel(): String {
+        return when (this) {
+            CAMERA -> "Camera"
+            READ_STORAGE -> "Storage"
+            POST_NOTIFICATIONS -> "Notification"
+        }
+    }
+}

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

@@ -1,10 +1,11 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 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/enums/VpnInterfaceAddressConfig.kt

@@ -1,4 +1,4 @@
-package com.v2ray.ang.dto
+package com.v2ray.ang.enums
 
 /**
  * VPN interface address configuration enum class
@@ -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) {
+            return if (index in entries.toTypedArray().indices) {
-                values()[index]
+                entries[index]
             } else {
                 OPTION_1 // Default to the first configuration
             }

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

@@ -9,10 +9,9 @@ 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
+import java.util.Locale
 
 val Context.v2RayApplication: AngApplication?
     get() = applicationContext as? AngApplication
@@ -71,25 +70,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
 
@@ -113,16 +93,9 @@ fun Long.toTrafficString(): String {
         size /= DIVISOR
         unitIndex++
     }
-    return String.format("%.1f %s", size, units[unitIndex])
+    return String.format(Locale.getDefault(), "%.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()
 
@@ -133,6 +106,13 @@ val URI.idnHost: String
  */
 fun String?.removeWhiteSpace(): String? = this?.replace(" ", "")
 
+/**
+ * Returns null if the string is null or blank, otherwise returns the string itself.
+ *
+ * @return The string or null.
+ */
+fun String?.nullIfBlank(): String? = this?.takeIf { it.isNotBlank() }
+
 /**
  * Converts the string to a Long value, or returns 0 if the conversion fails.
  *
@@ -196,7 +176,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('/'))
@@ -209,4 +189,15 @@ fun String.concatUrl(vararg paths: String): String {
     }
 
     return builder.toString()
+}
+
+/**
+ * Helper function to match text either by Regex or literal string.
+ */
+fun String.matchesPattern(regex: Regex?, keyword: String?, ignoreCase: Boolean = true): Boolean {
+    if (keyword.isNullOrEmpty()) {
+        return true
+    }
+    return regex?.containsMatchIn(this)
+        ?: this.contains(keyword, ignoreCase = ignoreCase)
 }

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

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.util.JsonUtil
 
 object CustomFmt : FmtBase() {
@@ -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

@@ -1,9 +1,9 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.enums.NetworkType
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
@@ -22,17 +22,17 @@ open class FmtBase {
         val query = if (dicQuery != null)
             "?" + dicQuery.toList().joinToString(
                 separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) })
+                transform = { it.first + "=" + Utils.encodeURIComponent(it.second) })
         else ""
 
         val url = String.format(
             "%s@%s:%s",
-            Utils.urlEncode(userInfo ?: ""),
+            Utils.encodeURIComponent(userInfo ?: ""),
             Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
             config.serverPort
         )
 
-        return "${url}${query}#${Utils.urlEncode(config.remarks)}"
+        return "${url}${query}#${Utils.encodeURIComponent(config.remarks)}"
     }
 
     /**
@@ -43,7 +43,7 @@ open class FmtBase {
      */
     fun getQueryParam(uri: URI): Map<String, String> {
         return uri.rawQuery.split("&")
-            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
+            .associate { it.split("=").let { (k, v) -> k to Utils.decodeURIComponent(v) } }
     }
 
     /**
@@ -82,6 +82,8 @@ open class FmtBase {
         config.sni = queryParam["sni"]
         config.fingerPrint = queryParam["fp"]
         config.alpn = queryParam["alpn"]
+        config.echConfigList = queryParam["ech"]
+        config.pinnedCA256 = queryParam["pcs"]
         config.publicKey = queryParam["pbk"]
         config.shortId = queryParam["sid"]
         config.spiderX = queryParam["spx"]
@@ -98,14 +100,16 @@ open class FmtBase {
     fun getQueryDic(config: ProfileItem): HashMap<String, String> {
         val dicQuery = HashMap<String, String>()
         dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.sni?.nullIfBlank()?.let { dicQuery["sni"] = it }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.alpn?.nullIfBlank()?.let { dicQuery["alpn"] = it }
-        config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
+        config.echConfigList?.nullIfBlank()?.let { dicQuery["ech"] = it }
-        config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
+        config.pinnedCA256?.nullIfBlank()?.let { dicQuery["pcs"] = it }
-        config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
+        config.fingerPrint?.nullIfBlank()?.let { dicQuery["fp"] = it }
-        config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
+        config.publicKey?.nullIfBlank()?.let { dicQuery["pbk"] = it }
-        config.mldsa65Verify.let { if (it.isNotNullEmpty()) dicQuery["pqv"] = it.orEmpty() }
+        config.shortId?.nullIfBlank()?.let { dicQuery["sid"] = it }
-        config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }
+        config.spiderX?.nullIfBlank()?.let { dicQuery["spx"] = it }
+        config.mldsa65Verify?.nullIfBlank()?.let { dicQuery["pqv"] = it }
+        config.flow?.nullIfBlank()?.let { dicQuery["flow"] = it }
         // Add two keys for compatibility: "insecure" and "allowInsecure"
         if (config.security == AppConfig.TLS) {
             val insecureFlag = if (config.insecure == true) "1" else "0"
@@ -119,43 +123,45 @@ open class FmtBase {
         when (networkType) {
             NetworkType.TCP -> {
                 dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
             }
 
             NetworkType.KCP -> {
                 dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-                config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
+                config.seed?.nullIfBlank()?.let { dicQuery["seed"] = it }
             }
 
             NetworkType.WS, NetworkType.HTTP_UPGRADE -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
             }
 
             NetworkType.XHTTP -> {
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
-                config.xhttpMode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
+                config.xhttpMode?.nullIfBlank()?.let { dicQuery["mode"] = it }
-                config.xhttpExtra.let { if (it.isNotNullEmpty()) dicQuery["extra"] = it.orEmpty() }
+                config.xhttpExtra?.nullIfBlank()?.let { dicQuery["extra"] = it }
             }
 
             NetworkType.HTTP, NetworkType.H2 -> {
                 dicQuery["type"] = "http"
-                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.host?.nullIfBlank()?.let { dicQuery["host"] = it }
-                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+                config.path?.nullIfBlank()?.let { dicQuery["path"] = it }
             }
 
 //            NetworkType.QUIC -> {
 //                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
-//                config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
+//                config.quicSecurity?.nullIfBlank()?.let { dicQuery["quicSecurity"] = it }
-//                config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
+//                config.quicKey?.nullIfBlank()?.let { dicQuery["key"] = it }
 //            }
 
             NetworkType.GRPC -> {
-                config.mode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
+                config.mode?.nullIfBlank()?.let { dicQuery["mode"] = it }
-                config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
+                config.authority?.nullIfBlank()?.let { dicQuery["authority"] = it }
-                config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
+                config.serviceName?.nullIfBlank()?.let { dicQuery["serviceName"] = it }
             }
+
+            else -> {}
         }
 
         return dicQuery

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

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.V2rayConfigManager
 

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

@@ -1,13 +1,14 @@
 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.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.FinalMaskBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
@@ -25,11 +26,12 @@ object Hysteria2Fmt : FmtBase() {
         val config = ProfileItem.create(EConfigType.HYSTERIA2)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         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)
@@ -42,7 +44,7 @@ object Hysteria2Fmt : FmtBase() {
             if (config.portHopping.isNotNullEmpty()) {
                 config.portHoppingInterval = queryParam["mportHopInt"]
             }
-            config.pinSHA256 = queryParam["pinSHA256"]
+            config.pinnedCA256 = queryParam["pinSHA256"]
 
         }
 
@@ -59,8 +61,8 @@ object Hysteria2Fmt : FmtBase() {
         val dicQuery = HashMap<String, String>()
 
         config.security.let { if (it != null) dicQuery["security"] = it }
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.sni?.nullIfBlank()?.let { dicQuery["sni"] = it }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.alpn?.nullIfBlank()?.let { dicQuery["alpn"] = it }
         config.insecure.let { dicQuery["insecure"] = if (it == true) "1" else "0" }
 
         if (config.obfsPassword.isNotNullEmpty()) {
@@ -73,71 +75,13 @@ object Hysteria2Fmt : FmtBase() {
         if (config.portHoppingInterval.isNotNullEmpty()) {
             dicQuery["mportHopInt"] = config.portHoppingInterval.orEmpty()
         }
-        if (config.pinSHA256.isNotNullEmpty()) {
+        if (config.pinnedCA256.isNotNullEmpty()) {
-            dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
+            dicQuery["pinSHA256"] = config.pinnedCA256.orEmpty()
         }
 
         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,36 @@ 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()
+            server.version = 2
+        }
+
+        val sni = outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }
+
+        outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }
+
+        if (profileItem.obfsPassword.isNotNullEmpty()) {
+            outboundBean.streamSettings?.finalmask = FinalMaskBean(
+                udp = listOf(
+                    FinalMaskBean.MaskBean(
+                        type = "salamander",
+                        settings = FinalMaskBean.MaskBean.MaskSettingsBean(
+                            password = profileItem.obfsPassword
+                        )
+                    )
+                )
+            )
+        }
         return outboundBean
     }
 }

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

@@ -2,10 +2,10 @@ package com.v2ray.ang.fmt
 
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
@@ -36,7 +36,7 @@ object ShadowsocksFmt : FmtBase() {
         if (uri.port <= 0) return null
         if (uri.userInfo.isNullOrEmpty()) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
@@ -83,7 +83,7 @@ object ShadowsocksFmt : FmtBase() {
         if (indexSplit > 0) {
             try {
                 config.remarks =
-                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
+                    Utils.decodeURIComponent(result.substring(indexSplit + 1, result.length))
             } catch (e: Exception) {
                 Log.e(AppConfig.TAG, "Failed to decode remarks in SS legacy URL", e)
             }

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

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.V2rayConfigManager
@@ -23,7 +23,7 @@ object SocksFmt : FmtBase() {
         if (uri.idnHost.isEmpty()) return null
         if (uri.port <= 0) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 

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

@@ -1,10 +1,10 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
@@ -23,7 +23,7 @@ object TrojanFmt : FmtBase() {
         val config = ProfileItem.create(EConfigType.TROJAN)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

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

@@ -1,9 +1,9 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
@@ -26,7 +26,7 @@ object VlessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

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

@@ -3,13 +3,13 @@ package com.v2ray.ang.fmt
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.VmessQRCode
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.JsonUtil
@@ -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
@@ -78,7 +82,7 @@ object VmessFmt : FmtBase() {
             else -> {}
         }
 
-        config.security = vmessQRCode.tls     
+        config.security = vmessQRCode.tls
         config.sni = vmessQRCode.sni
         config.fingerPrint = vmessQRCode.fp
         config.alpn = vmessQRCode.alpn
@@ -128,8 +132,8 @@ object VmessFmt : FmtBase() {
             else -> {}
         }
 
-        config.host.let { if (it.isNotNullEmpty()) vmessQRCode.host = it.orEmpty() }
+        config.host?.nullIfBlank()?.let { vmessQRCode.host = it }
-        config.path.let { if (it.isNotNullEmpty()) vmessQRCode.path = it.orEmpty() }
+        config.path?.nullIfBlank()?.let { vmessQRCode.path = it }
 
         vmessQRCode.tls = config.security.orEmpty()
         vmessQRCode.sni = config.sni.orEmpty()
@@ -159,7 +163,7 @@ object VmessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo

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

@@ -2,10 +2,11 @@ package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
@@ -25,14 +26,14 @@ object WireguardFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.decodeURIComponent(uri.fragment.orEmpty()).let { it.ifEmpty { "none" } }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
         config.secretKey = uri.userInfo.orEmpty()
         config.localAddress = queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.publicKey = queryParam["publickey"].orEmpty()
-        config.preSharedKey = queryParam["presharedkey"]?.takeIf { it.isNotEmpty() }
+        config.preSharedKey = queryParam["presharedkey"]?.nullIfBlank()
         config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
         config.reserved = queryParam["reserved"] ?: "0,0,0"
 
@@ -84,7 +85,7 @@ object WireguardFmt : FmtBase() {
         config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
         config.publicKey = peerParams["publickey"].orEmpty()
-        config.preSharedKey = peerParams["presharedkey"]?.takeIf { it.isNotEmpty() }
+        config.preSharedKey = peerParams["presharedkey"]?.nullIfBlank()
         val endpoint = peerParams["endpoint"].orEmpty()
         val endpointParts = endpoint.split(":", limit = 2)
         if (endpointParts.size == 2) {
@@ -113,7 +114,7 @@ object WireguardFmt : FmtBase() {
             wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
             wireguard.peers?.firstOrNull()?.let { peer ->
                 peer.publicKey = profileItem.publicKey.orEmpty()
-                peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
+                peer.preSharedKey = profileItem.preSharedKey?.nullIfBlank()
                 peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
             }
             wireguard.mtu = profileItem.mtu

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

@@ -7,9 +7,12 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.SubscriptionUpdateResult
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -110,13 +113,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 +144,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)
@@ -223,41 +221,137 @@ object AngConfigManager {
             if (servers == null) {
                 return 0
             }
-            val removedSelectedServer =
+            //  Find the currently selected server that matches the subscription ID
-                if (!TextUtils.isEmpty(subid) && !append) {
+            val removedSelected = if (subid.isNotBlank() && !append) {
-                    MmkvManager.decodeServerConfig(
+                MmkvManager.getSelectServer()
-                        MmkvManager.getSelectServer().orEmpty()
+                    .takeIf { it?.isNotBlank() == true }
-                    )?.let {
+                    ?.let { MmkvManager.decodeServerConfig(it) }
-                        if (it.subscriptionId == subid) {
+                    ?.takeIf { it.subscriptionId == subid }
-                            return@let it
+            } else {
-                        }
+                null
-                        return@let null
-                    }
-                } else {
-                    null
-                }
-            if (!append) {
-                MmkvManager.removeServerViaSubid(subid)
             }
 
             val subItem = MmkvManager.decodeSubscription(subid)
-            var count = 0
+
+            // Parse all configs first (no I/O during parsing)
+            val configs = mutableListOf<ProfileItem>()
             servers.lines()
                 .distinct()
                 .reversed()
                 .forEach {
-                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
+                    val config = parseConfig(it, subid, subItem)
-                    if (resId == 0) {
+                    if (config != null) {
-                        count++
+                        configs.add(config)
                     }
                 }
-            return count
+
+            // Batch save all parsed configs (only one serverList read/write)
+            if (configs.isNotEmpty()) {
+                if (!append) {
+                    MmkvManager.removeServerViaSubid(subid)
+                }
+                val keyToProfile = batchSaveConfigs(configs, subid)
+                val matchKey = findMatchedProfileKey(keyToProfile, removedSelected)
+                matchKey?.let { MmkvManager.setSelectServer(it) }
+            }
+
+            return configs.size
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to parse batch config", e)
         }
         return 0
     }
 
+    /**
+     * Batch save configurations to reduce serverList read/write operations.
+     * Reads serverList once, saves all configs, then writes serverList once.
+     *
+     * @param configs The list of ProfileItem to save.
+     * @param subid The subscription ID.
+     * @return Map of generated keys to their corresponding ProfileItem.
+     */
+    private fun batchSaveConfigs(configs: List<ProfileItem>, subid: String): Map<String, ProfileItem> {
+        val keyToProfile = mutableMapOf<String, ProfileItem>()
+
+        // Read serverList once
+        val serverList = MmkvManager.decodeServerList(subid)
+        var needSetSelected = MmkvManager.getSelectServer().isNullOrBlank()
+
+        configs.forEach { config ->
+            val key = Utils.getUuid()
+            // Save profile directly without updating serverList
+            MmkvManager.encodeProfileDirect(key, JsonUtil.toJson(config))
+
+            if (!serverList.contains(key)) {
+                serverList.add(0, key)
+                if (needSetSelected) {
+                    MmkvManager.setSelectServer(key)
+                    needSetSelected = false
+                }
+            }
+            keyToProfile[key] = config
+        }
+
+        // Write serverList once
+        MmkvManager.encodeServerList(serverList, subid)
+        return keyToProfile
+    }
+
+    /**
+     * Finds a matched profile key from the given key-profile map using multi-level matching.
+     * Matching priority (from highest to lowest):
+     * 1. Exact match: server + port + password
+     * 2. Match by remarks (exact match)
+     * 3. Match by server + port
+     * 4. Match by server only
+     *
+     * @param keyToProfile Map of server keys to their ProfileItem
+     * @param target Target profile to match
+     * @return Matched key or null
+     */
+    private fun findMatchedProfileKey(keyToProfile: Map<String, ProfileItem>, target: ProfileItem?): String? {
+        if (keyToProfile.isEmpty() || target == null) return null
+
+        // Level 1: Match by remarks
+        if (target.remarks.isNotBlank()) {
+            keyToProfile.entries.firstOrNull { (_, saved) ->
+                isSameText(saved.remarks, target.remarks)
+            }?.key?.let { return it }
+        }
+
+        // Level 2: Exact match (server + port + password)
+        keyToProfile.entries.firstOrNull { (_, saved) ->
+            isSameText(saved.server, target.server) &&
+                    isSameText(saved.serverPort, target.serverPort) &&
+                    isSameText(saved.password, target.password)
+        }?.key?.let { return it }
+
+        // Level 3: Match by server + port
+        keyToProfile.entries.firstOrNull { (_, saved) ->
+            isSameText(saved.server, target.server) &&
+                    isSameText(saved.serverPort, target.serverPort)
+        }?.key?.let { return it }
+
+        // Level 4: Match by server only
+        keyToProfile.entries.firstOrNull { (_, saved) ->
+            isSameText(saved.server, target.server)
+        }?.key?.let { return it }
+
+        return null
+    }
+
+    /**
+     * Case-insensitive trimmed string comparison.
+     *
+     * @param left First string
+     * @param right Second string
+     * @return True if both are non-empty and equal (case-insensitive, trimmed)
+     */
+    private fun isSameText(left: String?, right: String?): Boolean {
+        if (left.isNullOrBlank() || right.isNullOrBlank()) return false
+        return left.trim().equals(right.trim(), ignoreCase = true)
+    }
+
     /**
      * Parses a custom configuration server.
      *
@@ -275,13 +369,14 @@ 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
                     for (srv in serverList.reversed()) {
                         val config = CustomFmt.parse(JsonUtil.toJson(srv)) ?: continue
                         config.subscriptionId = subid
+                        config.description = generateDescription(config)
                         val key = MmkvManager.encodeServerConfig("", config)
                         MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv) ?: "")
                         count += 1
@@ -296,6 +391,7 @@ object AngConfigManager {
                 // For compatibility
                 val config = CustomFmt.parse(server) ?: return 0
                 config.subscriptionId = subid
+                config.description = generateDescription(config)
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -306,6 +402,7 @@ object AngConfigManager {
         } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
             try {
                 val config = WireguardFmt.parseWireguardConfFile(server) ?: return R.string.toast_incorrect_protocol
+                config.description = generateDescription(config)
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -320,22 +417,21 @@ object AngConfigManager {
 
     /**
      * Parses the configuration from a QR code or string.
+     * Only parses and returns ProfileItem, does not save.
      *
      * @param str The configuration string.
      * @param subid The subscription ID.
      * @param subItem The subscription item.
-     * @param removedSelectedServer The removed selected server.
+     * @return The parsed ProfileItem or null if parsing fails or filtered out.
-     * @return The result code.
      */
     private fun parseConfig(
         str: String?,
         subid: String,
-        subItem: SubscriptionItem?,
+        subItem: SubscriptionItem?
-        removedSelectedServer: ProfileItem?
+    ): ProfileItem? {
-    ): Int {
         try {
             if (str == null || TextUtils.isEmpty(str)) {
-                return R.string.toast_none_data
+                return null
             }
 
             val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) {
@@ -357,75 +453,75 @@ object AngConfigManager {
             }
 
             if (config == null) {
-                return R.string.toast_incorrect_protocol
+                return null
             }
-            //filter
+
-            if (subItem?.filter != null && subItem.filter?.isNotEmpty() == true && config.remarks.isNotEmpty()) {
+            // Apply filter
-                val matched = Regex(pattern = subItem.filter ?: "")
+            if (subItem?.filter.isNotNullEmpty() && config.remarks.isNotNullEmpty()) {
+                val matched = Regex(pattern = subItem?.filter.orEmpty())
                     .containsMatchIn(input = config.remarks)
-                if (!matched) return -1
+                if (!matched) return null
             }
 
             config.subscriptionId = subid
-            val guid = MmkvManager.encodeServerConfig("", config)
+            config.description = generateDescription(config)
-            if (removedSelectedServer != null &&
+
-                config.server == removedSelectedServer.server && config.serverPort == removedSelectedServer.serverPort
+            return config
-            ) {
-                MmkvManager.setSelectServer(guid)
-            }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to parse config", e)
-            return -1
+            return null
         }
-        return 0
     }
 
     /**
      * Updates the configuration via all subscriptions.
      *
-     * @return The number of configurations updated.
+     * @return Detailed result of the subscription update operation.
      */
-    fun updateConfigViaSubAll(): Int {
+    fun updateConfigViaSubAll(): SubscriptionUpdateResult {
-        var count = 0
+        return try {
-        try {
+            val subscriptions = MmkvManager.decodeSubscriptions()
-            MmkvManager.decodeSubscriptions().forEach {
+            subscriptions.fold(SubscriptionUpdateResult()) { acc, subscription ->
-                count += updateConfigViaSub(it)
+                acc + updateConfigViaSub(subscription)
             }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to update config via all subscriptions", e)
-            return 0
+            SubscriptionUpdateResult()
         }
-        return count
     }
 
     /**
      * Updates the configuration via a subscription.
      *
      * @param it The subscription item.
-     * @return The number of configurations updated.
+     * @return Subscription update result.
      */
-    fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
+    fun updateConfigViaSub(it: SubscriptionCache): SubscriptionUpdateResult {
         try {
-            if (TextUtils.isEmpty(it.first)
+            // Check if disabled
-                || TextUtils.isEmpty(it.second.remarks)
+            if (!it.subscription.enabled) {
-                || TextUtils.isEmpty(it.second.url)
+                return SubscriptionUpdateResult(skipCount = 1)
+            }
+
+            // Validate subscription info
+            if (TextUtils.isEmpty(it.guid)
+                || TextUtils.isEmpty(it.subscription.remarks)
+                || TextUtils.isEmpty(it.subscription.url)
             ) {
-                return 0
+                return SubscriptionUpdateResult(skipCount = 1)
             }
-            if (!it.second.enabled) {
+
-                return 0
+            val url = HttpUtil.toIdnUrl(it.subscription.url)
-            }
-            val url = HttpUtil.toIdnUrl(it.second.url)
             if (!Utils.isValidUrl(url)) {
-                return 0
+                return SubscriptionUpdateResult(failureCount = 1)
             }
-            if (!it.second.allowInsecureUrl) {
+            if (!it.subscription.allowInsecureUrl) {
                 if (!Utils.isValidSubUrl(url)) {
-                    return 0
+                    return SubscriptionUpdateResult(failureCount = 1)
                 }
             }
             Log.i(AppConfig.TAG, url)
-            val userAgent = it.second.userAgent
+            val userAgent = it.subscription.userAgent
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
@@ -443,12 +539,25 @@ object AngConfigManager {
                 }
             }
             if (configText.isEmpty()) {
-                return 0
+                return SubscriptionUpdateResult(failureCount = 1)
+            }
+
+            val count = parseConfigViaSub(configText, it.guid, false)
+            if (count > 0) {
+                it.subscription.lastUpdated = System.currentTimeMillis()
+                MmkvManager.encodeSubscription(it.guid, it.subscription)
+                Log.i(AppConfig.TAG, "Subscription updated: ${it.subscription.remarks}, $count configs")
+                return SubscriptionUpdateResult(
+                    configCount = count,
+                    successCount = 1
+                )
+            } else {
+                // Got response but no valid configs parsed
+                return SubscriptionUpdateResult(failureCount = 1)
             }
-            return parseConfigViaSub(configText, it.first, false)
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to update config via subscription", e)
-            return 0
+            return SubscriptionUpdateResult(failureCount = 1)
         }
     }
 
@@ -480,7 +589,7 @@ object AngConfigManager {
     private fun importUrlAsSubscription(url: String): Int {
         val subscriptions = MmkvManager.decodeSubscriptions()
         subscriptions.forEach {
-            if (it.second.url == url) {
+            if (it.subscription.url == url) {
                 return 0
             }
         }
@@ -492,30 +601,24 @@ object AngConfigManager {
         return 1
     }
 
-    /**
+    /** Generates a description for the profile.
-     * Creates an intelligent selection configuration based on multiple server configurations.
      *
-     * @param context The application context used for configuration generation.
+     * @param profile The profile item.
-     * @param guidList The list of server GUIDs to be included in the intelligent selection.
+     * @return The generated description.
-     *                 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(
+    fun generateDescription(profile: ProfileItem): String {
-        context: Context,
+        // Hide xxx:xxx:***/xxx.xxx.xxx.***
-        guidList: List<String>,
+        val server = profile.server
-        subid: String
+        val port = profile.serverPort
-    ): String? {
+        if (server.isNullOrBlank() && port.isNullOrBlank()) return ""
-        if (guidList.isEmpty()) {
+
-            return null
+        val addrPart = server?.let {
-        }
+            if (it.contains(":"))
-        val result = V2rayConfigManager.genV2rayConfig(context, guidList) ?: return null
+                it.split(":").take(2).joinToString(":", postfix = ":***")
-        val config = CustomFmt.parse(JsonUtil.toJson(result)) ?: return null
+            else
-        config.subscriptionId = subid
+                it.split('.').dropLast(1).joinToString(".", postfix = ".***")
-        val key = MmkvManager.encodeServerConfig("", config)
+        } ?: ""
-        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(result) ?: "")
+
-        return key
+        return "$addrPart : ${port ?: ""}"
     }
 }

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

@@ -1,13 +1,17 @@
 package com.v2ray.ang.handler
 
 import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig.DEFAULT_SUBSCRIPTION_ID
 import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
 import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
+import com.v2ray.ang.dto.AssetUrlCache
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
+import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.WebDavConfig
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 
@@ -15,7 +19,6 @@ object MmkvManager {
 
     //region private
 
-    //private const val ID_PROFILE_CONFIG = "PROFILE_CONFIG"
     private const val ID_MAIN = "MAIN"
     private const val ID_PROFILE_FULL_CONFIG = "PROFILE_FULL_CONFIG"
     private const val ID_SERVER_RAW = "SERVER_RAW"
@@ -25,9 +28,10 @@ object MmkvManager {
     private const val ID_SETTING = "SETTING"
     private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
     private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
+    private const val KEY_SUB_SERVER_PREFIX = "SUB_SERVERS_"
     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) }
     private val profileFullStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_FULL_CONFIG, MMKV.MULTI_PROCESS_MODE) }
     private val serverRawStorage by lazy { MMKV.mmkvWithID(ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
@@ -40,6 +44,17 @@ object MmkvManager {
 
     //region Server
 
+    /**
+     * Reads the legacy server list from KEY_ANG_CONFIGS for migration.
+     * This method is for migration purposes only.
+     *
+     * @return The JSON string of legacy server list, or null if not exists.
+     */
+    fun readLegacyServerList(): String? {
+        return mainStorage.decodeString(KEY_ANG_CONFIGS)
+    }
+
+
     /**
      * Gets the selected server GUID.
      *
@@ -59,28 +74,62 @@ object MmkvManager {
     }
 
     /**
-     * Encodes the server list.
+     * Encodes the server list for a given subscription.
+     * Saves to the subscription's serverList (including default subscription for ungrouped servers).
      *
      * @param serverList The list of server GUIDs.
+     * @param subscriptionId The subscription ID.
      */
-    fun encodeServerList(serverList: MutableList<String>) {
+    fun encodeServerList(serverList: MutableList<String>, subscriptionId: String) {
-        mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
+        val subId = getSubscriptionId(subscriptionId)
+        val key = "$KEY_SUB_SERVER_PREFIX$subId"
+        mainStorage.encode(key, JsonUtil.toJson(serverList))
     }
 
+
     /**
-     * Decodes the server list.
+     * Decodes the server list for a given subscription.
+     * If subscriptionId is empty, returns ungrouped servers.
+     * Otherwise, returns servers from the specified subscription's serverList.
      *
+     * @param subscriptionId The subscription ID.
      * @return The list of server GUIDs.
      */
-    fun decodeServerList(): MutableList<String> {
+    fun decodeServerList(subscriptionId: String): MutableList<String> {
-        val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
+        val subId = getSubscriptionId(subscriptionId)
+        val key = "$KEY_SUB_SERVER_PREFIX$subId"
+        val json = mainStorage.decodeString(key)
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList() ?: mutableListOf()
         }
     }
 
+    /**
+     * Decodes all server list (merged from all subscriptions including default subscription).
+     * Use this when you need the complete server list.
+     *
+     * @return The list of all server GUIDs.
+     */
+    fun decodeAllServerList(): MutableList<String> {
+        val allServers = mutableListOf<String>()
+        val subsList = decodeSubsList()
+
+        // If DEFAULT_SUBSCRIPTION_ID is not in the subscriptions list, add its servers
+        if (!subsList.contains(DEFAULT_SUBSCRIPTION_ID)) {
+            allServers.addAll(decodeServerList(DEFAULT_SUBSCRIPTION_ID))
+        }
+
+        // Add servers from all subscriptions
+        subsList.forEach { guid ->
+            allServers.addAll(decodeServerList(guid))
+        }
+
+        return allServers
+    }
+
+
     /**
      * Decodes the server configuration.
      *
@@ -98,16 +147,6 @@ object MmkvManager {
         return JsonUtil.fromJson(json, ProfileItem::class.java)
     }
 
-//    fun decodeProfileConfig(guid: String): ProfileLiteItem? {
-//        if (guid.isBlank()) {
-//            return null
-//        }
-//        val json = profileStorage.decodeString(guid)
-//        if (json.isNullOrBlank()) {
-//            return null
-//        }
-//        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
-//    }
 
     /**
      * Encodes the server configuration.
@@ -119,25 +158,32 @@ object MmkvManager {
     fun encodeServerConfig(guid: String, config: ProfileItem): String {
         val key = guid.ifBlank { Utils.getUuid() }
         profileFullStorage.encode(key, JsonUtil.toJson(config))
-        val serverList = decodeServerList()
+
+        // Use default subscription for servers without subscription
+        val subId = getSubscriptionId(config.subscriptionId)
+        val serverList = decodeServerList(subId)
+
         if (!serverList.contains(key)) {
             serverList.add(0, key)
-            encodeServerList(serverList)
+            encodeServerList(serverList, subId)
             if (getSelectServer().isNullOrBlank()) {
                 mainStorage.encode(KEY_SELECTED_SERVER, key)
             }
         }
-//        val profile = ProfileLiteItem(
+
-//            configType = config.configType,
-//            subscriptionId = config.subscriptionId,
-//            remarks = config.remarks,
-//            server = config.getProxyOutbound()?.getServerAddress(),
-//            serverPort = config.getProxyOutbound()?.getServerPort(),
-//        )
-//        profileStorage.encode(key, JsonUtil.toJson(profile))
         return key
     }
 
+    /**
+     * Encodes the server configuration directly without updating serverList.
+     *
+     * @param key The server GUID.
+     * @param configJson The server configuration JSON string.
+     */
+    fun encodeProfileDirect(key: String, configJson: String) {
+        profileFullStorage.encode(key, configJson)
+    }
+
     /**
      * Removes the server configuration.
      *
@@ -147,33 +193,44 @@ object MmkvManager {
         if (guid.isBlank()) {
             return
         }
+
+        // Get config to determine which subscription to update
+        val config = decodeServerConfig(guid)
+        val subId = getSubscriptionId(config?.subscriptionId)
+
+        // Remove from appropriate server list
+        val serverList = decodeServerList(subId)
+        serverList.remove(guid)
+        encodeServerList(serverList, subId)
+
+        // Clean up storage
         if (getSelectServer() == guid) {
             mainStorage.remove(KEY_SELECTED_SERVER)
         }
-        val serverList = decodeServerList()
-        serverList.remove(guid)
-        encodeServerList(serverList)
         profileFullStorage.remove(guid)
-        //profileStorage.remove(guid)
         serverAffStorage.remove(guid)
     }
 
     /**
      * Removes the server configurations via subscription ID.
      *
-     * @param subid The subscription ID.
+     * @param subscriptionId The subscription ID.
      */
-    fun removeServerViaSubid(subid: String) {
+    fun removeServerViaSubid(subscriptionId: String?) {
-        if (subid.isBlank()) {
+        val subId = getSubscriptionId(subscriptionId)
-            return
+        val serverList = decodeServerList(subId)
-        }
+
-        profileFullStorage.allKeys()?.forEach { key ->
+        // Remove all servers in the list
-            decodeServerConfig(key)?.let { config ->
+        serverList.forEach { guid ->
-                if (config.subscriptionId == subid) {
+            if (getSelectServer() == guid) {
-                    removeServer(key)
+                mainStorage.remove(KEY_SELECTED_SERVER)
-                }
             }
+            profileFullStorage.remove(guid)
+            serverAffStorage.remove(guid)
         }
+
+        serverList.clear()
+        encodeServerList(serverList, subId)
     }
 
     /**
@@ -231,7 +288,6 @@ object MmkvManager {
         val count = profileFullStorage.allKeys()?.count() ?: 0
         mainStorage.clearAll()
         profileFullStorage.clearAll()
-        //profileStorage.clearAll()
         serverAffStorage.clearAll()
         return count
     }
@@ -288,6 +344,10 @@ object MmkvManager {
 
     //region Subscriptions
 
+    private fun getSubscriptionId(subscriptionId: String?):String {
+        return subscriptionId?.ifEmpty { DEFAULT_SUBSCRIPTION_ID } ?: DEFAULT_SUBSCRIPTION_ID
+    }
+
     /**
      * Initializes the subscription list.
      */
@@ -307,14 +367,15 @@ object MmkvManager {
      *
      * @return The list of subscriptions.
      */
-    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
+    fun decodeSubscriptions(): List<SubscriptionCache> {
         initSubsList()
 
-        val subscriptions = mutableListOf<Pair<String, SubscriptionItem>>()
+        val subscriptions = mutableListOf<SubscriptionCache>()
         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(SubscriptionCache(key, item))
             }
         }
         return subscriptions
@@ -381,7 +442,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()
         }
     }
 
@@ -394,15 +455,16 @@ object MmkvManager {
      *
      * @return The list of asset URLs.
      */
-    fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
+    fun decodeAssetUrls(): List<AssetUrlCache> {
-        val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
+        val assetUrlItems = mutableListOf<AssetUrlCache>()
         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(AssetUrlCache(key, item))
             }
         }
-        return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
+        return assetUrlItems.sortedBy { it.assetUrl.addedTime }
     }
 
     /**
@@ -448,7 +510,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 +527,7 @@ object MmkvManager {
 
     //endregion
 
+    //region settings
     /**
      * Encodes the settings.
      *
@@ -487,6 +550,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 +615,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 +679,6 @@ object MmkvManager {
         return settingsStorage.decodeStringSet(key)
     }
 
-    //endregion
-
-    //region Others
-
     /**
      * Encodes the start on boot setting.
      *
@@ -585,4 +699,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/NotificationManager.kt

@@ -9,13 +9,13 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
+import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 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
@@ -31,6 +31,7 @@ object NotificationManager {
     private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
     private const val NOTIFICATION_PENDING_INTENT_RESTART_V2RAY = 2
     private const val NOTIFICATION_ICON_THRESHOLD = 3000
+    private const val QUERY_INTERVAL_MS = 3000L
 
     private var lastQueryTime = 0L
     private var mBuilder: NotificationCompat.Builder? = null
@@ -45,7 +46,6 @@ object NotificationManager {
         if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) return
         if (speedNotificationJob != null || V2RayServiceManager.isRunning() == false) return
 
-        lastQueryTime = System.currentTimeMillis()
         var lastZeroSpeed = false
         val outboundTags = currentConfig?.getAllOutboundTags()
         outboundTags?.remove(AppConfig.TAG_DIRECT)
@@ -53,7 +53,17 @@ object NotificationManager {
         speedNotificationJob = CoroutineScope(Dispatchers.IO).launch {
             while (isActive) {
                 val queryTime = System.currentTimeMillis()
-                val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                val sinceLastQueryIn = (queryTime - lastQueryTime)
+
+                // If the query interval is too short, skip this round to avoid excessive CPU usage
+                if (sinceLastQueryIn < QUERY_INTERVAL_MS) {
+                    Log.w(AppConfig.TAG, "Query interval too short: ${sinceLastQueryIn}ms, skipping")
+                    lastQueryTime = queryTime
+                    delay(QUERY_INTERVAL_MS)
+                    continue
+                }
+                val sinceLastQueryInSeconds = sinceLastQueryIn / 1000.0
+
                 var proxyTotal = 0L
                 val text = StringBuilder()
                 outboundTags?.forEach {
@@ -79,7 +89,7 @@ object NotificationManager {
                 }
                 lastZeroSpeed = zeroSpeed
                 lastQueryTime = queryTime
-                delay(3000)
+                delay(QUERY_INTERVAL_MS)
             }
         }
     }
@@ -90,11 +100,11 @@ 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
+        // Reset last query time to avoid querying stats too soon after showing the notification
-        } else {
+        lastQueryTime = System.currentTimeMillis()
-            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 +157,7 @@ object NotificationManager {
      */
     fun cancelNotification() {
         val service = getService() ?: return
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
-            service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
-        } else {
-            service.stopForeground(true)
-        }
 
         mBuilder = null
         speedNotificationJob?.cancel()
@@ -232,7 +238,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

@@ -7,18 +7,25 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.DEFAULT_SUBSCRIPTION_ID
 import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.AppConfig.VPN
-import com.v2ray.ang.dto.Language
 import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.RoutingType
 import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.VpnInterfaceAddressConfig
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.Language
+import com.v2ray.ang.enums.RoutingType
+import com.v2ray.ang.enums.VpnInterfaceAddressConfig
+import com.v2ray.ang.handler.MmkvManager.decodeAllServerList
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerList
+import com.v2ray.ang.handler.MmkvManager.decodeSubsList
+import com.v2ray.ang.handler.MmkvManager.decodeSubscription
+import com.v2ray.ang.handler.MmkvManager.encodeSubscription
+import com.v2ray.ang.handler.MmkvManager.removeSubscription
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 import java.io.File
@@ -28,11 +35,19 @@ import java.util.Locale
 
 object SettingsManager {
 
+    fun initApp(context: Context) {
+        ensureDefaultSettings()
+        //ensureDefaultSubscription()
+        initRoutingRulesets(context)
+        migrateServerListToSubscriptions()
+        migrateHysteria2PinSHA256()
+    }
+
     /**
      * Initialize routing rulesets.
      * @param context The application context.
      */
-    fun initRoutingRulesets(context: Context) {
+    private fun initRoutingRulesets(context: Context) {
         val exist = MmkvManager.decodeRoutingRulesets()
         if (exist.isNullOrEmpty()) {
             val rulesetList = getPresetRoutingRulesets(context)
@@ -53,7 +68,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 +92,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 +187,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 +220,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)
@@ -220,14 +235,37 @@ object SettingsManager {
         if (remarks.isNullOrEmpty()) {
             return null
         }
-        val serverList = decodeServerList()
+        val serverList = decodeAllServerList()
-        for (guid in serverList) {
+        return serverList
-            val profile = decodeServerConfig(guid)
+            .mapNotNull { guid -> decodeServerConfig(guid) }
-            if (profile != null && profile.remarks == remarks) {
+            .firstOrNull { it.remarks == remarks }
-                return profile
+    }
-            }
+
+    /**
+     * Removes the subscription.
+     * If there are no remaining subscriptions,
+     * it creates a new default subscription to ensure that ungroup
+     **/
+    fun removeSubscriptionWithDefault(subid: String) {
+//        val subsList = decodeSubsList()
+//        if (subsList.size == 1 && subsList.first() == DEFAULT_SUBSCRIPTION_ID) {
+//            Log.i(ANG_PACKAGE,"Attempted to remove the only existing default subscription, operation ignored.")
+//            return
+//        }
+
+        // Remove the subscription
+        removeSubscription(subid)
+
+        // After removal, check if there are any subscriptions left. If not, create a default subscription.
+        val subsList2 = decodeSubsList()
+        if (subsList2.isNotEmpty()) {
+            return
         }
-        return null
+
+        val defaultSub = SubscriptionItem(
+            remarks = "Default",
+        )
+        encodeSubscription(DEFAULT_SUBSCRIPTION_ID, defaultSub)
     }
 
     /**
@@ -255,7 +293,7 @@ object SettingsManager {
         val extFolder = Utils.userAssetPath(context)
 
         try {
-            val geo = arrayOf("geosite.dat", "geoip.dat")
+            val geo = arrayOf(AppConfig.GEOSITE_DAT, AppConfig.GEOIP_DAT, AppConfig.GEOIP_ONLY_CN_PRIVATE_DAT)
             assets.list("")
                 ?.filter { geo.contains(it) }
                 ?.filter { !File(extFolder, it).exists() }
@@ -338,12 +376,12 @@ object SettingsManager {
             Language.ENGLISH -> Locale.ENGLISH
             Language.CHINA -> Locale.CHINA
             Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
-            Language.VIETNAMESE -> Locale("vi")
+            Language.VIETNAMESE -> Locale.forLanguageTag("vi")
-            Language.RUSSIAN -> Locale("ru")
+            Language.RUSSIAN -> Locale.forLanguageTag("ru")
-            Language.PERSIAN -> Locale("fa")
+            Language.PERSIAN -> Locale.forLanguageTag("fa")
-            Language.ARABIC -> Locale("ar")
+            Language.ARABIC -> Locale.forLanguageTag("ar")
-            Language.BANGLA -> Locale("bn")
+            Language.BANGLA -> Locale.forLanguageTag("bn")
-            Language.BAKHTIARI -> Locale("bqi", "IR")
+            Language.BAKHTIARI -> Locale.forLanguageTag("bqi-IR")
         }
     }
 
@@ -377,4 +415,144 @@ object SettingsManager {
     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)
+    }
+
+    /**
+     * Check if VPN mode is enabled.
+     * @return True if VPN mode is enabled, false otherwise.
+     */
+    fun isVpnMode(): Boolean {
+        val mode = MmkvManager.decodeSettingsString(AppConfig.PREF_MODE)
+        return mode == null || mode == VPN
+    }
+
+    /**
+     * Ensure default settings are present in MMKV.
+     */
+    private 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)
+        }
+    }
+
+    private fun migrateHysteria2PinSHA256() {
+        // Check if migration has already been done
+        val migrationKey = "hysteria2_pin_sha256_migrated"
+        if (MmkvManager.decodeSettingsBool(migrationKey, false)) {
+            return
+        }
+
+        val serverList = decodeAllServerList()
+
+        for (guid in serverList) {
+            val profile = decodeServerConfig(guid) ?: continue
+            if (profile.configType != EConfigType.HYSTERIA2) {
+                continue
+            }
+            if (profile.pinSHA256.isNullOrEmpty() || !profile.pinnedCA256.isNullOrEmpty()) {
+                continue
+            }
+            profile.pinnedCA256 = profile.pinSHA256
+            profile.pinSHA256 = null
+            MmkvManager.encodeServerConfig(guid, profile)
+        }
+
+        MmkvManager.encodeSettings(migrationKey, true)
+    }
+
+    /**
+     * Migrates server list from legacy KEY_ANG_CONFIGS to subscription-based storage.
+     * This method should be called once during app initialization after the storage structure change.
+     * Servers are grouped by their subscriptionId into respective subscription's serverList.
+     * Servers without subscription are moved to the default subscription.
+     * After migration, KEY_ANG_CONFIGS is removed.
+     */
+    private fun migrateServerListToSubscriptions() {
+        // Check if migration has already been done
+        val migrationKey = "server_list_to_subscriptions_migrated"
+        if (MmkvManager.decodeSettingsBool(migrationKey, false)) {
+            return
+        }
+
+        // Ensure default subscription exists before migration
+        ensureDefaultSubscription()
+
+        // Read existing server list from legacy KEY_ANG_CONFIGS
+        val oldJson = MmkvManager.readLegacyServerList()
+        if (oldJson.isNullOrBlank()) {
+            // No data to migrate, mark as done
+            MmkvManager.encodeSettings(migrationKey, true)
+            return
+        }
+
+        val guids = JsonUtil.fromJson(oldJson, Array<String>::class.java) ?: run {
+            MmkvManager.encodeSettings(migrationKey, true)
+            return
+        }
+
+        val subscriptionServerMap = mutableMapOf<String, MutableList<String>>()
+
+        // Group servers by subscription (use default subscription for empty subscriptionId)
+        guids.forEach { guid ->
+            val config = decodeServerConfig(guid) ?: return@forEach
+            val subId = config.subscriptionId.ifEmpty { DEFAULT_SUBSCRIPTION_ID }
+
+            subscriptionServerMap.getOrPut(subId) { mutableListOf() }.add(guid)
+        }
+
+        // Update each subscription's serverList (including default subscription)
+        subscriptionServerMap.forEach { (subId, serverGuids) ->
+            MmkvManager.encodeServerList(serverGuids, subId)
+        }
+
+
+        // Mark migration as complete
+        MmkvManager.encodeSettings(migrationKey, true)
+    }
+
+    /**
+     * Ensures the default subscription exists for ungrouped servers.
+     * This subscription is used internally to store servers without a subscription.
+     * Made public for migration in SettingsManager.
+     */
+    private fun ensureDefaultSubscription() {
+        if (decodeSubscription(DEFAULT_SUBSCRIPTION_ID) == null) {
+            val defaultSub = SubscriptionItem(
+                remarks = "Default",
+            )
+            encodeSubscription(DEFAULT_SUBSCRIPTION_ID, defaultSub)
+
+            // Move top
+            val subsList = decodeSubsList()
+            if (subsList.count() > 1) {
+                swapSubscriptions(0, subsList.count() - 1)
+            }
+        }
+    }
+
 }

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 = when (code) {
-                result = context.getString(R.string.connection_test_available, elapsed)
+                204 -> context.getString(R.string.connection_test_available, elapsed)
-            } else {
+                200 if conn.contentLengthLong == 0L -> context.getString(R.string.connection_test_available, elapsed)
-                throw IOException(
+                else -> throw IOException(
-                    context.getString(
+                    context.getString(R.string.connection_test_error_status_code, code)
-                        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
+        val ip = listOf(
-        var ip = ipInfo.ip ?: ipInfo.clientIp ?: ipInfo.ip_addr ?: ipInfo.query
+            ipInfo.ip,
-        var country = ipInfo.country_code ?: ipInfo.country ?: ipInfo.countryCode
+            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/SubscriptionUpdater.kt

@@ -36,10 +36,10 @@ object SubscriptionUpdater {
         override suspend fun doWork(): Result {
             Log.i(AppConfig.TAG, "subscription automatic update starting")
 
-            val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
+            val subs = MmkvManager.decodeSubscriptions().filter { it.subscription.autoUpdate }
 
             for (sub in subs) {
-                val subItem = sub.second
+                val subItem = sub.subscription
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     notification.setChannelId(AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
@@ -53,7 +53,7 @@ object SubscriptionUpdater {
                 }
                 notificationManager.notify(3, notification.build())
                 Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
-                AngConfigManager.updateConfigViaSub(Pair(sub.first, subItem))
+                AngConfigManager.updateConfigViaSub(sub)
                 notification.setContentText("Updating ${subItem.remarks}")
             }
             notificationManager.cancel(3)

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) {
+        val url = if (includePreRelease) {
-                AppConfig.APP_API_URL
+            AppConfig.APP_API_URL
-            } else {
+        } else {
-                AppConfig.APP_API_URL.concatUrl("latest")
+            AppConfig.APP_API_URL.concatUrl("latest")
-            }
+        }
 
-            var response = HttpUtil.getUrlContent(url, 5000)
+        var response = HttpUtil.getUrlContent(url, 5000)
-            if (response.isNullOrEmpty()) {
+        if (response.isNullOrEmpty()) {
-                val httpPort = SettingsManager.getHttpPort()
+            val httpPort = SettingsManager.getHttpPort()
-                response = HttpUtil.getUrlContent(url, 5000, httpPort) ?: throw IllegalStateException("Failed to get response")
+            response = HttpUtil.getUrlContent(url, 5000, httpPort)
-            }
+                ?: throw IllegalStateException("Failed to get response")
+        }
 
-            val latestRelease = if (includePreRelease) {
+        val latestRelease = if (includePreRelease) {
-                JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
+            JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
-                    .firstOrNull()
+                ?.firstOrNull()
-                    ?: throw IllegalStateException("No pre-release found")
+                ?: throw IllegalStateException("No pre-release found")
-            } else {
+        } else {
-                JsonUtil.fromJson(response, GitHubRelease::class.java)
+            JsonUtil.fromJson(response, GitHubRelease::class.java)
-            }
+        }
+        if (latestRelease == null) {
+            return@withContext CheckUpdateResult(hasUpdate = false)
+        }
 
-            val latestVersion = latestRelease.tagName.removePrefix("v")
+        val latestVersion = latestRelease.tagName.removePrefix("v")
-            Log.i(AppConfig.TAG, "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})")
+        Log.i(
+            AppConfig.TAG,
+            "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})"
+        )
 
-            return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
+        return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
-                val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
+            val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
-                CheckUpdateResult(
+            CheckUpdateResult(
-                    hasUpdate = true,
+                hasUpdate = true,
-                    latestVersion = latestVersion,
+                latestVersion = latestVersion,
-                    releaseNotes = latestRelease.body,
+                releaseNotes = latestRelease.body,
-                    downloadUrl = downloadUrl,
+                downloadUrl = downloadUrl,
-                    isPreRelease = latestRelease.prerelease
+                isPreRelease = latestRelease.prerelease
-                )
+            )
-            } else {
+        } else {
-                CheckUpdateResult(hasUpdate = false)
+            CheckUpdateResult(hasUpdate = false)
-            }
+        }
     }
 
     suspend fun downloadApk(context: Context, downloadUrl: String): File? = withContext(Dispatchers.IO) {

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,40 +5,36 @@ 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
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.contracts.ServiceControl
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.toast
-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)
+            V2RayNativeManager.initCoreEnv(value?.get()?.getService())
-            Libv2ray.initCoreEnv(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
         }
 
     /**
@@ -61,9 +57,12 @@ object V2RayServiceManager {
      * @param guid The GUID of the server configuration to use (optional).
      */
     fun startVService(context: Context, guid: String? = null) {
+        Log.i(AppConfig.TAG, "StartCore-Manager: startVService from ${context::class.java.simpleName}")
+
         if (guid != null) {
             MmkvManager.setSelectServer(guid)
         }
+
         startContextService(context)
     }
 
@@ -72,7 +71,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, "")
     }
 
@@ -95,31 +94,52 @@ object V2RayServiceManager {
      */
     private fun startContextService(context: Context) {
         if (coreController.isRunning) {
+            Log.w(AppConfig.TAG, "StartCore-Manager: Core already running")
             return
         }
-        val guid = MmkvManager.getSelectServer() ?: return
+
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
+        val guid = MmkvManager.getSelectServer()
+        if (guid == null) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: No server selected")
+            return
+        }
+
+        val config = MmkvManager.decodeServerConfig(guid)
+        if (config == null) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to decode server config")
+            return
+        }
+
         if (config.configType != EConfigType.CUSTOM
+            && config.configType != EConfigType.POLICYGROUP
             && !Utils.isValidUrl(config.server)
             && !Utils.isPureIpAddress(config.server.orEmpty())
-        ) return
+        ) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Invalid server configuration")
+            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)
         }
-        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: AppConfig.VPN) == AppConfig.VPN) {
+
+        val isVpnMode = SettingsManager.isVpnMode()
+        val intent = if (isVpnMode) {
+            Log.i(AppConfig.TAG, "StartCore-Manager: Starting VPN service")
             Intent(context.applicationContext, V2RayVpnService::class.java)
         } else {
+            Log.i(AppConfig.TAG, "StartCore-Manager: Starting Proxy service")
             Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
         }
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
+
-            context.startForegroundService(intent)
+        try {
-        } else {
+            ContextCompat.startForegroundService(context, intent)
-            context.startService(intent)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to start service", e)
         }
     }
 
@@ -128,17 +148,36 @@ object V2RayServiceManager {
      * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
      * Starts the V2Ray core service.
      */
-    fun startCoreLoop(): Boolean {
+    fun startCoreLoop(vpnInterface: ParcelFileDescriptor?): Boolean {
         if (coreController.isRunning) {
+            Log.w(AppConfig.TAG, "StartCore-Manager: Core already running")
             return false
         }
 
-        val service = getService() ?: return false
+        val service = getService()
-        val guid = MmkvManager.getSelectServer() ?: return false
+        if (service == null) {
-        val config = MmkvManager.decodeServerConfig(guid) ?: return false
+            Log.e(AppConfig.TAG, "StartCore-Manager: Service is null")
-        val result = V2rayConfigManager.getV2rayConfig(service, guid)
-        if (!result.status)
             return false
+        }
+
+        val guid = MmkvManager.getSelectServer()
+        if (guid == null) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: No server selected")
+            return false
+        }
+
+        val config = MmkvManager.decodeServerConfig(guid)
+        if (config == null) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to decode server config")
+            return false
+        }
+
+        Log.i(AppConfig.TAG, "StartCore-Manager: Starting core loop for ${config.remarks}")
+        val result = V2rayConfigManager.getV2rayConfig(service, guid)
+        if (!result.status) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to get V2Ray config")
+            return false
+        }
 
         try {
             val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
@@ -147,20 +186,26 @@ object V2RayServiceManager {
             mFilter.addAction(Intent.ACTION_USER_PRESENT)
             ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to register broadcast receiver", e)
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to register receiver", e)
             return false
         }
 
         currentConfig = config
+        var tunFd = vpnInterface?.fd ?: 0
+        if (SettingsManager.isUsingHevTun()) {
+            tunFd = 0
+        }
 
         try {
-            coreController.startLoop(result.content)
+            NotificationManager.showNotification(currentConfig)
+            coreController.startLoop(result.content, tunFd)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to start Core loop", e)
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to start core loop", e)
             return false
         }
 
         if (coreController.isRunning == false) {
+            Log.e(AppConfig.TAG, "StartCore-Manager: Core failed to start")
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
             NotificationManager.cancelNotification()
             return false
@@ -168,12 +213,10 @@ object V2RayServiceManager {
 
         try {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            NotificationManager.showNotification(currentConfig)
             NotificationManager.startSpeedNotification(currentConfig)
-
+            Log.i(AppConfig.TAG, "StartCore-Manager: Core started successfully")
-            PluginServiceManager.runPlugin(service, config, result.socksPort)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to startup service", e)
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to complete startup", e)
             return false
         }
         return true
@@ -192,7 +235,7 @@ object V2RayServiceManager {
                 try {
                     coreController.stopLoop()
                 } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to stop V2Ray loop", e)
+                    Log.e(AppConfig.TAG, "StartCore-Manager: Failed to stop V2Ray loop", e)
                 }
             }
         }
@@ -203,9 +246,8 @@ object V2RayServiceManager {
         try {
             service.unregisterReceiver(mMsgReceive)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
+            Log.e(AppConfig.TAG, "StartCore-Manager: Failed to unregister receiver", e)
         }
-        PluginServiceManager.stopPlugin()
 
         return true
     }
@@ -238,14 +280,14 @@ object V2RayServiceManager {
             try {
                 time = coreController.measureDelay(SettingsManager.getDelayTestUrl())
             } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to measure delay with primary URL", e)
+                Log.e(AppConfig.TAG, "StartCore-Manager: Failed to measure delay", e)
                 errorStr = e.message?.substringAfter("\":") ?: "empty message"
             }
             if (time == -1L) {
                 try {
                     time = coreController.measureDelay(SettingsManager.getDelayTestUrl(true))
                 } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to measure delay with alternative URL", e)
+                    Log.e(AppConfig.TAG, "StartCore-Manager: Failed to measure delay", e)
                     errorStr = e.message?.substringAfter("\":") ?: "empty message"
                 }
             }
@@ -297,7 +339,7 @@ object V2RayServiceManager {
                 serviceControl.stopService()
                 0
             } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to stop service in callback", e)
+                Log.e(AppConfig.TAG, "StartCore-Manager: Failed to stop service", e)
                 -1
             }
         }
@@ -344,12 +386,12 @@ object V2RayServiceManager {
                 }
 
                 AppConfig.MSG_STATE_STOP -> {
-                    Log.i(AppConfig.TAG, "Stop Service")
+                    Log.i(AppConfig.TAG, "StartCore-Manager: Stop service")
                     serviceControl.stopService()
                 }
 
                 AppConfig.MSG_STATE_RESTART -> {
-                    Log.i(AppConfig.TAG, "Restart Service")
+                    Log.i(AppConfig.TAG, "StartCore-Manager: Restart service")
                     serviceControl.stopService()
                     Thread.sleep(500L)
                     startVService(serviceControl.getService())
@@ -362,12 +404,12 @@ object V2RayServiceManager {
 
             when (intent?.action) {
                 Intent.ACTION_SCREEN_OFF -> {
-                    Log.i(AppConfig.TAG, "SCREEN_OFF, stop querying stats")
+                    Log.i(AppConfig.TAG, "StartCore-Manager: Screen off")
                     NotificationManager.stopSpeedNotification(currentConfig)
                 }
 
                 Intent.ACTION_SCREEN_ON -> {
-                    Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats")
+                    Log.i(AppConfig.TAG, "StartCore-Manager: Screen on")
                     NotificationManager.startSpeedNotification(currentConfig)
                 }
             }

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

@@ -3,11 +3,9 @@ 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
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
@@ -15,9 +13,12 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 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.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.fmt.CustomFmt
+import com.v2ray.ang.extension.nullIfBlank
 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 +31,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 +46,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 +58,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 +69,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 +89,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 (!needTun()) {
+            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.decodeAllServerList()
+        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 +197,8 @@ object V2rayConfigManager {
 
         getInbounds(v2rayConfig)
 
-        if (config.configType == EConfigType.HYSTERIA2) {
+        getOutbounds(v2rayConfig, config) ?: return result
-            result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result
+        getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        } else {
-            getOutbounds(v2rayConfig, config) ?: return result
-            getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        }
 
         getRouting(v2rayConfig)
 
@@ -165,21 +225,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 { it.configType != EConfigType.POLICYGROUP }
-            .filter { config ->
+            .toList()
-                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()
 
         if (validConfigs.isEmpty()) {
             Log.w(AppConfig.TAG, "All configs are invalid")
@@ -188,21 +239,12 @@ object V2rayConfigManager {
 
         val v2rayConfig = initV2rayConfig(context) ?: return null
         v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
-
+        v2rayConfig.remarks = config.remarks
-        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
 
         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 +263,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 +302,8 @@ object V2rayConfigManager {
 
         val v2rayConfig = initV2rayConfig(context) ?: return result
 
-        if (config.configType == EConfigType.HYSTERIA2) {
+        getOutbounds(v2rayConfig, config) ?: return result
-            result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result
+        getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        } else {
-            getOutbounds(v2rayConfig, config) ?: return result
-            getMoreOutbounds(v2rayConfig, config.subscriptionId)
-        }
 
         v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
         v2rayConfig.inbounds.clear()
@@ -296,11 +334,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")
+        var assets = ""
-        if (TextUtils.isEmpty(assets)) {
+        if (needTun()) {
-            return null
+            assets = initConfigCacheWithTun ?: Utils.readTextFromAssets(context, "v2ray_config_with_tun.json")
+            if (TextUtils.isEmpty(assets)) {
+                return null
+            }
+            initConfigCacheWithTun = assets
+        } else {
+            assets = initConfigCache ?: Utils.readTextFromAssets(context, "v2ray_config.json")
+            if (TextUtils.isEmpty(assets)) {
+                return null
+            }
+            initConfigCache = assets
         }
-        initConfigCache = assets
         val config = JsonUtil.fromJson(assets, V2rayConfig::class.java)
         return config
     }
@@ -311,6 +358,10 @@ object V2rayConfigManager {
 
     //region some sub function
 
+    private fun needTun(): Boolean {
+        return SettingsManager.isVpnMode() && !SettingsManager.isUsingHevTun()
+    }
+
     /**
      * Configures the inbound settings for V2ray.
      *
@@ -322,34 +373,38 @@ 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) {
-                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
+                inbound1.listen = AppConfig.LOOPBACK
-                    //bind all inbounds to localhost if the user requests
-                    curInbound.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
+            inbound1.sniffing?.enabled = fakedns || sniffAllTlsAndHttp
-            v2rayConfig.inbounds[0].sniffing?.routeOnly =
+            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()) {
+            if (!Utils.isXray()) {
-                v2rayConfig.inbounds.removeAt(1)
+                val inbound2 = JsonUtil.fromJson(JsonUtil.toJson(inbound1), V2rayConfig.InboundBean::class.java) ?: return false
-            } else {
+                inbound2.tag = EConfigType.HTTP.name.lowercase()
-                val httpPort = SettingsManager.getHttpPort()
+                inbound2.port = SettingsManager.getHttpPort()
-                v2rayConfig.inbounds[1].port = httpPort
+                inbound2.protocol = EConfigType.HTTP.name.lowercase()
+                v2rayConfig.inbounds.add(inbound2)
             }
 
+            if (needTun()) {
+                val inboundTun = v2rayConfig.inbounds.firstOrNull { e -> e.tag == "tun" }
+                inboundTun?.settings?.mtu = SettingsManager.getVpnMtu()
+                inboundTun?.sniffing = inbound1.sniffing
+            }
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to configure inbounds", e)
             return false
@@ -412,6 +467,19 @@ object V2rayConfigManager {
 
             val rule = JsonUtil.fromJson(JsonUtil.toJson(item), RulesBean::class.java) ?: return
 
+            // Replace specific geoip rules with ext versions
+            rule.ip?.let { ipList ->
+                val updatedIpList = ArrayList<String>()
+                ipList.forEach { ip ->
+                    when (ip) {
+                        AppConfig.GEOIP_CN -> updatedIpList.add("ext:${AppConfig.GEOIP_ONLY_CN_PRIVATE_DAT}:cn")
+                        AppConfig.GEOIP_PRIVATE -> updatedIpList.add("ext:${AppConfig.GEOIP_ONLY_CN_PRIVATE_DAT}:private")
+                        else -> updatedIpList.add(ip)
+                    }
+                }
+                rule.ip = updatedIpList
+            }
+
             v2rayConfig.routing.rules.add(rule)
 
         } catch (e: Exception) {
@@ -470,57 +538,31 @@ object V2rayConfigManager {
                 )
             }
 
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL ,true) == false) {
+            if(SettingsManager.isVpnMode()) {
-
+                if (SettingsManager.isUsingHevTun()) {
-                // DNS inbound
+                    //hev-socks5-tunnel dns routing
-                val remoteDns = SettingsManager.getRemoteDnsServers()
+                    v2rayConfig.routing.rules.add(
-                if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
+                        0, RulesBean(
-                    val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
+                            inboundTag = arrayListOf("socks"),
-                        address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY,
+                            outboundTag = "dns-out",
-                        port = 53,
+                            port = "53",
-                        network = "tcp,udp"
+                        )
                     )
-
+                } else {
-                    val localDnsPort = Utils.parseInt(
+                    v2rayConfig.routing.rules.add(
-                        MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT),
+                        0, RulesBean(
-                        AppConfig.PORT_LOCAL_DNS.toInt()
+                            inboundTag = arrayListOf("tun"),
-                    )
+                            outboundTag = "dns-out",
-                    v2rayConfig.inbounds.add(
+                            port = "53",
-                        V2rayConfig.InboundBean(
-                            tag = "dns-in",
-                            port = localDnsPort,
-                            listen = AppConfig.LOOPBACK,
-                            protocol = "dokodemo-door",
-                            settings = dnsInboundSettings,
-                            sniffing = null
                         )
                     )
                 }
-
-                // DNS routing tag
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        inboundTag = arrayListOf("dns-in"),
-                        outboundTag = "dns-out",
-                        domain = null
-                    )
-                )
-            } else {
-                //hev-socks5-tunnel dns routing
-                v2rayConfig.routing.rules.add(
-                    0, RulesBean(
-                        inboundTag = arrayListOf("socks"),
-                        outboundTag = "dns-out",
-                        port = "53",
-                        type = "field"
-                    )
-                )
             }
 
             // 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,
@@ -673,44 +715,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.
      *
@@ -775,7 +779,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
@@ -785,13 +789,14 @@ object V2rayConfigManager {
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.WIREGUARD.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
             ) {
                 muxEnabled = false
             } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) {
                 muxEnabled = false
             }
 
-            if (muxEnabled == true) {
+            if (muxEnabled) {
                 outbound.mux?.enabled = true
                 outbound.mux?.concurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8").orEmpty().toInt()
                 outbound.mux?.xudpConcurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "16").orEmpty().toInt()
@@ -850,66 +855,93 @@ object V2rayConfigManager {
      * Configures load balancing settings for the V2ray configuration.
      *
      * @param v2rayConfig The V2ray configuration object to be modified with balancing settings
+     * @param config The profile item containing policy group settings
      */
-    private fun getBalance(v2rayConfig: V2rayConfig)
+    private fun getBalance(v2rayConfig: V2rayConfig, config: ProfileItem) {
-    {
         try {
             v2rayConfig.routing.rules.forEach { rule ->
                 if (rule.outboundTag == "proxy") {
                     rule.outboundTag = null
-                    rule.balancerTag = "proxy-round"
+                    rule.balancerTag = AppConfig.TAG_BALANCER
                 }
             }
 
-            if (MmkvManager.decodeSettingsString(AppConfig.PREF_INTELLIGENT_SELECTION_METHOD, "0") == "0") {
+            val lstSelector =  listOf("proxy-")
-                val balancer = V2rayConfig.RoutingBean.BalancerBean(
+            when (config.policyGroupType) {
-                    tag = "proxy-round",
+                // Least Ping goto else
-                    selector = listOf("proxy-"),
+                "1" -> {
-                    strategy = V2rayConfig.RoutingBean.StrategyObject(
+                    // Least Load
-                        type = "leastPing"
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "leastLoad"
+                        )
                     )
-                )
+                    v2rayConfig.routing.balancers = listOf(balancer)
-                v2rayConfig.routing.balancers = listOf(balancer)
+                    v2rayConfig.burstObservatory = V2rayConfig.BurstObservatoryObject(
-                v2rayConfig.observatory = V2rayConfig.ObservatoryObject(
+                        subjectSelector = lstSelector,
-                    subjectSelector = listOf("proxy-"),
+                        pingConfig = V2rayConfig.BurstObservatoryObject.PingConfigObject(
-                    probeUrl = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                            destination = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
-                    probeInterval = "3m",
+                            interval = "5m",
-                    enableConcurrency = true
+                            sampling = 2,
-                )
+                            timeout = "30s"
-            } else {
+                        )
-                val balancer = V2rayConfig.RoutingBean.BalancerBean(
-                    tag = "proxy-round",
-                    selector = listOf("proxy-"),
-                    strategy = V2rayConfig.RoutingBean.StrategyObject(
-                        type = "leastLoad"
                     )
-                )
+                }
-                v2rayConfig.routing.balancers = listOf(balancer)
+                "2" -> {
-                v2rayConfig.burstObservatory = V2rayConfig.BurstObservatoryObject(
+                    // Random
-                    subjectSelector = listOf("proxy-"),
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
-                    pingConfig = V2rayConfig.BurstObservatoryObject.PingConfigObject(
+                        tag = AppConfig.TAG_BALANCER,
-                        destination = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                        selector = lstSelector,
-                        interval = "5m",
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
-                        sampling = 2,
+                            type = "random"
-                        timeout = "30s"
+                        )
                     )
-                )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                }
+                "3" -> {
+                    // Round Robin
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "roundRobin"
+                        )
+                    )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                }
+                else -> {
+                    // Default: Least Ping
+                    val balancer = V2rayConfig.RoutingBean.BalancerBean(
+                        tag = AppConfig.TAG_BALANCER,
+                        selector = lstSelector,
+                        strategy = V2rayConfig.RoutingBean.StrategyObject(
+                            type = "leastPing"
+                        )
+                    )
+                    v2rayConfig.routing.balancers = listOf(balancer)
+                    v2rayConfig.observatory = V2rayConfig.ObservatoryObject(
+                        subjectSelector = lstSelector,
+                        probeUrl = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) ?: AppConfig.DELAY_TEST_URL,
+                        probeInterval = "3m",
+                        enableConcurrency = true
+                    )
+                }
             }
 
             if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch") {
                 v2rayConfig.routing.rules.add(
                     RulesBean(
                         ip = arrayListOf("0.0.0.0/0", "::/0"),
-                        balancerTag = "proxy-round",
+                        balancerTag = AppConfig.TAG_BALANCER,
-                        type = "field"
                     )
                 )
             } else {
                 v2rayConfig.routing.rules.add(
                     RulesBean(
                         network = "tcp,udp",
-                        balancerTag = "proxy-round",
+                        balancerTag = AppConfig.TAG_BALANCER,
-                        type = "field"
                     )
                 )
             }
@@ -938,7 +970,7 @@ object V2rayConfigManager {
             }
 
             val fragmentOutbound =
-                V2rayConfig.OutboundBean(
+                OutboundBean(
                     protocol = AppConfig.PROTOCOL_FREEDOM,
                     tag = AppConfig.TAG_FRAGMENT,
                     mux = null
@@ -956,8 +988,8 @@ object V2rayConfigManager {
                 packets = "tlshello"
             }
 
-            fragmentOutbound.settings = OutboundBean.OutSettingsBean(
+            fragmentOutbound.settings = OutSettingsBean(
-                fragment = OutboundBean.OutSettingsBean.FragmentBean(
+                fragment = OutSettingsBean.FragmentBean(
                     packets = packets,
                     length = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH)
                         ?: "50-100",
@@ -965,7 +997,7 @@ object V2rayConfigManager {
                         ?: "10-20"
                 ),
                 noises = listOf(
-                    OutboundBean.OutSettingsBean.NoiseBean(
+                    OutSettingsBean.NoiseBean(
                         type = "rand",
                         packet = "10-20",
                         delay = "10-16",
@@ -1011,7 +1043,7 @@ object V2rayConfigManager {
 
             if (newHosts.containsKey(domain)) {
                 item.ensureSockopt().domainStrategy = "UseIP"
-                item.ensureSockopt().happyEyeballs = StreamSettingsBean.happyEyeballsBean(
+                item.ensureSockopt().happyEyeballs = StreamSettingsBean.HappyEyeballsBean(
                     prioritizeIPv6 = preferIpv6,
                     interleave = 2
                 )
@@ -1022,7 +1054,7 @@ object V2rayConfigManager {
             if (resolvedIps.isNullOrEmpty()) continue
 
             item.ensureSockopt().domainStrategy = "UseIP"
-            item.ensureSockopt().happyEyeballs = StreamSettingsBean.happyEyeballsBean(
+            item.ensureSockopt().happyEyeballs = StreamSettingsBean.HappyEyeballsBean(
                 prioritizeIPv6 = preferIpv6,
                 interleave = 2
             )
@@ -1044,7 +1076,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
@@ -1053,8 +1085,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
         }
     }
 
@@ -1085,8 +1119,7 @@ object V2rayConfigManager {
             EConfigType.SHADOWSOCKS,
             EConfigType.SOCKS,
             EConfigType.HTTP,
-            EConfigType.TROJAN,
+            EConfigType.TROJAN ->
-            EConfigType.HYSTERIA2 ->
                 return OutboundBean(
                     protocol = configType.name.lowercase(),
                     settings = OutSettingsBean(
@@ -1104,7 +1137,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
         }
     }
 
@@ -1132,7 +1176,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()
@@ -1153,19 +1197,39 @@ object V2rayConfigManager {
             }
 
             NetworkType.KCP.type -> {
-                val kcpsetting = StreamSettingsBean.KcpSettingsBean()
+                streamSettings.kcpSettings = StreamSettingsBean.KcpSettingsBean()
-                kcpsetting.header.type = headerType ?: "none"
+                val udpMaskList = mutableListOf<StreamSettingsBean.FinalMaskBean.MaskBean>()
+                if (!headerType.isNullOrEmpty() && headerType != "none") {
+                    val kcpHeaderType = when {
+                        headerType == "wechat-video" -> "header-wechat"
+                        else -> "header-$headerType"
+                    }
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = kcpHeaderType,
+                        settings = if (headerType == "dns" && !host.isNullOrEmpty()) {
+                            StreamSettingsBean.FinalMaskBean.MaskBean.MaskSettingsBean(
+                                domain = host
+                            )
+                        } else {
+                            null
+                        }
+                    ))
+                }
                 if (seed.isNullOrEmpty()) {
-                    kcpsetting.seed = null
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = "mkcp-original"
+                    ))
                 } else {
-                    kcpsetting.seed = seed
+                    udpMaskList.add(StreamSettingsBean.FinalMaskBean.MaskBean(
+                        type = "mkcp-aes128gcm",
+                        settings = StreamSettingsBean.FinalMaskBean.MaskBean.MaskSettingsBean(
+                            password = seed
+                        )
+                    ))
                 }
-                if (host.isNullOrEmpty()) {
+                streamSettings.finalmask = StreamSettingsBean.FinalMaskBean(
-                    kcpsetting.header.domain = null
+                    udp = udpMaskList.toList()
-                } else {
+                )
-                    kcpsetting.header.domain = host
-                }
-                streamSettings.kcpSettings = kcpsetting
             }
 
             NetworkType.WS.type -> {
@@ -1221,6 +1285,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
     }
@@ -1246,24 +1331,21 @@ object V2rayConfigManager {
         } else {
             profileItem.sni
         }
-        val fingerprint = profileItem.fingerPrint
-        val alpns = profileItem.alpn
-        val publicKey = profileItem.publicKey
-        val shortId = profileItem.shortId
-        val spiderX = profileItem.spiderX
-        val mldsa65Verify = profileItem.mldsa65Verify
 
-        streamSettings.security = if (streamSecurity.isEmpty()) null else streamSecurity
+        streamSettings.security = streamSecurity.nullIfBlank()
         if (streamSettings.security == null) return
         val tlsSetting = StreamSettingsBean.TlsSettingsBean(
             allowInsecure = allowInsecure,
-            serverName = if (sni.isNullOrEmpty()) null else sni,
+            serverName = sni.nullIfBlank(),
-            fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
+            fingerprint = profileItem.fingerPrint.nullIfBlank(),
-            alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+            alpn =  profileItem.alpn?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }.takeIf { !it.isNullOrEmpty() },
-            publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
+            echConfigList = profileItem.echConfigList.nullIfBlank(),
-            shortId = if (shortId.isNullOrEmpty()) null else shortId,
+            echForceQuery = profileItem.echForceQuery.nullIfBlank(),
-            spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
+            pinnedPeerCertSha256 = profileItem.pinnedCA256.nullIfBlank(),
-            mldsa65Verify = if (mldsa65Verify.isNullOrEmpty()) null else mldsa65Verify,
+            publicKey = profileItem.publicKey.nullIfBlank(),
+            shortId = profileItem.shortId.nullIfBlank(),
+            spiderX = profileItem.spiderX.nullIfBlank(),
+            mldsa65Verify = profileItem.mldsa65Verify.nullIfBlank(),
         )
         if (streamSettings.security == AppConfig.TLS) {
             streamSettings.tlsSettings = tlsSetting

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/FileChooserHelper.kt

@@ -0,0 +1,88 @@
+package com.v2ray.ang.helper
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import android.util.Log
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.extension.toast
+
+/**
+ * Helper for choosing and creating files using Android Storage Access Framework.
+ * Supports both file selection (ACTION_GET_CONTENT) and file creation (CreateDocument).
+ */
+class FileChooserHelper(private val activity: AppCompatActivity) {
+    private var fileChooserCallback: ((Uri?) -> Unit)? = null
+    private var documentCreateCallback: ((Uri?) -> Unit)? = null
+
+    private val fileChooserLauncher: ActivityResultLauncher<Intent> =
+        activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            val uri = result.data?.data
+            if (result.resultCode == AppCompatActivity.RESULT_OK && uri != null) {
+                fileChooserCallback?.invoke(uri)
+            } else {
+                fileChooserCallback?.invoke(null)
+            }
+            fileChooserCallback = null
+        }
+
+    private val documentCreateLauncher: ActivityResultLauncher<String> =
+        activity.registerForActivityResult(ActivityResultContracts.CreateDocument("application/zip")) { uri ->
+            documentCreateCallback?.invoke(uri)
+            documentCreateCallback = null
+        }
+
+    /**
+     * Launch file chooser with ACTION_GET_CONTENT intent to select an existing file.
+     *
+     * @param mimeType MIME type filter for files
+     * @param onResult Callback invoked with the selected file URI (null if cancelled)
+     */
+    fun launch(
+        mimeType: String = "*/*",
+        onResult: (Uri?) -> Unit
+    ) {
+        fileChooserCallback = onResult
+
+        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            type = mimeType
+            addCategory(Intent.CATEGORY_OPENABLE)
+        }
+
+        try {
+            fileChooserLauncher.launch(
+                Intent.createChooser(intent, activity.getString(R.string.title_file_chooser))
+            )
+        } catch (ex: ActivityNotFoundException) {
+            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
+            activity.toast(R.string.toast_require_file_manager)
+            fileChooserCallback?.invoke(null)
+            fileChooserCallback = null
+        }
+    }
+
+    /**
+     * Launch document creator to create a new file at user-selected location.
+     *
+     * @param fileName Default file name for the new document
+     * @param onResult Callback invoked with the created file URI (null if cancelled)
+     */
+    fun createDocument(
+        fileName: String,
+        onResult: (Uri?) -> Unit
+    ) {
+        documentCreateCallback = onResult
+        try {
+            documentCreateLauncher.launch(fileName)
+        } catch (ex: ActivityNotFoundException) {
+            Log.e(AppConfig.TAG, "Document creator activity not found", ex)
+            activity.toast(R.string.toast_require_file_manager)
+            documentCreateCallback?.invoke(null)
+            documentCreateCallback = null
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.v2ray.ang.helper
+
+import androidx.preference.PreferenceDataStore
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
+import com.v2ray.ang.handler.SettingsManager
+
+/**
+ * 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()
+        SettingsChangeManager.makeSetupGroupTab()
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.v2ray.ang.helper
+
+import android.content.pm.PackageManager
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import com.v2ray.ang.R
+import com.v2ray.ang.enums.PermissionType
+import com.v2ray.ang.extension.toast
+
+/**
+ * Helper for requesting permissions.
+ */
+class PermissionHelper(private val activity: AppCompatActivity) {
+    private var permissionCallback: ((Boolean) -> Unit)? = null
+
+    private val permissionLauncher: ActivityResultLauncher<String> =
+        activity.registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            permissionCallback?.invoke(isGranted)
+            permissionCallback = null
+        }
+
+    /**
+     * Check the permission and request it if not granted.
+     *
+     * @param permissionType the type of permission
+     * @param onGranted called when permission is granted (called immediately if already granted)
+     */
+    fun request(permissionType: PermissionType, onGranted: () -> Unit) {
+        val permission = permissionType.getPermission()
+        if (ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_GRANTED) {
+            onGranted()
+        } else {
+            permissionCallback = { isGranted ->
+                if (isGranted) {
+                    onGranted()
+                } else {
+                    val message = "${activity.getString(R.string.toast_permission_denied)}  ${permissionType.getLabel()}"
+                    activity.toast(message)
+                }
+            }
+            permissionLauncher.launch(permission)
+        }
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.v2ray.ang.helper
+
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import com.v2ray.ang.ui.ScannerActivity
+
+/**
+ * Helper for scanning QR codes.
+ *
+ * This class encapsulates the logic for launching the QR code scanner activity
+ * and handling the scan result.
+ */
+class QRCodeScannerHelper(private val activity: AppCompatActivity) {
+    private var scanCallback: ((String?) -> Unit)? = null
+
+    private val scanLauncher: ActivityResultLauncher<Intent> =
+        activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == AppCompatActivity.RESULT_OK) {
+                val scanResult = result.data?.getStringExtra("SCAN_RESULT")
+                scanCallback?.invoke(scanResult)
+            } else {
+                scanCallback?.invoke(null)
+            }
+            scanCallback = null
+        }
+
+    /**
+     * Launch the QR code scanner activity.
+     *
+     * @param onResult Callback invoked with the scan result (null if cancelled or failed)
+     */
+    fun launch(onResult: (String?) -> Unit) {
+        scanCallback = onResult
+        scanLauncher.launch(Intent(activity, ScannerActivity::class.java))
+    }
+}

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/BootReceiver.kt

@@ -3,6 +3,8 @@ package com.v2ray.ang.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.util.Log
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2RayServiceManager
 
@@ -16,8 +18,24 @@ class BootReceiver : BroadcastReceiver() {
      * @param intent The Intent being received.
      */
     override fun onReceive(context: Context?, intent: Intent?) {
-        if (context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) return
+        Log.i(AppConfig.TAG, "BootReceiver received: ${intent?.action}")
-        if (!MmkvManager.decodeStartOnBoot() || MmkvManager.getSelectServer().isNullOrEmpty()) return
+
+        if (context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) {
+            Log.w(AppConfig.TAG, "BootReceiver: Invalid context or action")
+            return
+        }
+
+        if (!MmkvManager.decodeStartOnBoot()) {
+            Log.i(AppConfig.TAG, "BootReceiver: Auto-start on boot is disabled")
+            return
+        }
+
+        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+            Log.w(AppConfig.TAG, "BootReceiver: No server selected")
+            return
+        }
+
+        Log.i(AppConfig.TAG, "BootReceiver: Starting V2Ray service")
         V2RayServiceManager.startVService(context)
     }
 }

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
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.contracts.Tun2SocksControl
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
 import java.io.File
@@ -37,17 +38,17 @@ class TProxyService(
      * Starts the tun2socks process with the appropriate parameters.
      */
     override fun startTun2Socks() {
-        Log.i(AppConfig.TAG, "Starting HevSocks5Tunnel via JNI")
+//        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.i(AppConfig.TAG, "Config file created: ${configFile.absolutePath}")
-        Log.d(AppConfig.TAG, "Config content:\n$configContent")
+        Log.d(AppConfig.TAG, "HevSocks5Tunnel Config content:\n$configContent")
 
         try {
-            Log.i(AppConfig.TAG, "TProxyStartService...")
+//            Log.i(AppConfig.TAG, "TProxyStartService...")
             TProxyStartService(configFile.absolutePath, vpnInterface.fd)
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "HevSocks5Tunnel exception: ${e.message}")
@@ -62,7 +63,7 @@ class TProxyService(
             appendLine("  mtu: ${SettingsManager.getVpnMtu()}")
             appendLine("  ipv4: ${vpnConfig.ipv4Client}")
 
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
                 appendLine("  ipv6: '${vpnConfig.ipv6Client}'")
             }
 

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

@@ -1,128 +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.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-
-/**
- * Manages the tun2socks process that handles VPN traffic
- */
-class Tun2SocksService(
-    private val context: Context,
-    private val vpnInterface: ParcelFileDescriptor,
-    private val isRunningProvider: () -> Boolean,
-    private val restartCallback: () -> Unit
-) : Tun2SocksControl {
-    companion object {
-        private const val TUN2SOCKS = "libtun2socks.so"
-    }
-
-    private lateinit var process: Process
-
-    /**
-     * Starts the tun2socks process with the appropriate parameters.
-     */
-    override fun startTun2Socks() {
-        Log.i(AppConfig.TAG, "Start run $TUN2SOCKS")
-        val socksPort = SettingsManager.getSocksPort()
-        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
-        val cmd = arrayListOf(
-            File(context.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-            "--netif-ipaddr", vpnConfig.ipv4Router,
-            "--netif-netmask", "255.255.255.252",
-            "--socks-server-addr", "${AppConfig.LOOPBACK}:${socksPort}",
-            "--tunmtu", SettingsManager.getVpnMtu().toString(),
-            "--sock-path", "sock_path",
-            "--enable-udprelay",
-            "--loglevel", "notice"
-        )
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
-            cmd.add("--netif-ip6addr")
-            cmd.add(vpnConfig.ipv6Router)
-        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
-            val localDnsPort = Utils.parseInt(
-                MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), 
-                AppConfig.PORT_LOCAL_DNS.toInt()
-            )
-            cmd.add("--dnsgw")
-            cmd.add("${AppConfig.LOOPBACK}:${localDnsPort}")
-        }
-        Log.i(AppConfig.TAG, cmd.toString())
-
-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(context.filesDir)
-                .start()
-            Thread {
-                Log.i(AppConfig.TAG, "$TUN2SOCKS check")
-                process.waitFor()
-                Log.i(AppConfig.TAG, "$TUN2SOCKS exited")
-                if (isRunningProvider()) {
-                    Log.i(AppConfig.TAG, "$TUN2SOCKS restart")
-                    restartCallback()
-                }
-            }.start()
-            Log.i(AppConfig.TAG, "$TUN2SOCKS process info: $process")
-
-            sendFd()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to start $TUN2SOCKS process", e)
-        }
-    }
-
-    /**
-     * Sends the file descriptor to the tun2socks process.
-     * Attempts to send the file descriptor multiple times if necessary.
-     */
-    private fun sendFd() {
-        val fd = vpnInterface.fileDescriptor
-        val path = File(context.filesDir, "sock_path").absolutePath
-        Log.i(AppConfig.TAG, "LocalSocket path: $path")
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var tries = 0
-            while (true) try {
-                Thread.sleep(50L shl tries)
-                Log.i(AppConfig.TAG, "LocalSocket sendFd tries: $tries")
-                LocalSocket().use { localSocket ->
-                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
-                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
-                    localSocket.outputStream.write(42)
-                }
-                break
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to send file descriptor, try: $tries", e)
-                if (tries > 5) break
-                tries += 1
-            }
-        }
-    }
-
-    /**
-     * Stops the tun2socks process
-     */
-    override fun stopTun2Socks() {
-        try {
-            Log.i(AppConfig.TAG, "$TUN2SOCKS destroy")
-            if (::process.isInitialized) {
-                process.destroy()
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to destroy $TUN2SOCKS process", e)
-        }
-    }
-}

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

@@ -3,9 +3,10 @@ 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 android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.contracts.ServiceControl
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper
@@ -17,6 +18,7 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
      */
     override fun onCreate() {
         super.onCreate()
+        Log.i(AppConfig.TAG, "StartCore-Proxy: Service created")
         V2RayServiceManager.serviceControl = SoftReference(this)
     }
 
@@ -28,7 +30,8 @@ class V2RayProxyOnlyService : Service(), ServiceControl {
      * @return The start mode.
      */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startCoreLoop()
+        Log.i(AppConfig.TAG, "StartCore-Proxy: Service command received")
+        V2RayServiceManager.startCoreLoop(null)
         return START_STICKY
     }
 
@@ -84,7 +87,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,27 @@ 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.TestServiceMessage
-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.V2RayNativeManager
-import com.v2ray.ang.handler.SpeedtestManager
-import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.Utils
+import java.util.Collections
-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
 
 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)
+        V2RayNativeManager.initCoreEnv(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)
     }
 
     /**
@@ -69,23 +36,54 @@ class V2RayTestService : Service() {
     }
 
     /**
-     * Starts the real ping test.
+     * Cleans up resources when the service is destroyed.
-     * @param guid The GUID of the configuration.
-     * @return The ping result.
      */
-    private fun startRealPing(guid: String): Long {
+    override fun onDestroy() {
-        val retFailure = -1L
+        super.onDestroy()
-
+        // cancel any active workers
-        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
+        val snapshot = ArrayList(activeWorkers)
-        if (config.configType == EConfigType.HYSTERIA2) {
+        snapshot.forEach { it.cancel() }
-            val delay = PluginServiceManager.realPingHy2(this, config)
+        activeWorkers.clear()
-            return delay
-        } else {
-            val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(this, guid)
-            if (!configResult.status) {
-                return retFailure
-            }
-            return SpeedtestManager.realPing(configResult.content)
-        }
     }
-}
+
+    /**
+     * 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 {
+        val message = intent?.serializable<TestServiceMessage>("content") ?: return super.onStartCommand(intent, flags, startId)
+        when (message.key) {
+            MSG_MEASURE_CONFIG -> {
+                val guidsList = if (message.serverGuids.isNotEmpty()) {
+                    message.serverGuids
+                } else if (message.subscriptionId.isNotEmpty()) {
+                    MmkvManager.decodeServerList(message.subscriptionId)
+                } else {
+                    MmkvManager.decodeAllServerList()
+                }
+
+                if (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

@@ -1,5 +1,6 @@
 package com.v2ray.ang.service
 
+import android.annotation.SuppressLint
 import android.app.Service
 import android.content.Context
 import android.content.Intent
@@ -18,6 +19,8 @@ import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.contracts.ServiceControl
+import com.v2ray.ang.contracts.Tun2SocksControl
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.NotificationManager
 import com.v2ray.ang.handler.SettingsManager
@@ -26,6 +29,7 @@ import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
 
+@SuppressLint("VpnServicePolicy")
 class V2RayVpnService : VpnService(), ServiceControl {
     private lateinit var mInterface: ParcelFileDescriptor
     private var isRunning = false
@@ -70,13 +74,15 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onCreate() {
         super.onCreate()
+        Log.i(AppConfig.TAG, "StartCore-VPN: Service created")
         val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
         V2RayServiceManager.serviceControl = SoftReference(this)
     }
 
     override fun onRevoke() {
-        stopV2Ray()
+        Log.w(AppConfig.TAG, "StartCore-VPN: Permission revoked")
+        stopAllService()
     }
 
 //    override fun onLowMemory() {
@@ -86,13 +92,14 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onDestroy() {
         super.onDestroy()
+        Log.i(AppConfig.TAG, "StartCore-VPN: Service destroyed")
         NotificationManager.cancelNotification()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (V2RayServiceManager.startCoreLoop()) {
+        Log.i(AppConfig.TAG, "StartCore-VPN: Service command received")
-            startService()
+        setupVpnService()
-        }
+        startService()
         return START_STICKY
         //return super.onStartCommand(intent, flags, startId)
     }
@@ -102,18 +109,25 @@ class V2RayVpnService : VpnService(), ServiceControl {
     }
 
     override fun startService() {
-        setupService()
+        if (!::mInterface.isInitialized) {
+            Log.e(AppConfig.TAG, "StartCore-VPN: Interface not initialized")
+            return
+        }
+        if (!V2RayServiceManager.startCoreLoop(mInterface)) {
+            Log.e(AppConfig.TAG, "StartCore-VPN: Failed to start core loop")
+            stopAllService()
+            return
+        }
     }
 
     override fun stopService() {
-        stopV2Ray(true)
+        stopAllService(true)
     }
 
     override fun vpnProtect(socket: Int): Boolean {
         return protect(socket)
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
             MyContextWrapper.wrap(newBase, SettingsManager.getLocale())
@@ -125,13 +139,17 @@ 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) {
+            Log.e(AppConfig.TAG, "StartCore-VPN: Permission not granted")
+            stopSelf()
             return
         }
 
         if (configureVpnService() != true) {
+            Log.e(AppConfig.TAG, "StartCore-VPN: Configuration failed")
+            stopSelf()
             return
         }
 
@@ -153,9 +171,11 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
         // Close the old interface since the parameters have been changed
         try {
-            mInterface.close()
+            if (::mInterface.isInitialized) {
-        } catch (ignored: Exception) {
+                mInterface.close()
-            // ignored
+            }
+        } catch (e: Exception) {
+            Log.w(AppConfig.TAG, "Failed to close old interface", e)
         }
 
         // Configure platform-specific features
@@ -168,7 +188,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             return true
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
-            stopV2Ray()
+            stopAllService()
         }
         return false
     }
@@ -232,7 +252,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             try {
                 connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
             } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to request default network", e)
+                Log.e(AppConfig.TAG, "StartCore-VPN: Failed to request network", e)
             }
         }
 
@@ -285,7 +305,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                     builder.addAllowedApplication(it)
                 }
             } catch (e: PackageManager.NameNotFoundException) {
-                Log.e(AppConfig.TAG, "Failed to configure app in VPN: ${e.localizedMessage}", e)
+                Log.e(AppConfig.TAG, "StartCore-VPN: Failed to configure app", e)
             }
         }
     }
@@ -295,7 +315,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
      * Starts the tun2socks process with the appropriate parameters.
      */
     private fun runTun2socks() {
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL, true) == true) {
+        if (SettingsManager.isUsingHevTun()) {
             tun2SocksService = TProxyService(
                 context = applicationContext,
                 vpnInterface = mInterface,
@@ -303,22 +323,13 @@ class V2RayVpnService : VpnService(), ServiceControl {
                 restartCallback = { runTun2socks() }
             )
         } else {
-            tun2SocksService = Tun2SocksService(
+            tun2SocksService = null
-                context = applicationContext,
-                vpnInterface = mInterface,
-                isRunningProvider = { isRunning },
-                restartCallback = { runTun2socks() }
-            )
         }
 
         tun2SocksService?.startTun2Socks()
     }
 
-    /**
+    private fun stopAllService(isForced: Boolean = true) {
-     * Stops the V2Ray service.
-     * @param isForced Whether to force stop the service.
-     */
-    private fun stopV2Ray(isForced: Boolean = true) {
 //        val configName = defaultDPreference.getPrefString(PREF_CURR_CONFIG_GUID, "")
 //        val emptyInfo = VpnNetworkInfo()
 //        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
@@ -327,8 +338,8 @@ class V2RayVpnService : VpnService(), ServiceControl {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             try {
                 connectivity.unregisterNetworkCallback(defaultNetworkCallback)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
-                // ignored
+                Log.w(AppConfig.TAG, "StartCore-VPN: Failed to unregister callback", e)
             }
         }
 
@@ -346,9 +357,11 @@ class V2RayVpnService : VpnService(), ServiceControl {
             stopSelf()
 
             try {
-                mInterface.close()
+                if (::mInterface.isInitialized) {
+                    mInterface.close()
+                }
             } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to close VPN interface", e)
+                Log.e(AppConfig.TAG, "StartCore-VPN: Failed to close interface", e)
             }
         }
     }

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.handler.V2RayNativeManager
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.ZipUtil
-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)
+        //setContentView(binding.root)
-
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_about))
-        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)
-            }
-        }
 
         binding.layoutSoureCcode.setOnClickListener {
             Utils.openUri(this, AppConfig.APP_URL)
@@ -124,81 +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
         }
         BuildConfig.APPLICATION_ID.also {
             binding.tvAppId.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, "")
-        }
-    }
-
-    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,314 @@
+package com.v2ray.ang.ui
+
+import android.app.AlertDialog
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+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.toastError
+import com.v2ray.ang.extension.toastSuccess
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsChangeManager
+import com.v2ray.ang.handler.SettingsManager
+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 : HelperBaseActivity() {
+    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)
+    }
+
+
+    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()
+
+        SettingsManager.initApp(this)
+        return count > 0
+    }
+
+    private fun showFileChooser() {
+        launchFileChooser { uri ->
+            if (uri == null) {
+                return@launchFileChooser
+            }
+            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"
+
+        launchCreateDocument(defaultFileName) { 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)
+                }
+            }
+        }
+    }
+
+    private fun restoreViaLocal() {
+        showFileChooser()
+    }
+
+    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,24 +1,45 @@
 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)
         if (!Utils.getDarkModeStatus(this)) {
             WindowCompat.getInsetsController(window, window.decorView).apply {
@@ -27,6 +48,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 +68,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.
+     * This is a convenience helper that constructs a [CustomDividerItemDecoration]
-     * @param context       The context used to access resources.
+     * using the given drawable resource id and adds it to the RecyclerView.
-     * @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).
+     * @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 +103,114 @@ 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)
+        //setContentView(binding.root)
-
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.update_check_for_update))
-        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,22 @@
+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)
+    override fun getItemId(position: Int): Long = groups[position].id.hashCode().toLong()
+    override fun containsItem(itemId: Long): Boolean = groups.any { it.id.hashCode().toLong() == itemId }
+
+    @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,319 @@
+package com.v2ray.ang.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
+import com.v2ray.ang.contracts.MainAdapterListener
+import com.v2ray.ang.databinding.FragmentGroupServerBinding
+import com.v2ray.ang.databinding.ItemQrcodeBinding
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.extension.toast
+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.MainViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class GroupServerFragment : BaseFragment<FragmentGroupServerBinding>(),
+    SwipeRefreshLayout.OnRefreshListener {
+    private val ownerActivity: MainActivity
+        get() = requireActivity() as MainActivity
+    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() }
+
+    private val share_method: Array<out String> by lazy {
+        ownerActivity.resources.getStringArray(R.array.share_method)
+    }
+    private val share_method_more: Array<out String> by lazy {
+        ownerActivity.resources.getStringArray(R.array.share_method_more)
+    }
+
+    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(mainViewModel, ActivityAdapterListener())
+        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)
+
+        binding.refreshLayout.setOnRefreshListener(this)
+        // Set the distance to trigger sync to 160dp
+        binding.refreshLayout.setDistanceToTriggerSync((160 * resources.displayMetrics.density).toInt())
+
+        mainViewModel.updateListAction.observe(viewLifecycleOwner) { index ->
+            if (mainViewModel.subscriptionId != subId) {
+                return@observe
+            }
+            // Log.d(TAG, "GroupServerFragment updateListAction subId=$subId")
+            adapter.setData(mainViewModel.serversCache, index)
+        }
+
+        // Log.d(TAG, "GroupServerFragment onViewCreated: subId=$subId")
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mainViewModel.subscriptionIdChanged(subId)
+    }
+
+    /**
+     * Shares server configuration
+     * Displays a dialog with sharing options and executes the selected action
+     * @param guid The server unique identifier
+     * @param profile The server configuration
+     * @param position The position in the list
+     * @param shareOptions The list of share options
+     * @param skip The number of options to skip
+     */
+    private fun shareServer(guid: String, profile: ProfileItem, position: Int, shareOptions: List<String>, skip: Int) {
+        AlertDialog.Builder(ownerActivity).setItems(shareOptions.toTypedArray()) { _, i ->
+            try {
+                when (i + skip) {
+                    0 -> showQRCode(guid)
+                    1 -> share2Clipboard(guid)
+                    2 -> shareFullContent(guid)
+                    3 -> editServer(guid, profile)
+                    4 -> removeServer(guid, position)
+                    else -> ownerActivity.toast("else")
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Error when sharing server", e)
+            }
+        }.show()
+    }
+
+    /**
+     * Displays QR code for the server configuration
+     * @param guid The server unique identifier
+     */
+    private fun showQRCode(guid: String) {
+        val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(ownerActivity))
+        ivBinding.ivQcode.setImageBitmap(AngConfigManager.share2QRCode(guid))
+        if (share_method.isNotEmpty()) {
+            ivBinding.ivQcode.contentDescription = share_method[0]
+        } else {
+            ivBinding.ivQcode.contentDescription = "QR Code"
+        }
+        AlertDialog.Builder(ownerActivity).setView(ivBinding.root).show()
+    }
+
+    /**
+     * Shares server configuration to clipboard
+     * @param guid The server unique identifier
+     */
+    private fun share2Clipboard(guid: String) {
+        if (AngConfigManager.share2Clipboard(ownerActivity, guid) == 0) {
+            ownerActivity.toastSuccess(R.string.toast_success)
+        } else {
+            ownerActivity.toastError(R.string.toast_failure)
+        }
+    }
+
+    /**
+     * Shares full server configuration content to clipboard
+     * @param guid The server unique identifier
+     */
+    private fun shareFullContent(guid: String) {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val result = AngConfigManager.shareFullContent2Clipboard(ownerActivity, guid)
+            launch(Dispatchers.Main) {
+                if (result == 0) {
+                    ownerActivity.toastSuccess(R.string.toast_success)
+                } else {
+                    ownerActivity.toastError(R.string.toast_failure)
+                }
+            }
+        }
+    }
+
+    /**
+     * Edits server configuration
+     * Opens appropriate editing interface based on configuration type
+     * @param guid The server unique identifier
+     * @param profile The server configuration
+     */
+    private fun editServer(guid: String, profile: ProfileItem) {
+        val intent = Intent().putExtra("guid", guid)
+            .putExtra("isRunning", mainViewModel.isRunning.value)
+            .putExtra("createConfigType", profile.configType.value)
+            .putExtra("subscriptionId", subId)
+        when (profile.configType) {
+            EConfigType.CUSTOM -> {
+                ownerActivity.startActivity(intent.setClass(ownerActivity, ServerCustomConfigActivity::class.java))
+            }
+
+            EConfigType.POLICYGROUP -> {
+                ownerActivity.startActivity(intent.setClass(ownerActivity, ServerGroupActivity::class.java))
+            }
+
+            else -> {
+                ownerActivity.startActivity(intent.setClass(ownerActivity, ServerActivity::class.java))
+            }
+        }
+    }
+
+    /**
+     * Removes server configuration
+     * Handles confirmation dialog and related checks
+     * @param guid The server unique identifier
+     * @param position The position in the list
+     */
+    private fun removeServer(guid: String, position: Int) {
+        if (guid == MmkvManager.getSelectServer()) {
+            ownerActivity.toast(R.string.toast_action_not_allowed)
+            return
+        }
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE)) {
+            AlertDialog.Builder(ownerActivity).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)
+        }
+    }
+
+    /**
+     * Executes the actual server removal process
+     * @param guid The server unique identifier
+     * @param position The position in the list
+     */
+    private fun removeServerSub(guid: String, position: Int) {
+        mainViewModel.removeServer(guid)
+        adapter.removeServerSub(guid, position)
+    }
+
+    /**
+     * Sets the selected server
+     * Updates UI and restarts service if needed
+     * @param guid The server unique identifier to select
+     */
+    private fun setSelectServer(guid: String) {
+        val selected = MmkvManager.getSelectServer()
+        if (guid != selected) {
+            MmkvManager.setSelectServer(guid)
+            val fromPosition = mainViewModel.getPosition(selected.orEmpty())
+            val toPosition = mainViewModel.getPosition(guid)
+            adapter.setSelectServer(fromPosition, toPosition)
+
+            if (mainViewModel.isRunning.value == true) {
+                ownerActivity.restartV2Ray()
+            }
+        }
+    }
+
+    private inner class ActivityAdapterListener : MainAdapterListener {
+        override fun onEdit(guid: String, position: Int) {
+        }
+
+        override fun onShare(url: String) {
+        }
+
+        override fun onRefreshData() {
+        }
+
+        override fun onRemove(guid: String, position: Int) {
+            removeServer(guid, position)
+        }
+
+        override fun onEdit(guid: String, position: Int, profile: ProfileItem) {
+            editServer(guid, profile)
+        }
+
+        override fun onSelectServer(guid: String) {
+            setSelectServer(guid)
+        }
+
+        override fun onShare(guid: String, profile: ProfileItem, position: Int, more: Boolean) {
+            val isCustom = profile.configType == EConfigType.CUSTOM || profile.configType == EConfigType.POLICYGROUP
+
+            val (shareOptions, skip) = if (more) {
+                val options = if (isCustom) share_method_more.asList().takeLast(3) else share_method_more.asList()
+                options to if (isCustom) 2 else 0
+            } else {
+                val options = if (isCustom) share_method.asList().takeLast(1) else share_method.asList()
+                options to if (isCustom) 2 else 0
+            }
+
+            shareServer(guid, profile, position, shareOptions, skip)
+        }
+    }
+
+    override fun onRefresh() {
+        ownerActivity.importConfigViaSub()
+        binding.refreshLayout.isRefreshing = false
+    }
+
+    /**
+     * Scrolls to the currently selected server in the RecyclerView
+     */
+    fun scrollToSelectedServer() {
+        val selectedGuid = MmkvManager.getSelectServer()
+        if (selectedGuid.isNullOrEmpty()) {
+            ownerActivity.toast(R.string.title_file_chooser)
+            return
+        }
+
+        // Find the position of the selected server
+        val serversCache = mainViewModel.serversCache
+        val position = serversCache.indexOfFirst { it.guid == selectedGuid }
+        val recyclerView = binding.recyclerView
+
+        if (position >= 0) {
+            // Get the layout manager
+            val layoutManager = recyclerView.layoutManager as? GridLayoutManager
+
+            if (layoutManager != null) {
+                // Scroll to position with offset to center it on screen
+                // First scroll to position, then adjust to center
+                recyclerView.post {
+                    layoutManager.scrollToPositionWithOffset(position, recyclerView.height / 3)
+                }
+            } else {
+                // Fallback to smooth scroll if layout manager is not GridLayoutManager
+                recyclerView.smoothScrollToPosition(position)
+            }
+        } else {
+            ownerActivity.toast(R.string.toast_server_not_found_in_group)
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.v2ray.ang.ui
+
+import android.net.Uri
+import android.os.Bundle
+import com.v2ray.ang.enums.PermissionType
+import com.v2ray.ang.helper.FileChooserHelper
+import com.v2ray.ang.helper.PermissionHelper
+import com.v2ray.ang.helper.QRCodeScannerHelper
+
+/**
+ * HelperBaseActivity extends BaseActivity and provides additional helpers for
+ * activities that need file chooser, permission requesting, or QR code scanning functionality.
+ *
+ * Activities that don't need these features should extend BaseActivity directly.
+ * Activities that need file selection, permissions, or QR code scanning should extend this class.
+ *
+ * Additional Responsibilities:
+ * - Provide file chooser helpers for selecting and creating files.
+ * - Provide permission request helpers with callbacks.
+ * - Provide QR code scanning helpers with camera permission handling.
+ */
+abstract class HelperBaseActivity : BaseActivity() {
+    private lateinit var fileChooser : FileChooserHelper
+    private lateinit var permissionRequester : PermissionHelper
+    private lateinit var qrCodeScanner : QRCodeScannerHelper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        fileChooser = FileChooserHelper(this)
+        permissionRequester = PermissionHelper(this)
+        qrCodeScanner = QRCodeScannerHelper(this)
+    }
+
+    /**
+     * Check if permission is granted and request it if not.
+     * Convenience method that delegates to permissionRequester.
+     *
+     * @param permissionType The type of permission to check and request
+     * @param onGranted Callback to execute when permission is granted
+     */
+    protected fun checkAndRequestPermission(
+        permissionType: PermissionType,
+        onGranted: () -> Unit
+    ) {
+        permissionRequester.request(permissionType, onGranted)
+    }
+
+    /**
+     * Launch file chooser with ACTION_GET_CONTENT intent.
+     * Convenience method that delegates to fileChooser helper.
+     *
+     * @param mimeType MIME type filter for files
+     * @param onResult Callback invoked with the selected file URI (null if cancelled)
+     */
+    protected fun launchFileChooser(
+        mimeType: String = "*/*",
+        onResult: (Uri?) -> Unit
+    ) {
+        checkAndRequestPermission(PermissionType.READ_STORAGE) {
+            fileChooser.launch(mimeType, onResult)
+        }
+    }
+
+    /**
+     * Launch document creator to create a new file at user-selected location.
+     * Convenience method that delegates to fileChooser helper.
+     * Note: No permission check needed as CreateDocument uses Storage Access Framework.
+     *
+     * @param fileName Default file name for the new document
+     * @param onResult Callback invoked with the created file URI (null if cancelled)
+     */
+    protected fun launchCreateDocument(
+        fileName: String,
+        onResult: (Uri?) -> Unit
+    ) {
+        fileChooser.createDocument(fileName, onResult)
+    }
+
+    /**
+     * Launch QR code scanner with camera permission check.
+     * Convenience method that delegates to qrCodeScanner helper.
+     *
+     * @param onResult Callback invoked with the scan result string (null if cancelled or failed)
+     */
+    protected fun launchQRCodeScanner(onResult: (String?) -> Unit) {
+        checkAndRequestPermission(PermissionType.CAMERA) {
+            qrCodeScanner.launch(onResult)
+        }
+    }
+}

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

@@ -2,37 +2,33 @@ package com.v2ray.ang.ui
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
+import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.util.Utils
+import com.v2ray.ang.viewmodel.LogcatViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.IOException
-
 
 class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
     private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
-
+    private val viewModel: LogcatViewModel by viewModels()
-    private var logsetsAll: MutableList<String> = mutableListOf()
+    private lateinit var adapter: LogcatRecyclerAdapter
-    var logsets: MutableList<String> = mutableListOf()
-    private val adapter by lazy { LogcatRecyclerAdapter(this) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.title_logcat))
 
-        title = getString(R.string.title_logcat)
+        adapter = LogcatRecyclerAdapter(viewModel, ::onLogLongClick)
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -41,58 +37,12 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
 
         binding.refreshLayout.setOnRefreshListener(this)
 
-        logsets.add(getString(R.string.pull_down_to_refresh))
+        toast(getString(R.string.pull_down_to_refresh))
     }
 
-    private fun getLogcat() {
+    private fun onLogLongClick(log: String): Boolean {
-
+        Utils.setClipboard(this, log)
-        try {
+        return true
-            binding.refreshLayout.isRefreshing = true
-
-            lifecycleScope.launch(Dispatchers.Default) {
-                val lst = LinkedHashSet<String>()
-                lst.add("logcat")
-                lst.add("-d")
-                lst.add("-v")
-                lst.add("time")
-                lst.add("-s")
-                lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err")
-                val process = withContext(Dispatchers.IO) {
-                    Runtime.getRuntime().exec(lst.toTypedArray())
-                }
-
-                val allText = process.inputStream.bufferedReader().use { it.readLines() }.reversed()
-                launch(Dispatchers.Main) {
-                    logsetsAll = allText.toMutableList()
-                    logsets = allText.toMutableList()
-                    refreshData()
-                    binding.refreshLayout.isRefreshing = false
-                }
-            }
-        } catch (e: IOException) {
-            Log.e(AppConfig.TAG, "Failed to get logcat", e)
-        }
-    }
-
-    private fun clearLogcat() {
-        try {
-            lifecycleScope.launch(Dispatchers.Default) {
-                val lst = LinkedHashSet<String>()
-                lst.add("logcat")
-                lst.add("-c")
-                withContext(Dispatchers.IO) {
-                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
-                    process.waitFor()
-                }
-                launch(Dispatchers.Main) {
-                    logsetsAll.clear()
-                    logsets.clear()
-                    refreshData()
-                }
-            }
-        } catch (e: IOException) {
-            Log.e(AppConfig.TAG, "Failed to clear logcat", e)
-        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -105,12 +55,14 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
                 override fun onQueryTextSubmit(query: String?): Boolean = false
 
                 override fun onQueryTextChange(newText: String?): Boolean {
-                    filterLogs(newText)
+                    viewModel.filter(newText)
+                    refreshData()
                     return false
                 }
             })
             searchView.setOnCloseListener {
-                filterLogs("")
+                viewModel.filter("")
+                refreshData()
                 false
             }
         }
@@ -120,33 +72,33 @@ class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         R.id.copy_all -> {
-            Utils.setClipboard(this, logsets.joinToString("\n"))
+            val all = viewModel.getAll().joinToString("\n")
+            Utils.setClipboard(this, all)
             toastSuccess(R.string.toast_success)
             true
         }
 
         R.id.clear_all -> {
-            clearLogcat()
+            lifecycleScope.launch(Dispatchers.IO) {
+                viewModel.clearLogcat()
+                withContext(Dispatchers.Main) {
+                    refreshData()
+                }
+            }
             true
         }
 
         else -> super.onOptionsItemSelected(item)
     }
 
-    private fun filterLogs(content: String?): Boolean {
-        val key = content?.trim()
-        logsets = if (key.isNullOrEmpty()) {
-            logsetsAll.toMutableList()
-        } else {
-            logsetsAll.filter { it.contains(key) }.toMutableList()
-        }
-
-        refreshData()
-        return true
-    }
-
     override fun onRefresh() {
-        getLogcat()
+        lifecycleScope.launch(Dispatchers.IO) {
+            viewModel.loadLogcat()
+            withContext(Dispatchers.Main) {
+                binding.refreshLayout.isRefreshing = false
+                refreshData()
+            }
+        }
     }
 
     @SuppressLint("NotifyDataSetChanged")

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

@@ -6,16 +6,20 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.databinding.ItemRecyclerLogcatBinding
+import com.v2ray.ang.viewmodel.LogcatViewModel
 
-class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
+class LogcatRecyclerAdapter(
-    private var mActivity: LogcatActivity = activity
+    private val viewModel: LogcatViewModel,
+    private val onLongClick: ((String) -> Boolean)? = null
+) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
 
-
+    override fun getItemCount() = viewModel.getAll().size
-    override fun getItemCount() = mActivity.logsets.size
 
     override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
         try {
-            val log = mActivity.logsets[position]
+            val logs = viewModel.getAll()
+            val log = logs[position]
+
             if (log.isEmpty()) {
                 holder.itemSubSettingBinding.logTag.text = ""
                 holder.itemSubSettingBinding.logContent.text = ""
@@ -24,6 +28,10 @@ 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 {
+                onLongClick?.invoke(log) ?: false
+            }
         } 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,13 +1,9 @@
 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
 import android.net.Uri
 import android.net.VpnService
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
@@ -23,21 +19,19 @@ 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
 import com.v2ray.ang.databinding.ActivityMainBinding
-import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.PermissionType
 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.SettingsManager
 import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
@@ -46,143 +40,47 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
+class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelectedListener {
     private val binding by lazy {
         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()) {
+    private val requestActivityLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        initGroupTab()
+        if (SettingsChangeManager.consumeRestartService() && mainViewModel.isRunning.value == true) {
-    }
+            restartV2Ray()
-    private val tabGroupListener = object : TabLayout.OnTabSelectedListener {
-        override fun onTabSelected(tab: TabLayout.Tab?) {
-            val selectId = tab?.tag.toString()
-            if (selectId != mainViewModel.subscriptionId) {
-                mainViewModel.subscriptionIdChanged(selectId)
-            }
         }
-
+        if (SettingsChangeManager.consumeSetupGroupTab()) {
-        override fun onTabUnselected(tab: TabLayout.Tab?) {
+            setupGroupTab()
-        }
-
-        override fun onTabReselected(tab: TabLayout.Tab?) {
-        }
-    }
-    private var mItemTouchHelper: ItemTouchHelper? = null
-    val mainViewModel: MainViewModel by viewModels()
-
-    // register activity result for requesting permission
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                when (pendingAction) {
-                    Action.IMPORT_QR_CODE_CONFIG ->
-                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-
-                    Action.READ_CONTENT_FROM_URI ->
-                        chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
-                            type = "*/*"
-                            addCategory(Intent.CATEGORY_OPENABLE)
-                        }, getString(R.string.title_file_chooser)))
-
-                    Action.POST_NOTIFICATIONS -> {}
-                    else -> {}
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-            pendingAction = Action.NONE
-        }
-
-    private var pendingAction: Action = Action.NONE
-
-    enum class Action {
-        NONE,
-        IMPORT_QR_CODE_CONFIG,
-        READ_CONTENT_FROM_URI,
-        POST_NOTIFICATIONS
-    }
-
-    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            readContentFromUri(uri)
         }
     }
 
-    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        title = getString(R.string.title_server)
+        setupToolbar(binding.toolbar, false, getString(R.string.title_server))
-        setSupportActionBar(binding.toolbar)
 
-        binding.fab.setOnClickListener {
+        // setup viewpager and tablayout
-            if (mainViewModel.isRunning.value == true) {
+        groupPagerAdapter = GroupPagerAdapter(this, emptyList())
-                V2RayServiceManager.stopVService(this)
+        binding.viewPager.adapter = groupPagerAdapter
-            } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
+        binding.viewPager.isUserInputEnabled = true
-                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 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,74 +92,70 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 }
             }
         })
+
+        binding.fab.setOnClickListener { handleFabAction() }
+        binding.fabLocate.setOnClickListener { locateSelectedServer() }
+        binding.layoutTest.setOnClickListener { handleLayoutTestClick() }
+
+        setupGroupTab()
+        setupViewModel()
+        mainViewModel.reloadServerList()
+
+        checkAndRequestPermission(PermissionType.POST_NOTIFICATIONS) {
+        }
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private fun setupViewModel() {
-        mainViewModel.updateListAction.observe(this) { index ->
-            if (index >= 0) {
-                adapter.notifyItemChanged(index)
-            } else {
-                adapter.notifyDataSetChanged()
-            }
-        }
         mainViewModel.updateTestResultAction.observe(this) { setTestState(it) }
         mainViewModel.isRunning.observe(this) { isRunning ->
-            adapter.isRunning = isRunning
+            applyRunningState(false, isRunning)
-            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
-            }
         }
         mainViewModel.startListenBroadcast()
         mainViewModel.initAssets(assets)
     }
 
-    private fun migrateLegacy() {
+    private fun setupGroupTab() {
-        lifecycleScope.launch(Dispatchers.IO) {
+        val groups = mainViewModel.getSubscriptions(this)
-            val result = MigrateManager.migrateServerConfig2Profile()
+        groupPagerAdapter.update(groups)
-            launch(Dispatchers.Main) {
-                if (result) {
-                    toast(getString(R.string.migration_success))
-                    mainViewModel.reloadServerList()
-                } else {
-                    //toast(getString(R.string.migration_fail))
-                }
-            }
 
+        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 (SettingsManager.isVpnMode()) {
+            val intent = VpnService.prepare(this)
+            if (intent == null) {
+                startV2Ray()
+            } else {
+                requestVpnPermission.launch(intent)
+            }
+        } else {
+            startV2Ray()
         }
     }
 
-    private fun initGroupTab() {
+    private fun handleLayoutTestClick() {
-        binding.tabGroup.removeOnTabSelectedListener(tabGroupListener)
+        if (mainViewModel.isRunning.value == true) {
-        binding.tabGroup.removeAllTabs()
+            setTestState(getString(R.string.connection_test_testing))
-        binding.tabGroup.isVisible = false
+            mainViewModel.testCurrentServerRealPing()
-
+        } else {
-        val (listId, listRemarks) = mainViewModel.getSubscriptions(this)
+            // service not running: keep existing no-op (could show a message if desired)
-        if (listId == null || listRemarks == null) {
-            return
         }
-
-        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() {
@@ -272,7 +166,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         V2RayServiceManager.startVService(this)
     }
 
-    private fun restartV2Ray() {
+    fun restartV2Ray() {
         if (mainViewModel.isRunning.value == true) {
             V2RayServiceManager.stopVService(this)
         }
@@ -282,12 +176,36 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
     }
 
-    public override fun onResume() {
+    private fun setTestState(content: String?) {
-        super.onResume()
+        binding.tvTestState.text = content
-        mainViewModel.reloadServerList()
     }
 
-    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()
     }
 
@@ -330,6 +248,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
@@ -387,14 +310,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
-        R.id.intelligent_selection_all -> {
-            if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") != "0") {
-                toast(getString(R.string.pre_resolving_domain))
-            }
-            mainViewModel.createIntelligentSelectionAll()
-            true
-        }
-
         R.id.service_restart -> {
             restartV2Ray()
             true
@@ -430,24 +345,30 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importManually(createConfigType: Int) {
-        startActivity(
+        if (createConfigType == EConfigType.POLICYGROUP.value) {
-            Intent()
+            startActivity(
-                .putExtra("createConfigType", createConfigType)
+                Intent()
-                .putExtra("subscriptionId", mainViewModel.subscriptionId)
+                    .putExtra("subscriptionId", mainViewModel.subscriptionId)
-                .setClass(this, ServerActivity::class.java)
+                    .setClass(this, ServerGroupActivity::class.java)
-        )
+            )
+        } else {
+            startActivity(
+                Intent()
+                    .putExtra("createConfigType", createConfigType)
+                    .putExtra("subscriptionId", mainViewModel.subscriptionId)
+                    .setClass(this, ServerActivity::class.java)
+            )
+        }
     }
 
     /**
      * import config from qrcode
      */
     private fun importQRcode(): Boolean {
-        val permission = Manifest.permission.CAMERA
+        launchQRCodeScanner { scanResult ->
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            if (scanResult != null) {
-            scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+                importBatchConfig(scanResult)
-        } else {
+            }
-            pendingAction = Action.IMPORT_QR_CODE_CONFIG
-            requestPermissionLauncher.launch(permission)
         }
         return true
     }
@@ -468,7 +389,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importBatchConfig(server: String?) {
-        binding.pbWaiting.show()
+        showLoading()
 
         lifecycleScope.launch(Dispatchers.IO) {
             try {
@@ -481,15 +402,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)
             }
@@ -513,27 +434,36 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     /**
      * import config from sub
      */
-    private fun importConfigViaSub(): Boolean {
+    fun importConfigViaSub(): Boolean {
-        binding.pbWaiting.show()
+        showLoading()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val count = mainViewModel.updateConfigViaSubAll()
+            val result = mainViewModel.updateConfigViaSubAll()
             delay(500L)
             launch(Dispatchers.Main) {
-                if (count > 0) {
+                if (result.successCount + result.failureCount + result.skipCount == 0) {
-                    toast(getString(R.string.title_update_config_count, count))
+                    toast(R.string.title_update_subscription_no_subscription)
-                    mainViewModel.reloadServerList()
+                } else if (result.successCount > 0 && result.failureCount + result.skipCount == 0) {
+                    toast(getString(R.string.title_update_config_count, result.configCount))
                 } else {
-                    toastError(R.string.toast_failure)
+                    toast(
+                        getString(
+                            R.string.title_update_subscription_result,
+                            result.configCount, result.successCount, result.failureCount, result.skipCount
+                        )
+                    )
                 }
-                binding.pbWaiting.hide()
+                if (result.configCount > 0) {
+                    mainViewModel.reloadServerList()
+                }
+                hideLoading()
             }
         }
         return true
     }
 
     private fun exportAll() {
-        binding.pbWaiting.show()
+        showLoading()
         lifecycleScope.launch(Dispatchers.IO) {
             val ret = mainViewModel.exportAllServer()
             launch(Dispatchers.Main) {
@@ -541,7 +471,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()
             }
         }
     }
@@ -549,13 +479,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()
                     }
                 }
             }
@@ -568,13 +498,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()
                     }
                 }
             }
@@ -587,13 +517,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()
                     }
                 }
             }
@@ -604,12 +534,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()
             }
         }
     }
@@ -618,21 +548,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * show file chooser
      */
     private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        launchFileChooser { uri ->
-        intent.type = "*/*"
+            if (uri == null) {
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
+                return@launchFileChooser
+            }
 
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            readContentFromUri(uri)
-            Manifest.permission.READ_MEDIA_IMAGES
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            pendingAction = Action.READ_CONTENT_FROM_URI
-            chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } else {
-            requestPermissionLauncher.launch(permission)
         }
     }
 
@@ -640,37 +561,55 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
      * read content from uri
      */
     private fun readContentFromUri(uri: Uri) {
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        try {
-            Manifest.permission.READ_MEDIA_IMAGES
+            contentResolver.openInputStream(uri).use { input ->
-        } else {
+                importBatchConfig(input?.bufferedReader()?.readText())
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            try {
-                contentResolver.openInputStream(uri).use { input ->
-                    importBatchConfig(input?.bufferedReader()?.readText())
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to read content from URI", e)
             }
-        } else {
+        } catch (e: Exception) {
-            requestPermissionLauncher.launch(permission)
+            Log.e(AppConfig.TAG, "Failed to read content from URI", e)
         }
     }
 
-    private fun setTestState(content: String?) {
+    /**
-        binding.tvTestState.text = content
+     * Locates and scrolls to the currently selected server.
+     * If the selected server is in a different group, automatically switches to that group first.
+     */
+    private fun locateSelectedServer() {
+        val targetSubscriptionId = mainViewModel.findSubscriptionIdBySelect()
+        if (targetSubscriptionId.isNullOrEmpty()) {
+            toast(R.string.title_file_chooser)
+            return
+        }
+
+        val targetGroupIndex = groupPagerAdapter.groups.indexOfFirst { it.id == targetSubscriptionId }
+        if (targetGroupIndex < 0) {
+            toast(R.string.toast_server_not_found_in_group)
+            return
+        }
+
+        // Switch to target group if needed, then scroll to the server
+        if (binding.viewPager.currentItem != targetGroupIndex) {
+            binding.viewPager.setCurrentItem(targetGroupIndex, true)
+            binding.viewPager.postDelayed({ scrollToSelectedServer(targetGroupIndex) }, 1000)
+        } else {
+            scrollToSelectedServer(targetGroupIndex)
+        }
     }
 
-//    val mConnection = object : ServiceConnection {
+    /**
-//        override fun onServiceDisconnected(name: ComponentName?) {
+     * Scrolls to the selected server in the specified fragment.
-//        }
+     * @param groupIndex The index of the group/fragment to scroll in
-//
+     */
-//        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+    private fun scrollToSelectedServer(groupIndex: Int) {
-//            sendMsg(AppConfig.MSG_REGISTER_CLIENT, "")
+        val itemId = groupPagerAdapter.getItemId(groupIndex)
-//        }
+        val fragment = supportFragmentManager.findFragmentByTag("f$itemId") as? GroupServerFragment
-//    }
+
+        if (fragment?.isAdded == true && fragment.view != null) {
+            fragment.scrollToSelectedServer()
+        } else {
+            toast(R.string.toast_fragment_not_available)
+        }
+    }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_BUTTON_B) {
@@ -684,22 +623,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.sub_setting -> requestActivityLauncher.launch(Intent(this, SubSettingActivity::class.java))
-            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
+            R.id.per_app_proxy_settings -> requestActivityLauncher.launch(Intent(this, PerAppProxyActivity::class.java))
-            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
+            R.id.routing_setting -> requestActivityLauncher.launch(Intent(this, RoutingSettingActivity::class.java))
-            R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java))
+            R.id.user_asset_setting -> requestActivityLauncher.launch(Intent(this, UserAssetActivity::class.java))
-            R.id.settings -> startActivity(
+            R.id.settings -> requestActivityLauncher.launch(Intent(this, SettingsActivity::class.java))
-                Intent(this, SettingsActivity::class.java)
-                    .putExtra("isRunning", mainViewModel.isRunning.value == true)
-            )
-
             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,63 +1,57 @@
 package com.v2ray.ang.ui
 
-import android.content.Intent
+import android.annotation.SuppressLint
 import android.graphics.Color
-import android.text.TextUtils
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.AngApplication.Companion.application
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ItemQrcodeBinding
+import com.v2ray.ang.contracts.MainAdapterListener
 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.extension.toast
+import com.v2ray.ang.dto.ServersCache
-import com.v2ray.ang.extension.toastError
+import com.v2ray.ang.extension.nullIfBlank
-import com.v2ray.ang.extension.toastSuccess
 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 com.v2ray.ang.viewmodel.MainViewModel
-import kotlinx.coroutines.Dispatchers
+import java.util.Collections
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
-class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
+class MainRecyclerAdapter(
+    private val mainViewModel: MainViewModel,
+    private val adapterListener: MainAdapterListener?
+) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
     companion object {
         private const val VIEW_TYPE_ITEM = 1
         private const val VIEW_TYPE_FOOTER = 2
     }
 
-    private var mActivity: MainActivity = activity
-    private val share_method: Array<out String> by lazy {
-        mActivity.resources.getStringArray(R.array.share_method)
-    }
-    private val share_method_more: Array<out String> by lazy {
-        mActivity.resources.getStringArray(R.array.share_method_more)
-    }
-    var isRunning = false
     private val doubleColumnDisplay = MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)
+    private var data: MutableList<ServersCache> = mutableListOf()
 
-    /**
+    @SuppressLint("NotifyDataSetChanged")
-     * Gets the total number of items in the adapter (servers count + footer view)
+    fun setData(newData: MutableList<ServersCache>?, position: Int = -1) {
-     * @return The total item count
+        data = newData?.toMutableList() ?: mutableListOf()
-     */
+
-    override fun getItemCount() = mActivity.mainViewModel.serversCache.size + 1
+        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 context = holder.itemMainBinding.root.context
-            val profile = mActivity.mainViewModel.serversCache[position].profile
+            val guid = data[position].guid
-            val isCustom = profile.configType == EConfigType.CUSTOM
+            val profile = data[position].profile
 
             holder.itemView.setBackgroundColor(Color.TRANSPARENT)
 
@@ -70,14 +64,14 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             val aff = MmkvManager.decodeServerAffiliationInfo(guid)
             holder.itemMainBinding.tvTestResult.text = aff?.getTestDelayString().orEmpty()
             if ((aff?.testDelayMillis ?: 0L) < 0L) {
-                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPingRed))
+                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(context, R.color.colorPingRed))
             } else {
-                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPing))
+                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(context, R.color.colorPing))
             }
 
             //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)
             }
@@ -94,11 +88,8 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                 holder.itemMainBinding.layoutRemove.visibility = View.GONE
                 holder.itemMainBinding.layoutMore.visibility = View.VISIBLE
 
-                //share method
-                val shareOptions = if (isCustom) share_method_more.asList().takeLast(3) else share_method_more.asList()
-
                 holder.itemMainBinding.layoutMore.setOnClickListener {
-                    shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0)
+                    adapterListener?.onShare(guid, profile, position, true)
                 }
             } else {
                 holder.itemMainBinding.layoutShare.visibility = View.VISIBLE
@@ -106,34 +97,23 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                 holder.itemMainBinding.layoutRemove.visibility = View.VISIBLE
                 holder.itemMainBinding.layoutMore.visibility = View.GONE
 
-                //share method
-                val shareOptions = if (isCustom) share_method.asList().takeLast(1) else share_method.asList()
-
                 holder.itemMainBinding.layoutShare.setOnClickListener {
-                    shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0)
+                    adapterListener?.onShare(guid, profile, position, false)
                 }
 
                 holder.itemMainBinding.layoutEdit.setOnClickListener {
-                    editServer(guid, profile)
+                    adapterListener?.onEdit(guid, position, profile)
                 }
                 holder.itemMainBinding.layoutRemove.setOnClickListener {
-                    removeServer(guid, position)
+                    adapterListener?.onRemove(guid, position)
                 }
             }
 
             holder.itemMainBinding.infoContainer.setOnClickListener {
-                setSelectServer(guid)
+                adapterListener?.onSelectServer(guid)
             }
         }
-//        if (holder is FooterViewHolder) {
+ 
-//            if (true) {
-//                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
-//            } else {
-//                holder.itemFooterBinding.layoutEdit.setOnClickListener {
-//                    Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
-//                }
-//            }
-//        }
     }
 
     /**
@@ -143,15 +123,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      * @return Formatted address string
      */
     private fun getAddress(profile: ProfileItem): String {
-        // Hide xxx:xxx:***/xxx.xxx.xxx.***
+        return profile.description.nullIfBlank() ?: AngConfigManager.generateDescription(profile)
-        return "${
-            profile.server?.let {
-                if (it.contains(":"))
-                    it.split(":").take(2).joinToString(":", postfix = ":***")
-                else
-                    it.split('.').dropLast(1).joinToString(".", postfix = ".***")
-            }
-        } : ${profile.serverPort}"
     }
 
     /**
@@ -161,161 +133,25 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
      */
     private fun getSubscriptionRemarks(profile: ProfileItem): String {
         val subRemarks =
-            if (mActivity.mainViewModel.subscriptionId.isEmpty())
+            if (mainViewModel.subscriptionId.isEmpty())
                 MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks?.firstOrNull()
             else
                 null
         return subRemarks?.toString() ?: ""
     }
 
-    /**
+    fun removeServerSub(guid: String, position: Int) {
-     * Shares server configuration
+        val idx = data.indexOfFirst { it.guid == guid }
-     * Displays a dialog with sharing options and executes the selected action
+        if (idx >= 0) {
-     * @param guid The server unique identifier
+            data.removeAt(idx)
-     * @param profile The server configuration
+            notifyItemRemoved(idx)
-     * @param position The position in the list
+            notifyItemRangeChanged(idx, data.size - idx)
-     * @param shareOptions The list of share options
-     * @param skip The number of options to skip
-     */
-    private fun shareServer(guid: String, profile: ProfileItem, position: Int, shareOptions: List<String>, skip: Int) {
-        AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i ->
-            try {
-                when (i + skip) {
-                    0 -> showQRCode(guid)
-                    1 -> share2Clipboard(guid)
-                    2 -> shareFullContent(guid)
-                    3 -> editServer(guid, profile)
-                    4 -> removeServer(guid, position)
-                    else -> mActivity.toast("else")
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Error when sharing server", e)
-            }
-        }.show()
-    }
-
-    /**
-     * Displays QR code for the server configuration
-     * @param guid The server unique identifier
-     */
-    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()
-    }
-
-    /**
-     * Shares server configuration to clipboard
-     * @param guid The server unique identifier
-     */
-    private fun share2Clipboard(guid: String) {
-        if (AngConfigManager.share2Clipboard(mActivity, guid) == 0) {
-            mActivity.toastSuccess(R.string.toast_success)
-        } else {
-            mActivity.toastError(R.string.toast_failure)
         }
     }
 
-    /**
+    fun setSelectServer(fromPosition: Int, toPosition: Int) {
-     * Shares full server configuration content to clipboard
+        notifyItemChanged(fromPosition)
-     * @param guid The server unique identifier
+        notifyItemChanged(toPosition)
-     */
-    private fun shareFullContent(guid: String) {
-        mActivity.lifecycleScope.launch(Dispatchers.IO) {
-            val result = AngConfigManager.shareFullContent2Clipboard(mActivity, guid)
-            launch(Dispatchers.Main) {
-                if (result == 0) {
-                    mActivity.toastSuccess(R.string.toast_success)
-                } else {
-                    mActivity.toastError(R.string.toast_failure)
-                }
-            }
-        }
-    }
-
-    /**
-     * Edits server configuration
-     * Opens appropriate editing interface based on configuration type
-     * @param guid The server unique identifier
-     * @param profile The server configuration
-     */
-    private fun editServer(guid: String, profile: ProfileItem) {
-        val intent = Intent().putExtra("guid", guid)
-            .putExtra("isRunning", isRunning)
-            .putExtra("createConfigType", profile.configType.value)
-        if (profile.configType == EConfigType.CUSTOM) {
-            mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
-        } else {
-            mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java))
-        }
-    }
-
-    /**
-     * Removes server configuration
-     * Handles confirmation dialog and related checks
-     * @param guid The server unique identifier
-     * @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 {
-            application.toast(R.string.toast_action_not_allowed)
-        }
-    }
-
-    /**
-     * Executes the actual server removal process
-     * @param guid The server unique identifier
-     * @param position The position in the list
-     */
-    private fun removeServerSub(guid: String, position: Int) {
-        mActivity.mainViewModel.removeServer(guid)
-        notifyItemRemoved(position)
-        notifyItemRangeChanged(position, mActivity.mainViewModel.serversCache.size)
-    }
-
-    /**
-     * Sets the selected server
-     * Updates UI and restarts service if needed
-     * @param guid The server unique identifier to select
-     */
-    private fun setSelectServer(guid: String) {
-        val selected = MmkvManager.getSelectServer()
-        if (guid != selected) {
-            MmkvManager.setSelectServer(guid)
-            if (!TextUtils.isEmpty(selected)) {
-                notifyItemChanged(mActivity.mainViewModel.getPosition(selected.orEmpty()))
-            }
-            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)
-                    }
-                }
-            }
-        }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
@@ -329,7 +165,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
@@ -353,7 +189,10 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
         BaseViewHolder(itemFooterBinding.root)
 
     override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-        mActivity.mainViewModel.swapServer(fromPosition, toPosition)
+        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,12 +36,12 @@ 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)
+        //setContentView(binding.root)
-
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.per_app_proxy_settings))
-        title = getString(R.string.per_app_proxy_settings)
 
         addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
 
@@ -60,18 +63,17 @@ class PerAppProxyActivity : BaseActivity() {
     }
 
     private fun initList() {
-        binding.pbWaiting.show()
+        showLoading()
 
         lifecycleScope.launch {
             try {
-                val blacklist =
-                    MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
                 val apps = withContext(Dispatchers.IO) {
                     val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity)
 
-                    if (blacklist != null) {
+                    val blacklistSet = viewModel.getAll()
+                    if (blacklistSet.isNotEmpty()) {
                         appsList.forEach { app ->
-                            app.isSelected = if (blacklist.contains(app.packageName)) 1 else 0
+                            app.isSelected = if (blacklistSet.contains(app.packageName)) 1 else 0
                         }
                         appsList.sortedWith { p1, p2 ->
                             when {
@@ -93,23 +95,17 @@ class PerAppProxyActivity : BaseActivity() {
                 }
 
                 appsAll = apps
-                adapter = PerAppProxyAdapter(this@PerAppProxyActivity, apps, blacklist)
+                adapter = PerAppProxyAdapter(apps, viewModel)
                 binding.recyclerView.adapter = adapter
+
             } catch (e: Exception) {
                 Log.e(ANG_PACKAGE, "Error loading apps", e)
             } finally {
-                binding.pbWaiting.hide()
+                hideLoading()
             }
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        adapter?.let {
-            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY_SET, it.blacklist)
-        }
-    }
-
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_bypass_list, menu)
 
@@ -137,6 +133,11 @@ class PerAppProxyActivity : BaseActivity() {
             allowPerAppProxy()
             true
         }
+        R.id.invert_selection -> {
+            invertSelection()
+            allowPerAppProxy()
+            true
+        }
 
         R.id.select_proxy_app -> {
             selectProxyAppAuto()
@@ -159,27 +160,31 @@ class PerAppProxyActivity : BaseActivity() {
     }
 
     private fun selectAllApp() {
-        adapter?.let { it ->
+        adapter?.let { adapter ->
-            val pkgNames = it.apps.map { it.packageName }
+            val pkgNames = adapter.apps.map { it.packageName }
-            if (it.blacklist.containsAll(pkgNames)) {
+            val allSelected = pkgNames.all { viewModel.contains(it) }
-                it.apps.forEach {
+
-                    val packageName = it.packageName
+            if (allSelected) {
-                    adapter?.blacklist?.remove(packageName)
+                viewModel.removeAll(pkgNames)
-                }
             } else {
-                it.apps.forEach {
+                viewModel.addAll(pkgNames)
-                    val packageName = it.packageName
-                    adapter?.blacklist?.add(packageName)
-                }
             }
-            it.notifyDataSetChanged()
+            refreshData()
-            true
+        }
+    }
+
+    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) {
@@ -189,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()
             }
         }
     }
@@ -207,8 +212,8 @@ class PerAppProxyActivity : BaseActivity() {
     private fun exportProxyApp() {
         var lst = binding.switchBypassApps.isChecked.toString()
 
-        adapter?.blacklist?.forEach block@{
+        viewModel.getAll().forEach { pkg ->
-            lst = lst + System.getProperty("line.separator") + it
+            lst = lst + System.lineSeparator() + pkg
         }
         Utils.setClipboard(applicationContext, lst)
         toastSuccess(R.string.toast_success)
@@ -216,45 +221,40 @@ class PerAppProxyActivity : BaseActivity() {
 
     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 ->
+                adapter?.let { adapter ->
-                    it.apps.forEach block@{
+                    adapter.apps.forEach { app ->
-                        val packageName = it.packageName
+                        val packageName = app.packageName
-                        Log.i(AppConfig.TAG, packageName)
                         if (!inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
+                            viewModel.add(packageName)
-                            println(packageName)
-                            return@block
                         }
                     }
-                    it.notifyDataSetChanged()
+                    refreshData()
                 }
             } else {
-                adapter?.let { it ->
+                adapter?.let { adapter ->
-                    it.apps.forEach block@{
+                    adapter.apps.forEach { app ->
-                        val packageName = it.packageName
+                        val packageName = app.packageName
-                        Log.i(AppConfig.TAG, packageName)
                         if (inProxyApps(proxyApps, packageName, force)) {
-                            adapter?.blacklist?.add(packageName)
+                            viewModel.add(packageName)
-                            println(packageName)
-                            return@block
                         }
                     }
-                    it.notifyDataSetChanged()
+                    refreshData()
                 }
             }
         } catch (e: Exception) {
@@ -265,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
@@ -291,7 +292,7 @@ class PerAppProxyActivity : BaseActivity() {
             }
         }
 
-        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
+        adapter = PerAppProxyAdapter(apps, adapter?.viewModel ?: viewModel)
         binding.recyclerView.adapter = adapter
         refreshData()
         return true

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

@@ -6,17 +6,18 @@ 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(
-    RecyclerView.Adapter<PerAppProxyAdapter.BaseViewHolder>() {
+    val apps: List<AppInfo>,
+    val viewModel: PerAppProxyViewModel
+) :RecyclerView.Adapter<PerAppProxyAdapter.BaseViewHolder>() {
 
     companion object {
         private const val VIEW_TYPE_HEADER = 0
         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 +39,8 @@ 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 +50,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 +62,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) {
+            val packageName = appInfo.packageName
-                blacklist.remove(appInfo.packageName)
+            viewModel.toggle(packageName)
-                itemBypassBinding.checkBox.isChecked = false
+            itemBypassBinding.checkBox.isChecked = viewModel.contains(packageName)
-            } else {
-                blacklist.add(appInfo.packageName)
-                itemBypassBinding.checkBox.isChecked = true
-            }
         }
     }
 }

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

@@ -8,6 +8,7 @@ import androidx.lifecycle.lifecycleScope
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingEditBinding
 import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.SettingsManager
@@ -25,8 +26,8 @@ class RoutingEditActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(binding.root)
+        //setContentView(binding.root)
-        title = getString(R.string.routing_settings_rule_title)
+        setContentViewWithToolbar(binding.root, showHomeAsUp = true, title = getString(R.string.routing_settings_rule_title))
 
         val rulesetItem = SettingsManager.getRoutingRuleset(position)
         if (rulesetItem != null) {
@@ -62,14 +63,11 @@ class RoutingEditActivity : BaseActivity() {
         rulesetItem.apply {
             remarks = binding.etRemarks.text.toString()
             locked = binding.chkLocked.isChecked
-            domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() }
+            domain = binding.etDomain.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            ip = binding.etIp.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() }
+            protocol = binding.etProtocol.text.toString().nullIfBlank()?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            port = binding.etPort.text.toString().nullIfBlank()
-            protocol = binding.etProtocol.text.toString().takeIf { it.isNotEmpty() }
+            network = binding.etNetwork.text.toString().nullIfBlank()
-                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
-            port = binding.etPort.text.toString().takeIf { it.isNotEmpty() }
-            network = binding.etNetwork.text.toString().takeIf { it.isNotEmpty() }
             outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
         }
 
@@ -106,10 +104,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

@@ -1,22 +1,20 @@
 package com.v2ray.ang.ui
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.contracts.BaseAdapterListener
 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
 import com.v2ray.ang.handler.MmkvManager
@@ -24,15 +22,17 @@ 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
 
-class RoutingSettingActivity : BaseActivity() {
+class RoutingSettingActivity : HelperBaseActivity() {
     private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
-
+    private val ownerActivity: RoutingSettingActivity
-    var rulesets: MutableList<RulesetItem> = mutableListOf()
+        get() = this
-    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)
@@ -41,21 +41,12 @@ class RoutingSettingActivity : BaseActivity() {
         resources.getStringArray(R.array.preset_rulesets)
     }
 
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
     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(viewModel, ActivityAdapterListener())
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
@@ -85,7 +76,7 @@ class RoutingSettingActivity : BaseActivity() {
         R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
         R.id.import_predefined_rulesets -> importPredefined().let { true }
         R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
-        R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true }
+        R.id.import_rulesets_from_qrcode -> importQRcode()
         R.id.export_rulesets_to_clipboard -> export2Clipboard().let { true }
         else -> super.onOptionsItemSelected(item)
     }
@@ -157,6 +148,15 @@ class RoutingSettingActivity : BaseActivity() {
             .show()
     }
 
+    private fun importQRcode(): Boolean {
+        launchQRCodeScanner { scanResult ->
+            if (scanResult != null) {
+                importRulesetsFromQRcode(scanResult)
+            }
+        }
+        return true
+    }
+
     private fun export2Clipboard() {
         val rulesetList = MmkvManager.decodeRoutingRulesets()
         if (rulesetList.isNullOrEmpty()) {
@@ -167,11 +167,6 @@ class RoutingSettingActivity : BaseActivity() {
         }
     }
 
-    private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importRulesetsFromQRcode(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
 
     private fun importRulesetsFromQRcode(qrcode: String?): Boolean {
         AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
@@ -197,8 +192,26 @@ class RoutingSettingActivity : BaseActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     fun refreshData() {
-        rulesets.clear()
+        viewModel.reload()
-        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
         adapter.notifyDataSetChanged()
     }
+
+    private inner class ActivityAdapterListener : BaseAdapterListener {
+        override fun onEdit(guid: String, position: Int) {
+            startActivity(
+                Intent(ownerActivity, RoutingEditActivity::class.java)
+                    .putExtra("position", position)
+            )
+        }
+
+        override fun onRemove(guid: String, position: Int) {
+        }
+
+        override fun onShare(url: String) {
+        }
+
+        override fun onRefreshData() {
+            refreshData()
+        }
+    }
 }