up 2.0.2

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

.github/workflows/build.yml

@@ -1,13 +1,14 @@
 name: Build APK
 
 on:
-  push:
   workflow_dispatch:
     inputs:
-      XRAY_CORE_VERSION:
+      release_tag:
-        description: 'Xray core version or commit hash'
         required: false
-
+        type: string
+  push:
+    branches:
+      - master
 
 jobs:
   build:
@@ -15,79 +16,114 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3.2.0
+      with:
+        log-accepted-android-sdk-licenses: false
+        cmdline-tools-version: '12266719'
+        packages: 'platforms;android-35 build-tools;35.0.0 platform-tools'
+
+    - name: Install NDK
+      run: |
+        echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
+          --channel=0 \
+          --install "ndk;28.2.13676358"
+        echo "NDK_HOME=$ANDROID_HOME/ndk/28.2.13676358" >> $GITHUB_ENV
+        sed -i '10i\
+        \
+            ndkVersion = "28.2.13676358"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
+
+    - name: Restore cached libhevtun
+      id: cache-libhevtun-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ github.workspace }}/libs
+        key: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }}
+
+    - name: Build libhevtun
+      if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true'
+      run: |
+        bash compile-hevtun.sh
+    
+    - name: Save libhevtun
+      if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ github.workspace }}/libs
+        key: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }}
+
+    - name: Copy libhevtun
+      run: |
+        cp -r ${{ github.workspace }}/libs ${{ github.workspace }}/V2rayNG/app
+
+    - name: Fetch AndroidLibXrayLite tag
+      run: |
+        pushd AndroidLibXrayLite
+        CURRENT_TAG=$(git describe --tags --abbrev=0)
+        echo "Current tag in this repo: $CURRENT_TAG"
+        echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_ENV
+        popd
+
+    - name: Download libv2ray
+      uses: robinraju/release-downloader@v1.12
+      with:
+        repository: '2dust/AndroidLibXrayLite'
+        tag: ${{ env.CURRENT_TAG }}
+        fileName: 'libv2ray.aar'
+        out-file-path: V2rayNG/app/libs/
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v4.7.0
       with:
         distribution: 'temurin'
         java-version: '21'
 
-    - name: Setup Golang
+    - name: Decode Keystore
-      uses: actions/setup-go@v5
+      uses: timheuer/base64-to-file@v1.2.4
+      id: android_keystore
       with:
-        go-version: '1.23.2'
+        fileName: "android_keystore.jks"
-        cache: false
+        encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }}
-
-    - name: Patch Go use 600296
-      #https://go-review.googlesource.com/c/go/+/600296
-      run: |
-        cd "$(go env GOROOT)"
-        curl "https://go-review.googlesource.com/changes/go~600296/revisions/5/patch" | base64 -d | patch --verbose -p 1
-
-    - name: Install gomobile
-      run: |
-        go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20240806205939-81131f6468ab
-        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-
-    - name: Setup Android environment
-      uses: android-actions/setup-android@v3
-
-    - name: Build dependencies
-      run: |
-        mkdir ${{ github.workspace }}/build
-        cd ${{ github.workspace }}/build
-        git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git
-        cd AndroidLibXrayLite
-        go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true
-        gomobile init
-        go mod tidy -v
-        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
-        cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/
 
     - name: Build APK
       run: |
         cd ${{ github.workspace }}/V2rayNG
+        echo "sdk.dir=${ANDROID_HOME}" > local.properties
         chmod 755 gradlew
-        ./gradlew assembleDebug
+        ./gradlew licenseFdroidReleaseReport
-
+        ./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
+      uses: actions/upload-artifact@v4.6.2
       if: ${{  success() }}
       with:
         name: arm64-v8a
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
 
     - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.6.2
       if: ${{  success() }}
       with:
         name: armeabi-v7a
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
 
     - name: Upload x86 APK
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.6.2
       if: ${{  success() }}
       with:
         name: x86-apk
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*x86*.apk
-    
+
-    - name: Upload Other APKs
+    - name: Upload to release
-      uses: actions/upload-artifact@v4
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
       with:
-        name: others-apk
+        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*.apk
-        path: |
+        tag: ${{ github.event.inputs.release_tag }}
-          ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug
+        file_glob: true
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk
+        prerelease: true
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk

.github/workflows/fastlane.yml

@@ -0,0 +1,16 @@
+name: Validate Fastlane metadata
+
+on:
+  workflow_dispatch:
+  push:
+      branches: [ "master" ]
+  pull_request:
+      branches: [ "master" ]
+
+jobs:
+  go:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate Fastlane Supply Metadata
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.1.0

.gitignore

@@ -1,5 +1,66 @@
+# Ignore data and key store files
 *.dat
 *.jks
+
+# Ignore output JSON file
 V2rayNG/app/release/output.json
+
+# Ignore IDE and build system directories
 .idea/
 .gradle/
+*.iml
+
+# Ignore local properties and DS_Store files
+/local.properties
+.DS_Store
+
+# Ignore build directories and captures
+/build
+/captures
+V2rayNG/app/build
+V2rayNG/build
+V2rayNG/local.properties
+
+# Ignore APK and AAR files
+*.apk
+*.aar
+
+# Ignore signing properties
+signing.properties
+
+# Ignore shared object files
+*.so
+
+# Ignore Google services JSON
+V2rayNG/app/google-services.json
+
+# Additional common Android/Java ignores
+*.log
+*.tmp
+*.bak
+*.swp
+*.orig
+*.class
+*.jar
+*.war
+*.ear
+
+# Ignore executable files
+*.exe
+*.dll
+*.obj
+*.o
+*.pyc
+*.pyo
+
+# Ignore files from other IDEs
+.vscode/
+.classpath
+.project
+.settings/
+*.sublime-workspace
+*.sublime-project
+
+# Ignore OS-specific files
+Thumbs.db
+.DS_Store

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "AndroidLibXrayLite"]
+	path = AndroidLibXrayLite
+	url = https://github.com/2dust/AndroidLibXrayLite
+[submodule "hev-socks5-tunnel"]
+	path = hev-socks5-tunnel
+	url = https://github.com/heiher/hev-socks5-tunnel

AndroidLibV2rayLite/README.md

@@ -1,20 +0,0 @@
-# AndroidLibV2rayLite
-
-### Preparation
-- latest Ubuntu environment
-- At lease 30G free space
-- Get Repo [AndroidLibV2rayLite](https://github.com/2dust/AndroidLibV2rayLite) or [AndroidLibXrayLite](https://github.com/2dust/AndroidLibXrayLite)
-### Prepare Go
-- Go to https://golang.org/doc/install and install latest go
-- Make sure `go version` works as expected
-### Prepare gomobile
-- Go to https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile and install gomobile
-- export PATH=$PATH:~/go/bin
-- Make sure `gomobile init` works as expected
-### Prepare NDK
-- Go to https://developer.android.com/ndk/downloads and install latest NDK
-- export PATH=$PATH:<wherever you ndk is located>
-- Make sure `ndk-build -v` works as expected
-### Make
-- sudo apt install make
-- Read and understand [build script](https://github.com/2dust/AndroidLibV2rayLite/blob/master/Makefile)

README.md

@@ -2,17 +2,13 @@
 
 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.0.21-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.0-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
 
-<a href="https://play.google.com/store/apps/details?id=com.v2ray.ang">
-<img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" width="165" height="64" />
-</a>
-
 ### Telegram Channel
 [github_2dust](https://t.me/github_2dust)
 
@@ -21,7 +17,7 @@ A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-cor
 #### Geoip and Geosite
 - geoip.dat and geosite.dat files are in `Android/data/com.v2ray.ang/files/assets` (path may differ on some Android device)
 - download feature will get enhanced version in this [repo](https://github.com/Loyalsoldier/v2ray-rules-dat) (Note it need a working proxy)
-- latest official [domain list](https://github.com/v2fly/domain-list-community) and [ip list](https://github.com/v2fly/geoip) can be imported manually
+- latest official [domain list](https://github.com/Loyalsoldier/v2ray-rules-dat) and [ip list](https://github.com/Loyalsoldier/geoip) can be imported manually
 - possible to use third party dat file in the same folder, like [h2y](https://guide.v2fly.org/routing/sitedata.html#%E5%A4%96%E7%BD%AE%E7%9A%84%E5%9F%9F%E5%90%8D%E6%96%87%E4%BB%B6)
 
 ### More in our [wiki](https://github.com/2dust/v2rayNG/wiki)

V2rayNG/.gitignore

@@ -1,10 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea
-.DS_Store
-/build
-/captures
-*.apk
-signing.properties
-*.aar

V2rayNG/app/.gitignore

@@ -1,2 +0,0 @@
-/build
-/google-services.json

V2rayNG/app/build.gradle.kts

@@ -1,31 +1,37 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    id("com.google.android.gms.oss-licenses-plugin")
+    id("com.jaredsburrows.license")
 }
 
 android {
     namespace = "com.v2ray.ang"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.v2ray.ang"
-        minSdk = 21
+        minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
-        versionCode = 616
+        versionCode = 702
-        versionName = "1.9.20"
+        versionName = "2.0.2"
         multiDexEnabled = true
 
+        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
         splits {
             abi {
                 isEnable = true
-                include(
+                reset()
-                    "arm64-v8a",
+                if (abiFilterList != null && abiFilterList.isNotEmpty()) {
-                    "armeabi-v7a",
+                    include(*abiFilterList.toTypedArray())
-                    "x86_64",
+                } else {
-                    "x86"
+                    include(
-                )
+                        "arm64-v8a",
-                isUniversalApk = true
+                        "armeabi-v7a",
+                        "x86_64",
+                        "x86"
+                    )
+                }
+                isUniversalApk = abiFilterList.isNullOrEmpty()
             }
         }
 
@@ -42,42 +48,79 @@ android {
         }
     }
 
+    flavorDimensions.add("distribution")
+    productFlavors {
+        create("fdroid") {
+            dimension = "distribution"
+            applicationIdSuffix = ".fdroid"
+            buildConfigField("String", "DISTRIBUTION", "\"F-Droid\"")
+        }
+        create("playstore") {
+            dimension = "distribution"
+            buildConfigField("String", "DISTRIBUTION", "\"Play Store\"")
+        }
+    }
+
     sourceSets {
         getByName("main") {
             jniLibs.srcDirs("libs")
         }
     }
 
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        isCoreLibraryDesugaringEnabled = true
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
+
-        jvmTarget = JavaVersion.VERSION_11.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        }
     }
 
     applicationVariants.all {
         val variant = this
-        val versionCodes =
+        val isFdroid = variant.productFlavors.any { it.name == "fdroid" }
-            mapOf("armeabi-v7a" to 4, "arm64-v8a" to 4, "x86" to 4, "x86_64" to 4, "universal" to 4)
+        if (isFdroid) {
+            val versionCodes =
+                mapOf(
+                    "armeabi-v7a" to 2, "arm64-v8a" to 1, "x86" to 4, "x86_64" to 3, "universal" to 0
+                )
 
-        variant.outputs
+            variant.outputs
-            .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+                .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
-            .forEach { output ->
+                .forEach { output ->
-                val abi = if (output.getFilter("ABI") != null)
+                    val abi = output.getFilter("ABI") ?: "universal"
-                    output.getFilter("ABI")
+                    output.outputFileName = "v2rayNG_${variant.versionName}-fdroid_${abi}.apk"
-                else
+                    if (versionCodes.containsKey(abi)) {
-                    "universal"
+                        output.versionCodeOverride =
-
+                            (100 * variant.versionCode + versionCodes[abi]!!).plus(5000000)
-                output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk"
+                    } else {
-                if (versionCodes.containsKey(abi)) {
+                        return@forEach
-                    output.versionCodeOverride =
+                    }
-                        (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
-                } else {
-                    return@forEach
                 }
-            }
+        } else {
+            val versionCodes =
+                mapOf("armeabi-v7a" to 4, "arm64-v8a" to 4, "x86" to 4, "x86_64" to 4, "universal" to 4)
+
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+                .forEach { output ->
+                    val abi = if (output.getFilter("ABI") != null)
+                        output.getFilter("ABI")
+                    else
+                        "universal"
+
+                    output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk"
+                    if (versionCodes.containsKey(abi)) {
+                        output.versionCodeOverride =
+                            (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
+                    } else {
+                        return@forEach
+                    }
+                }
+        }
     }
 
     buildFeatures {
@@ -104,28 +147,31 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.preference.ktx)
     implementation(libs.recyclerview)
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.androidx.fragment)
 
     // UI Libraries
     implementation(libs.material)
-    implementation(libs.toastcompat)
+    implementation(libs.toasty)
     implementation(libs.editorkit)
     implementation(libs.flexbox)
 
     // Data and Storage Libraries
     implementation(libs.mmkv.static)
     implementation(libs.gson)
+    implementation(libs.okhttp)
 
     // Reactive and Utility Libraries
-    implementation(libs.rxjava)
+    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.rxandroid)
+    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.rxpermissions)
 
     // Language and Processing Libraries
     implementation(libs.language.base)
     implementation(libs.language.json)
 
     // Intent and Utility Libraries
-    implementation(libs.quickie.bundled)
+    implementation(libs.quickie.foss)
     implementation(libs.core)
 
     // AndroidX Lifecycle and Architecture Components
@@ -146,6 +192,5 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     testImplementation(libs.org.mockito.mockito.inline)
     testImplementation(libs.mockito.kotlin)
-    // Oss Licenses
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
-    implementation(libs.play.services.oss.licenses)
 }

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

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

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

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

V2rayNG/app/src/main/AndroidManifest.xml

@@ -10,10 +10,6 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-sdk
-        android:minSdkVersion="21"
-        tools:overrideLibrary="com.blacksquircle.ui.editorkit" />
-
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
@@ -30,12 +26,11 @@
     <!-- 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" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!-- <useapplications-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
@@ -52,16 +47,15 @@
         android:banner="@mipmap/ic_banner"
         android:icon="@mipmap/ic_launcher"
         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"
@@ -144,6 +142,12 @@
                 <data android:host="install-sub" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ui.CheckUpdateActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.BackupActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.AboutActivity"
             android:exported="false" />
@@ -155,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>
@@ -192,8 +197,8 @@
                 android:resource="@xml/app_widget_provider" />
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.v2ray.ang.action.widget.click" />
+                <action android:name="${applicationId}.action.widget.click" />
-                <action android:name="com.v2ray.ang.action.activity" />
+                <action android:name="${applicationId}.action.activity" />
             </intent-filter>
         </receiver>
         <receiver

V2rayNG/app/src/main/assets/custom_routing_black

@@ -6,14 +6,6 @@
       "bittorrent"
     ]
   },
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
@@ -21,10 +13,10 @@
     "network": "udp"
   },
   {
-    "remarks": "阻断广告",
+    "remarks": "代理Google",
-    "outboundTag": "block",
+    "outboundTag": "proxy",
     "domain": [
-      "geosite:category-ads-all"
+      "geosite:google"
     ]
   },
   {
@@ -146,4 +138,4 @@
     "port": "0-65535",
     "outboundTag": "direct"
   }
-]
+]

V2rayNG/app/src/main/assets/custom_routing_global

@@ -5,13 +5,6 @@
     "port": "443",
     "network": "udp"
   },
-  {
-    "remarks": "阻断广告",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",

V2rayNG/app/src/main/assets/custom_routing_white

@@ -1,12 +1,4 @@
 [
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
@@ -14,10 +6,10 @@
     "network": "udp"
   },
   {
-    "remarks": "阻断广告",
+    "remarks": "代理Google",
-    "outboundTag": "block",
+    "outboundTag": "proxy",
     "domain": [
-      "geosite:category-ads-all"
+      "geosite:google"
     ]
   },
   {
@@ -99,10 +91,5 @@
     "domain": [
       "geosite:cn"
     ]
-  },
-  {
-    "remarks": "最终代理",
-    "port": "0-65535",
-    "outboundTag": "proxy"
   }
-]
+]

V2rayNG/app/src/main/assets/custom_routing_white_iran

@@ -5,13 +5,6 @@
     "port": "443",
     "network": "udp"
   },
-  {
-    "remarks": "Block ads and trackers",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
   {
     "remarks": "Direct LAN IP",
     "outboundTag": "direct",
@@ -40,10 +33,5 @@
     "ip": [
        "geoip:ir"
     ]
-  },
-  {
-    "remarks": "Final Agent",
-    "port": "0-65535",
-    "outboundTag": "proxy"
   }
 ]

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/proxy_package_name

@@ -4,6 +4,7 @@ au.com.shiftyjelly.pocketcasts
 bbc.mobile.news.ww
 be.mygod.vpnhotspot
 ch.protonmail.android
+cm.aptoide.pt
 co.wanqu.android
 com.alphainventor.filemanager
 com.amazon.kindle
@@ -34,7 +35,9 @@ com.chrome.canary
 com.chrome.dev
 com.cl.newt66y
 com.cradle.iitc_mobile
+org.exarhteam.iitc_mobile
 com.cygames.shadowverse
+com.dcard.freedom
 com.devhd.feedly
 com.devolver.reigns2
 com.discord
@@ -108,6 +111,7 @@ com.ifttt.ifttt
 com.imgur.mobile
 com.innologica.inoreader
 com.instagram.android
+com.instagram.lite
 com.instapaper.android
 com.jarvanh.vpntether
 com.kapp.youtube.final
@@ -115,6 +119,7 @@ com.klinker.android.twitter_l
 com.lastpass.lpandroid
 com.linecorp.linelite
 com.lingodeer
+com.ltnnews.news
 com.mediapods.tumbpods
 com.mgoogle.android.gms
 com.microsoft.emmx
@@ -159,6 +164,7 @@ com.slack
 com.snaptube.premium
 com.sololearn
 com.sonelli.juicessh
+com.sparkslab.dcardreader
 com.spotify.music
 com.tencent.huatuo
 com.termux
@@ -173,10 +179,13 @@ com.twitter.android
 com.u91porn
 com.u9porn
 com.ubisoft.dance.justdance2015companion
+com.udn.news
 com.utopia.pxview
-com.valvesoftware.android.steam.communimunity
 com.valvesoftware.android.steam.community
+com.vanced.manager
 com.vanced.android.youtube
+com.vanced.android.apps.youtube.music
+com.mgoogle.android.gms
 com.vimeo.android.videoapp
 com.vivaldi.browser
 com.vivaldi.browser.snapshot
@@ -186,10 +195,12 @@ com.wire
 com.wuxiangai.refactor
 com.xda.labs
 com.xvideos.app
+com.yahoo.mobile.client.android.superapp
 com.yandex.browser
 com.yandex.browser.beta
 com.yandex.browser.alpha
 com.z28j.feel
+com.zhiliaoapp.musically
 con.medium.reader
 de.apkgrabber
 de.robv.android.xposed.installer
@@ -210,6 +221,7 @@ jp.bokete.app.android
 jp.naver.line.android
 jp.pxv.android
 luo.speedometergpspro
+m.cna.com.tw.App
 mark.via.gp
 me.tshine.easymark
 net.teeha.android.url_shortener
@@ -226,6 +238,7 @@ org.mozilla.firefox_beta
 org.mozilla.focus
 org.schabi.newpipe
 org.telegram.messenger
+org.telegram.messenger.web
 org.telegram.multi
 org.telegram.plus
 org.thunderdog.challegram
@@ -239,3 +252,162 @@ tw.com.gamer.android.activecenter
 videodownloader.downloadvideo.downloader
 uk.co.bbc.learningenglish
 com.ted.android
+de.danoeh.antennapod
+com.kiwibrowser.browser
+nekox.messenger
+com.nextcloud.client
+com.aurora.store
+com.aurora.adroid
+chat.simplex.app
+im.vector.app
+network.loki.messenger
+eu.siacs.conversations
+xyz.nextalone.nagram
+net.programmierecke.radiodroid2
+im.fdx.v2ex
+ml.docilealligator.infinityforreddit
+com.bytemyth.ama
+app.vanadium.browser
+com.cakewallet.cake_wallet
+org.purplei2p.i2pd
+dk.tacit.android.foldersync.lite
+com.nononsenseapps.feeder
+com.m2049r.xmrwallet
+com.paypal.android.p2pmobile
+com.google.android.apps.googlevoice
+com.readdle.spark
+org.torproject.torbrowser
+com.deepl.mobiletranslator
+com.microsoft.bing
+com.keylesspalace.tusky
+com.ottplay.ottplay
+ru.iptvremote.android.iptv.pro
+jp.naver.line.android
+com.xmflsct.app.tooot
+com.forem.android
+app.revanced.android.youtube
+com.mgoogle.android.gms
+com.pionex.client
+vip.mytokenpocket
+im.token.app
+com.linekong.mars24
+com.feixiaohao
+com.aicoin.appandroid
+com.binance.dev
+com.kraken.trade
+com.okinc.okex.gp
+com.authy.authy
+air.com.rosettastone.mobile.CoursePlayer
+com.blizzard.bma
+com.amazon.kindle
+com.google.android.apps.fitness
+net.tsapps.appsales
+com.wemesh.android
+com.google.android.apps.googleassistant
+allen.town.focus.reader
+me.hyliu.fluent_reader_lite
+com.aljazeera.mobile
+com.ft.news
+de.marmaro.krt.ffupdater
+myradio.radio.fmradio.liveradio.radiostation
+com.google.earth
+eu.kanade.tachiyomi.j2k
+com.audials
+com.microsoft.skydrive
+com.mb.android.tg
+com.melodis.midomiMusicIdentifier.freemium
+com.foxnews.android
+ch.threema.app
+com.briarproject.briar.android
+foundation.e.apps
+com.valvesoftware.android.steam.friendsui
+com.imback.yeetalk
+so.onekey.app.wallet
+com.xc3fff0e.xmanager
+meditofoundation.medito
+com.picol.client
+com.streetwriters.notesnook
+shanghai.panewsApp.com
+org.coursera.android
+com.positron_it.zlib
+com.blizzard.messenger
+com.javdb.javrocket
+com.picacomic.fregata
+com.fxl.chacha
+me.proton.android.drive
+com.lastpass.lpandroid
+com.tradingview.tradingviewapp
+com.deviantart.android.damobile
+com.fusionmedia.investing
+com.ewa.ewaapp
+com.duolingo
+com.hellotalk
+io.github.huskydg.magisk
+com.jsy.xpgbox
+com.hostloc.app.hostloc
+com.dena.pokota
+com.vitorpamplona.amethyst
+com.zhiliaoapp.musically
+us.spotco.fennec_dos
+com.fongmi.android.tv
+com.pocketprep.android.itcybersecurity
+com.cloudtv
+com.glassdoor.app
+com.indeed.android.jobsearch
+com.linkedin.android
+com.github.tvbox.osc.bh
+com.example.douban
+com.sipnetic.app
+com.microsoft.rdc.androidx
+org.zwanoo.android.speedtest
+com.sonelli.juicessh
+com.scmp.newspulse
+org.lsposed.manager
+mnn.Android
+com.thomsonretuers.reuters
+com.guardian
+com.ttxapps.onesyncv2
+org.fcitx.fcitx5.android.updater
+com.tailscale.ipn
+tw.nekomimi.nekogram
+com.nexon.kartdrift
+io.syncapps.lemmy_sync
+com.seazon.feedme
+com.readwise
+de.spiritcroc.riotx
+com.openai.chatgpt
+io.changenow.changenow
+com.poe.android
+com.twingate
+com.blinkslabs.blinkist.android
+com.ichi2.anki
+md.obsidian
+com.musixmatch.android.lyrify
+com.cyber.turbo
+com.offsec.nethunter
+me.ghui.v2er
+com.samruston.twitter
+org.adaway
+org.swiftapps.swiftbackup
+com.zerotier.one
+com.quietmobile
+com.instagram.barcelona
+im.molly.app
+com.rvx.android.youtube
+com.deepl.mobiletranslator
+com.qingsong.yingmi
+com.lemurbrowser.exts
+com.silverdev.dnartdroid
+me.ash.reader
+de.tutao.tutanota
+dev.imranr.obtainium
+com.getsomeheadspace.android
+org.cromite.cromite
+com.nutomic.syncthingandroid
+com.bumble.app
+com.cnn.mobile.android.phone
+com.google.android.apps.authenticator2
+com.microsoft.copilot
+com.netflix.NGP.Storyteller
+com.Slack
+com.server.auditor.ssh.client

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

@@ -33,14 +33,6 @@
         "tls"
       ]
     }
-  },
-  {
-    "tag": "http",
-    "port": 10809,
-    "protocol": "http",
-    "settings": {
-      "userLevel": 8
-    }
   }
 ],
   "outbounds": [{
@@ -97,7 +89,7 @@
   }
   ],
   "routing": {
-      "domainStrategy": "IPIfNonMatch",
+      "domainStrategy": "AsIs",
       "rules": []
   },
   "dns": {

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

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

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

@@ -1,22 +1,22 @@
 package com.v2ray.ang
 
 import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
 import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.util.Utils
 
 class AngApplication : MultiDexApplication() {
     companion object {
-        //const val PREF_LAST_VERSION = "pref_last_version"
         lateinit var application: AngApplication
     }
 
+    /**
+     * Attaches the base context to the application.
+     * @param base The base context.
+     */
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         application = this
@@ -26,28 +26,24 @@ class AngApplication : MultiDexApplication() {
         .setDefaultProcessName("${ANG_PACKAGE}:bg")
         .build()
 
+    /**
+     * Initializes the application.
+     */
     override fun onCreate() {
         super.onCreate()
 
-//        LeakCanary.install(this)
-
-//        val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
-//        firstRun = defaultSharedPreferences.getInt(PREF_LAST_VERSION, 0) != BuildConfig.VERSION_CODE
-//        if (firstRun)
-//            defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
-
         MMKV.initialize(this)
 
-        Utils.setNightMode()
+        // Ensure critical preference defaults are present in MMKV early
+        SettingsManager.ensureDefaultSettings()
+        SettingsManager.setNightMode()
         // Initialize WorkManager with the custom configuration
         WorkManager.initialize(this, workManagerConfiguration)
 
         SettingsManager.initRoutingRulesets(this)
+
+        es.dmoral.toasty.Toasty.Config.getInstance()
+            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
+            .apply()
     }
-
-    fun getPackageInfo(packageName: String) = 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/AppConfig.kt

@@ -5,14 +5,16 @@ object AppConfig {
 
     /** The application's package name. */
     const val ANG_PACKAGE = BuildConfig.APPLICATION_ID
+    const val TAG = BuildConfig.APPLICATION_ID
 
     /** Directory names used in the app's file system. */
     const val DIR_ASSETS = "assets"
-    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"
-    const val PREF_INAPP_BUY_IS_PREMIUM = "pref_inapp_buy_is_premium"
 
     /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
@@ -22,8 +24,12 @@ object AppConfig {
     const val PREF_BYPASS_APPS = "pref_bypass_apps"
     const val PREF_LOCAL_DNS_ENABLED = "pref_local_dns_enabled"
     const val PREF_FAKE_DNS_ENABLED = "pref_fake_dns_enabled"
+    const val PREF_APPEND_HTTP_PROXY = "pref_append_http_proxy"
     const val PREF_LOCAL_DNS_PORT = "pref_local_dns_port"
     const val PREF_VPN_DNS = "pref_vpn_dns"
+    const val PREF_VPN_BYPASS_LAN = "pref_vpn_bypass_lan"
+    const val PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX = "pref_vpn_interface_address_config_index"
+    const val PREF_VPN_MTU = "pref_vpn_mtu"
     const val PREF_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
     const val PREF_ROUTING_RULESET = "pref_routing_ruleset"
     const val PREF_MUX_ENABLED = "pref_mux_enabled"
@@ -41,31 +47,41 @@ object AppConfig {
     const val PREF_SPEED_ENABLED = "pref_speed_enabled"
     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_LANGUAGE = "pref_language"
     const val PREF_UI_MODE_NIGHT = "pref_ui_mode_night"
     const val PREF_PREFER_IPV6 = "pref_prefer_ipv6"
     const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled"
     const val PREF_ALLOW_INSECURE = "pref_allow_insecure"
     const val PREF_SOCKS_PORT = "pref_socks_port"
-    const val PREF_HTTP_PORT = "pref_http_port"
     const val PREF_REMOTE_DNS = "pref_remote_dns"
     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_MODE = "pref_mode"
     const val PREF_IS_BOOTED = "pref_is_booted"
+    const val PREF_CHECK_UPDATE_PRE_RELEASE = "pref_check_update_pre_release"
+    const val PREF_GEO_FILES_SOURCES = "pref_geo_files_sources"
+    const val PREF_USE_HEV_TUNNEL = "pref_use_hev_tunnel_v2"
+    const val PREF_HEV_TUNNEL_LOGLEVEL = "pref_hev_tunnel_loglevel"
+    const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout_v2"
+    const val PREF_AUTO_REMOVE_INVALID_AFTER_TEST = "pref_auto_remove_invalid_after_test"
+    const val PREF_AUTO_SORT_AFTER_TEST = "pref_auto_sort_after_test"
 
     /** Cache keys. */
     const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
     const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"
 
     /** Protocol identifiers. */
-    const val PROTOCOL_FREEDOM: String = "freedom"
+    const val PROTOCOL_FREEDOM = "freedom"
 
     /** Broadcast actions. */
-    const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
+    const val BROADCAST_ACTION_SERVICE = "$ANG_PACKAGE.action.service"
-    const val BROADCAST_ACTION_ACTIVITY = "com.v2ray.ang.action.activity"
+    const val BROADCAST_ACTION_ACTIVITY = "$ANG_PACKAGE.action.activity"
-    const val BROADCAST_ACTION_WIDGET_CLICK = "com.v2ray.ang.action.widget.click"
+    const val BROADCAST_ACTION_WIDGET_CLICK = "$ANG_PACKAGE.action.widget.click"
 
     /** Tasker extras. */
     const val TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE"
@@ -79,25 +95,29 @@ object AppConfig {
     const val TAG_DIRECT = "direct"
     const val TAG_BLOCKED = "block"
     const val TAG_FRAGMENT = "fragment"
+    const val TAG_DNS = "dns-module"
+    const val TAG_DOMESTIC_DNS = "domestic-dns"
 
     /** Network-related constants. */
     const val UPLINK = "uplink"
     const val DOWNLINK = "downlink"
 
     /** URLs for various resources. */
-    const val androidpackagenamelistUrl =
+    const val GITHUB_URL = "https://github.com"
-        "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
+    const val GITHUB_RAW_URL = "https://raw.githubusercontent.com"
-    const val v2rayCustomRoutingListUrl =
+    const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download"
-        "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
+    const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt"
-    const val v2rayNGUrl = "https://github.com/2dust/v2rayNG"
+    const val APP_URL = "$GITHUB_URL/2dust/v2rayNG"
-    const val v2rayNGIssues = "$v2rayNGUrl/issues"
+    const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases"
-    const val v2rayNGWikiMode = "$v2rayNGUrl/wiki/Mode"
+    const val APP_ISSUES_URL = "$APP_URL/issues"
-    const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md"
+    const val APP_WIKI_MODE = "$APP_URL/wiki/Mode"
-    const val PromotionUrl = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
+    const val APP_PRIVACY_POLICY = "$GITHUB_RAW_URL/2dust/v2rayNG/master/CR.md"
-    const val GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/"
+    const val APP_PROMOTION_URL = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
-    const val TgChannelUrl = "https://t.me/github_2dust"
+    const val TG_CHANNEL_URL = "https://t.me/github_2dust"
-    const val DelayTestUrl = "https://www.gstatic.com/generate_204"
+    const val DELAY_TEST_URL = "https://www.gstatic.com/generate_204"
-    const val DelayTestUrl2 = "https://www.google.com/generate_204"
+    const val DELAY_TEST_URL2 = "https://www.google.com/generate_204"
+//    const val IP_API_URL = "https://speed.cloudflare.com/meta"
+    const val IP_API_URL = "https://api.ip.sb/geoip"
 
     /** DNS server addresses. */
     const val DNS_PROXY = "1.1.1.1"
@@ -111,7 +131,6 @@ object AppConfig {
     /** Ports and addresses for various services. */
     const val PORT_LOCAL_DNS = "10853"
     const val PORT_SOCKS = "10808"
-    const val PORT_HTTP = "10809"
     const val WIREGUARD_LOCAL_ADDRESS_V4 = "172.16.0.2/32"
     const val WIREGUARD_LOCAL_ADDRESS_V6 = "2606:4700:110:8f81:d551:a0:532e:a2b3/128"
     const val WIREGUARD_LOCAL_MTU = "1420"
@@ -133,6 +152,8 @@ object AppConfig {
     const val MSG_MEASURE_CONFIG = 7
     const val MSG_MEASURE_CONFIG_SUCCESS = 71
     const val MSG_MEASURE_CONFIG_CANCEL = 72
+    const val MSG_MEASURE_CONFIG_NOTIFY = 73
+    const val MSG_MEASURE_CONFIG_FINISH = 74
 
     /** Notification channel IDs and names. */
     const val RAY_NG_CHANNEL_ID = "RAY_NG_M_CH_ID"
@@ -150,11 +171,16 @@ 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://"
 
     /** Give a good name to this, IDK*/
     const val VPN = "VPN"
+    const val VPN_MTU = 1500
+
+    /** hev-sock5-tunnel read-write-timeout value */
+    const val HEVTUN_RW_TIMEOUT = "300,60"
 
     // Google API rule constants
     const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
@@ -163,19 +189,13 @@ object AppConfig {
     // Android Private DNS constants
     const val DNS_DNSPOD_DOMAIN = "dot.pub"
     const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_ONE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_DNS_COM_DOMAIN = "dns.cloudflare.com"
+    const val DNS_CLOUDFLARE_DNS_DOMAIN = "cloudflare-dns.com"
     const val DNS_GOOGLE_DOMAIN = "dns.google"
     const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
     const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
 
-    
-    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
-    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
-    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
-    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
-
     const val DEFAULT_PORT = 443
     const val DEFAULT_SECURITY = "auto"
     const val DEFAULT_LEVEL = 8
@@ -184,4 +204,64 @@ object AppConfig {
     const val REALITY = "reality"
     const val HEADER_TYPE_HTTP = "http"
 
+    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
+    val DNS_CLOUDFLARE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_CLOUDFLARE_DNS_COM_ADDRESSES = arrayListOf("104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5")
+    val DNS_CLOUDFLARE_DNS_ADDRESSES = arrayListOf("104.16.248.249", "104.16.249.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9")
+    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
+    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
+    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
+
+    //minimum list https://serverfault.com/a/304791
+    val ROUTED_IP_LIST = arrayListOf(
+        "0.0.0.0/5",
+        "8.0.0.0/7",
+        "11.0.0.0/8",
+        "12.0.0.0/6",
+        "16.0.0.0/4",
+        "32.0.0.0/3",
+        "64.0.0.0/2",
+        "128.0.0.0/3",
+        "160.0.0.0/5",
+        "168.0.0.0/6",
+        "172.0.0.0/12",
+        "172.32.0.0/11",
+        "172.64.0.0/10",
+        "172.128.0.0/9",
+        "173.0.0.0/8",
+        "174.0.0.0/7",
+        "176.0.0.0/4",
+        "192.0.0.0/9",
+        "192.128.0.0/11",
+        "192.160.0.0/13",
+        "192.169.0.0/16",
+        "192.170.0.0/15",
+        "192.172.0.0/14",
+        "192.176.0.0/12",
+        "192.192.0.0/10",
+        "193.0.0.0/8",
+        "194.0.0.0/7",
+        "196.0.0.0/6",
+        "200.0.0.0/5",
+        "208.0.0.0/4",
+        "240.0.0.0/4"
+    )
+
+    val PRIVATE_IP_LIST = arrayListOf(
+        "0.0.0.0/8",
+        "10.0.0.0/8",
+        "127.0.0.0/8",
+        "172.16.0.0/12",
+        "192.168.0.0/16",
+        "169.254.0.0/16",
+        "224.0.0.0/4"
+    )
+
+    val GEO_FILES_SOURCES = arrayListOf(
+        "Loyalsoldier/v2ray-rules-dat",
+        "runetfreedom/russia-v2ray-rules-dat",
+        "Chocolate4U/Iran-v2ray-rules"
+    )
+
 }

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

@@ -4,5 +4,6 @@ data class AssetUrlItem(
     var remarks: String = "",
     var url: String = "",
     val addedTime: Long = System.currentTimeMillis(),
-    var lastUpdated: Long = -1
+    var lastUpdated: Long = -1,
+    var locked: Boolean? = false,
 )

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

@@ -0,0 +1,10 @@
+package com.v2ray.ang.dto
+
+data class CheckUpdateResult(
+    val hasUpdate: Boolean,
+    val latestVersion: String? = null,
+    val releaseNotes: String? = null,
+    val downloadUrl: String? = null,
+    val error: String? = null,
+    val isPreRelease: Boolean = false
+)

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 domainPort: String? = null,
 )
 

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

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

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

@@ -0,0 +1,23 @@
+package com.v2ray.ang.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class GitHubRelease(
+    @SerializedName("tag_name")
+    val tagName: String,
+    @SerializedName("body")
+    val body: String,
+    @SerializedName("assets")
+    val assets: List<Asset>,
+    @SerializedName("prerelease")
+    val prerelease: Boolean = false,
+    @SerializedName("published_at")
+    val publishedAt: String = ""
+) {
+    data class Asset(
+        @SerializedName("name")
+        val name: String,
+        @SerializedName("browser_download_url")
+        val browserDownloadUrl: String
+    )
+}

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,40 +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,
-) {
-    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?,
-        )
-    }
-}

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

@@ -0,0 +1,17 @@
+package com.v2ray.ang.dto
+
+data class IPAPIInfo(
+    var ip: String? = null,
+    var clientIp: String? = null,
+    var ip_addr: String? = null,
+    var query: String? = null,
+    var country: String? = null,
+    var country_name: String? = null,
+    var country_code: String? = null,
+    var countryCode: String? = null,
+    var location: LocationBean? = null
+) {
+    data class LocationBean(
+        var country_code: String? = null
+    )
+}

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

@@ -8,6 +8,7 @@ enum class Language(val code: String) {
     VIETNAMESE("vi"),
     RUSSIAN("ru"),
     PERSIAN("fa"),
+    ARABIC("ar"),
     BANGLA("bn"),
     BAKHTIARI("bqi-rIR");
 

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

@@ -5,12 +5,13 @@ enum class NetworkType(val type: String) {
     KCP("kcp"),
     WS("ws"),
     HTTP_UPGRADE("httpupgrade"),
-    SPLIT_HTTP("splithttp"),
     XHTTP("xhttp"),
     HTTP("http"),
     H2("h2"),
+
     //QUIC("quic"),
-    GRPC("grpc");
+    GRPC("grpc"),
+    HYSTERIA("hysteria");
 
     companion object {
         fun fromString(type: String?) = entries.find { it.type == type } ?: TCP

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

@@ -1,5 +1,7 @@
 package com.v2ray.ang.dto
 
+import com.v2ray.ang.AppConfig.LOOPBACK
+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
@@ -38,10 +40,13 @@ data class ProfileItem(
     var alpn: String? = null,
     var fingerPrint: String? = null,
     var insecure: Boolean? = null,
+    var echConfigList: String? = null,
+    var echForceQuery: String? = null,
 
     var publicKey: String? = null,
     var shortId: String? = null,
     var spiderX: String? = null,
+    var mldsa65Verify: String? = null,
 
     var secretKey: String? = null,
     var preSharedKey: String? = null,
@@ -53,6 +58,12 @@ data class ProfileItem(
     var portHopping: String? = null,
     var portHoppingInterval: String? = null,
     var pinSHA256: String? = null,
+    var bandwidthDown: String? = null,
+    var bandwidthUp: String? = null,
+
+    var policyGroupType: String? = null,
+    var policyGroupSubscriptionId: String? = null,
+    var policyGroupFilter: String? = null,
 
     ) {
     companion object {
@@ -66,6 +77,9 @@ data class ProfileItem(
     }
 
     fun getServerAddressAndPort(): String {
+        if (server.isNullOrEmpty() && configType == EConfigType.CUSTOM) {
+            return "$LOOPBACK:$PORT_SOCKS"
+        }
         return Utils.getIpv6Address(server) + ":" + serverPort
     }
 

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

@@ -1,9 +0,0 @@
-package com.v2ray.ang.dto
-
-data class ProfileLiteItem(
-    val configType: EConfigType,
-    var subscriptionId: String = "",
-    var remarks: String = "",
-    var server: String?,
-    var serverPort: Int?,
-)

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

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

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

@@ -9,5 +9,5 @@ data class RulesetItem(
     var network: String? = null,
     var protocol: List<String>? = null,
     var enabled: Boolean = true,
-    var looked: Boolean? = false,
+    var locked: Boolean? = false,
 )

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

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

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

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

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

@@ -1,26 +1,16 @@
 package com.v2ray.ang.dto
 
-import android.text.TextUtils
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
-import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.*
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.*
-import com.v2ray.ang.util.Utils
-import java.lang.reflect.Type
 
 data class V2rayConfig(
     var remarks: String? = null,
     var stats: Any? = null,
     val log: LogBean,
-    var policy: PolicyBean?,
+    var policy: PolicyBean? = null,
     val inbounds: ArrayList<InboundBean>,
     var outbounds: ArrayList<OutboundBean>,
-    var dns: DnsBean,
+    var dns: DnsBean? = null,
     val routing: RoutingBean,
     val api: Any? = null,
     val transport: Any? = null,
@@ -32,9 +22,9 @@ data class V2rayConfig(
 ) {
 
     data class LogBean(
-        val access: String,
+        val access: String? = null,
-        val error: String,
+        val error: String? = null,
-        var loglevel: String?,
+        var loglevel: String? = null,
         val dnsLog: Boolean? = null
     )
 
@@ -43,19 +33,19 @@ data class V2rayConfig(
         var port: Int,
         var protocol: String,
         var listen: String? = null,
-        val settings: Any? = null,
+        var settings: InSettingsBean? = null,
-        val sniffing: SniffingBean?,
+        val 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(
@@ -75,50 +65,6 @@ data class V2rayConfig(
         val sendThrough: String? = null,
         var mux: MuxBean? = MuxBean(false)
     ) {
-        companion object {
-            fun create(configType: EConfigType): OutboundBean? {
-                return when (configType) {
-                    EConfigType.VMESS,
-                    EConfigType.VLESS ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                vnext = listOf(
-                                    VnextBean(
-                                        users = listOf(UsersBean())
-                                    )
-                                )
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.SHADOWSOCKS,
-                    EConfigType.SOCKS,
-                    EConfigType.HTTP,
-                    EConfigType.TROJAN,
-                    EConfigType.HYSTERIA2 ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                servers = listOf(ServersBean())
-                            ),
-                            streamSettings = StreamSettingsBean()
-                        )
-
-                    EConfigType.WIREGUARD ->
-                        return OutboundBean(
-                            protocol = configType.name.lowercase(),
-                            settings = OutSettingsBean(
-                                secretKey = "",
-                                peers = listOf(WireGuardBean())
-                            )
-                        )
-
-                    EConfigType.CUSTOM -> null
-                }
-            }
-        }
-
         data class OutSettingsBean(
             var vnext: List<VnextBean>? = null,
             var fragment: FragmentBean? = null,
@@ -129,7 +75,7 @@ data class V2rayConfig(
             /*DNS*/
             val network: String? = null,
             var address: Any? = null,
-            val port: Int? = null,
+            var port: Int? = null,
             /*Freedom*/
             var domainStrategy: String? = null,
             val redirect: String? = null,
@@ -195,14 +141,14 @@ data class V2rayConfig(
 
             data class WireGuardBean(
                 var publicKey: String = "",
-                var preSharedKey: String = "",
+                var preSharedKey: String? = null,
                 var endpoint: String = ""
             )
         }
 
         data class StreamSettingsBean(
             var network: String = AppConfig.DEFAULT_NETWORK,
-            var security: String = "",
+            var security: String? = null,
             var tcpSettings: TcpSettingsBean? = null,
             var kcpSettings: KcpSettingsBean? = null,
             var wsSettings: WsSettingsBean? = null,
@@ -213,7 +159,8 @@ data class V2rayConfig(
             var quicSettings: QuicSettingBean? = null,
             var realitySettings: TlsSettingsBean? = null,
             var grpcSettings: GrpcSettingsBean? = null,
-            var hy2steriaSettings: Hy2steriaSettingsBean? = null,
+            var hysteriaSettings: HysteriaSettingsBean? = null,
+            var udpmasks: List<UdpMasksBean>? = null,
             val dsSettings: Any? = null,
             var sockopt: SockoptBean? = null
         ) {
@@ -257,7 +204,10 @@ data class V2rayConfig(
                 var header: HeaderBean = HeaderBean(),
                 var seed: String? = null
             ) {
-                data class HeaderBean(var type: String = "none")
+                data class HeaderBean(
+                    var type: String = "none",
+                    var domain: String? = null
+                )
             }
 
             data class WsSettingsBean(
@@ -294,7 +244,16 @@ data class V2rayConfig(
                 var tcpFastOpen: Boolean? = null,
                 var tproxy: String? = null,
                 var mark: Int? = null,
-                var dialerProxy: String? = null
+                var dialerProxy: String? = null,
+                var domainStrategy: String? = null,
+                var happyEyeballs: HappyEyeballsBean? = null,
+            )
+
+            data class HappyEyeballsBean(
+                var prioritizeIPv6: Boolean? = null,
+                var maxConcurrentTry: Int? = 4,
+                var tryDelayMs: Int? = 250, // ms
+                var interleave: Int? = null,
             )
 
             data class TlsSettingsBean(
@@ -309,11 +268,14 @@ data class V2rayConfig(
                 val certificates: List<Any>? = null,
                 val disableSystemRoot: Boolean? = null,
                 val enableSessionResumption: Boolean? = null,
+                var echConfigList: String? = null,
+                var echForceQuery: String? = null,
                 // REALITY settings
                 val show: Boolean = false,
                 var publicKey: String? = null,
                 var shortId: String? = null,
-                var spiderX: String? = null
+                var spiderX: String? = null,
+                var mldsa65Verify: String? = null
             )
 
             data class QuicSettingBean(
@@ -332,152 +294,34 @@ 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,
                 )
             }
 
-            fun populateTransportSettings(
+            data class UdpMasksBean(
-                transport: String,
+                var type: String,
-                headerType: String?,
+                var settings: UdpMasksSettingsBean? = null
-                host: String?,
-                path: String?,
-                seed: String?,
-                quicSecurity: String?,
-                key: String?,
-                mode: String?,
-                serviceName: String?,
-                authority: String?
-            ): String? {
-                var sni: String? = null
-                network = transport
-                when (network) {
-                    NetworkType.TCP.type -> {
-                        val tcpSetting = TcpSettingsBean()
-                        if (headerType == AppConfig.HEADER_TYPE_HTTP) {
-                            tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP
-                            if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
-                                val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
-                                requestObj.headers.Host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                requestObj.path = path.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                tcpSetting.header.request = requestObj
-                                sni = requestObj.headers.Host?.getOrNull(0) ?: sni
-                            }
-                        } else {
-                            tcpSetting.header.type = "none"
-                            sni = host.orEmpty()
-                        }
-                        tcpSettings = tcpSetting
-                    }
-
-                    NetworkType.KCP.type -> {
-                        val kcpsetting = KcpSettingsBean()
-                        kcpsetting.header.type = headerType ?: "none"
-                        if (seed.isNullOrEmpty()) {
-                            kcpsetting.seed = null
-                        } else {
-                            kcpsetting.seed = seed
-                        }
-                        kcpSettings = kcpsetting
-                    }
-
-                    NetworkType.WS.type -> {
-                        val wssetting = WsSettingsBean()
-                        wssetting.headers.Host = host.orEmpty()
-                        sni = wssetting.headers.Host
-                        wssetting.path = path ?: "/"
-                        wsSettings = wssetting
-                    }
-
-                    NetworkType.HTTP_UPGRADE.type -> {
-                        val httpupgradeSetting = HttpupgradeSettingsBean()
-                        httpupgradeSetting.host = host.orEmpty()
-                        sni = httpupgradeSetting.host
-                        httpupgradeSetting.path = path ?: "/"
-                        httpupgradeSettings = httpupgradeSetting
-                    }
-
-                    NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
-                        val xhttpSetting = XhttpSettingsBean()
-                        xhttpSetting.host = host.orEmpty()
-                        sni = xhttpSetting.host
-                        xhttpSetting.path = path ?: "/"
-                        xhttpSettings = xhttpSetting
-                    }
-
-                    NetworkType.H2.type, NetworkType.HTTP.type -> {
-                        network = NetworkType.H2.type
-                        val h2Setting = HttpSettingsBean()
-                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                        sni = h2Setting.host.getOrNull(0) ?: sni
-                        h2Setting.path = path ?: "/"
-                        httpSettings = h2Setting
-                    }
-
-//                    "quic" -> {
-//                        val quicsetting = QuicSettingBean()
-//                        quicsetting.security = quicSecurity ?: "none"
-//                        quicsetting.key = key.orEmpty()
-//                        quicsetting.header.type = headerType ?: "none"
-//                        quicSettings = quicsetting
-//                    }
-
-                    NetworkType.GRPC.type -> {
-                        val grpcSetting = GrpcSettingsBean()
-                        grpcSetting.multiMode = mode == "multi"
-                        grpcSetting.serviceName = serviceName.orEmpty()
-                        grpcSetting.authority = authority.orEmpty()
-                        grpcSetting.idle_timeout = 60
-                        grpcSetting.health_check_timeout = 20
-                        sni = authority.orEmpty()
-                        grpcSettings = grpcSetting
-                    }
-                }
-                return sni
-            }
-
-            fun populateTlsSettings(
-                streamSecurity: String,
-                allowInsecure: Boolean,
-                sni: String?,
-                fingerprint: String?,
-                alpns: String?,
-                publicKey: String?,
-                shortId: String?,
-                spiderX: String?
             ) {
-                security = streamSecurity
+                data class UdpMasksSettingsBean(
-                val tlsSetting = TlsSettingsBean(
+                    var password: String? = null
-                    allowInsecure = allowInsecure,
-                    serverName = sni,
-                    fingerprint = fingerprint,
-                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
-                    publicKey = publicKey,
-                    shortId = shortId,
-                    spiderX = spiderX
                 )
-                if (security == AppConfig.TLS) {
-                    tlsSettings = tlsSetting
-                    realitySettings = null
-                } else if (security == AppConfig.REALITY) {
-                    tlsSettings = null
-                    realitySettings = tlsSetting
-                }
             }
         }
 
         data class MuxBean(
             var enabled: Boolean,
-            var concurrency: Int = 8,
+            var concurrency: Int? = null,
-            var xudpConcurrency: Int = 8,
+            var xudpConcurrency: Int? = null,
-            var xudpProxyUDP443: String = "",
+            var xudpProxyUDP443: String? = null,
         )
 
         fun getServerAddress(): String? {
@@ -489,11 +333,14 @@ data class V2rayConfig(
                 || protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
-                || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
                 return settings?.servers?.first()?.address
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.peers?.first()?.endpoint?.substringBeforeLast(":")
+            } else if (protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
+            ) {
+                return settings?.address as String?
             }
             return null
         }
@@ -507,134 +354,28 @@ 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()
+                streamSettings = it
-            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? {
+            val sockopt = stream.sockopt ?: StreamSettingsBean.SockoptBean().also {
-            return when {
+                stream.sockopt = it
-                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?>? {
+            return sockopt
-            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.SPLIT_HTTP.type, 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
         }
     }
 
@@ -653,6 +394,7 @@ data class V2rayConfig(
             var expectIPs: List<String>? = null,
             val clientIp: String? = null,
             val skipFallback: Boolean? = null,
+            val tag: String? = null,
         )
     }
 
@@ -660,14 +402,14 @@ data class V2rayConfig(
         var domainStrategy: String,
         var domainMatcher: String? = null,
         var rules: ArrayList<RulesBean>,
-        val balancers: List<Any>? = null
+        var balancers: List<BalancerBean>? = null
     ) {
 
         data class RulesBean(
             var type: String = "field",
             var ip: ArrayList<String>? = null,
             var domain: ArrayList<String>? = null,
-            var outboundTag: String = "",
+            var outboundTag: String? = null,
             var balancerTag: String? = null,
             var port: String? = null,
             val sourcePort: String? = null,
@@ -679,6 +421,32 @@ data class V2rayConfig(
             val attrs: String? = null,
             val domainMatcher: String? = null
         )
+
+        data class BalancerBean(
+            val tag: String,
+            val selector: List<String>,
+            val fallbackTag: String? = null,
+            val strategy: StrategyObject? = null
+        )
+
+        data class StrategyObject(
+            val type: String = "random", // "random" | "roundRobin" | "leastPing" | "leastLoad"
+            val settings: StrategySettingsObject? = null
+        )
+
+        data class StrategySettingsObject(
+            val expected: Int? = null,
+            val maxRTT: String? = null,
+            val tolerance: Double? = null,
+            val baselines: List<String>? = null,
+            val costs: List<CostObject>? = null
+        )
+
+        data class CostObject(
+            val regexp: Boolean = false,
+            val match: String,
+            val value: Double
+        )
     }
 
     data class PolicyBean(
@@ -696,6 +464,26 @@ data class V2rayConfig(
         )
     }
 
+    data class ObservatoryObject(
+        val subjectSelector: List<String>,
+        val probeUrl: String,
+        val probeInterval: String,
+        val enableConcurrency: Boolean = false
+    )
+
+    data class BurstObservatoryObject(
+        val subjectSelector: List<String>,
+        val pingConfig: PingConfigObject
+    ) {
+        data class PingConfigObject(
+            val destination: String,
+            val connectivity: String? = null,
+            val interval: String,
+            val sampling: Int,
+            val timeout: String? = null
+        )
+    }
+
     data class FakednsBean(
         var ipPool: String = "198.18.0.0/15",
         var poolSize: Int = 10000
@@ -712,15 +500,9 @@ data class V2rayConfig(
         return null
     }
 
-    fun toPrettyPrinting(): String {
+    fun getAllProxyOutbound(): List<OutboundBean> {
-        return GsonBuilder()
+        return outbounds.filter { outbound ->
-            .setPrettyPrinting()
+            EConfigType.entries.any { it.name.equals(outbound.protocol, ignoreCase = true) }
-            .disableHtmlEscaping()
+        }
-            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
-                object : TypeToken<Double>() {}.type,
-                JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
-            )
-            .create()
-            .toJson(this)
     }
-}
+}

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

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

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

@@ -0,0 +1,39 @@
+package com.v2ray.ang.dto
+
+/**
+ * VPN interface address configuration enum class
+ * Defines predefined IPv4 and IPv6 address pairs for VPN TUN interface configuration.
+ * Each option provides client and router addresses to establish point-to-point VPN tunnels.
+ */
+enum class VpnInterfaceAddressConfig(
+    val displayName: String,
+    val ipv4Client: String,
+    val ipv4Router: String,
+    val ipv6Client: String,
+    val ipv6Router: String
+) {
+    OPTION_1("10.10.14.x", "10.10.14.1", "10.10.14.2", "fc00::10:10:14:1", "fc00::10:10:14:2"),
+    OPTION_2("10.1.0.x", "10.1.0.1", "10.1.0.2", "fc00::10:1:0:1", "fc00::10:1:0:2"),
+    OPTION_3("10.0.0.x", "10.0.0.1", "10.0.0.2", "fc00::10:0:0:1", "fc00::10:0:0:2"),
+    OPTION_4("172.31.0.x", "172.31.0.1", "172.31.0.2", "fc00::172:31:0:1", "fc00::172:31:0:2"),
+    OPTION_5("172.20.0.x", "172.20.0.1", "172.20.0.2", "fc00::172:20:0:1", "fc00::172:20:0:2"),
+    OPTION_6("172.16.0.x", "172.16.0.1", "172.16.0.2", "fc00::172:16:0:1", "fc00::172:16:0:2"),
+    OPTION_7("192.168.100.x", "192.168.100.1", "192.168.100.2", "fc00::192:168:100:1", "fc00::192:168:100:2");
+
+    companion object {
+        /**
+         * Retrieves the VPN interface address configuration based on the specified index.
+         *
+         * @param index The configuration index (0-based) corresponding to user selection
+         * @return The VpnInterfaceAddressConfig instance at the specified index,
+         *         or OPTION_1 (default) if the index is out of bounds
+         */
+        fun getConfigByIndex(index: Int): VpnInterfaceAddressConfig {
+            return if (index in entries.toTypedArray().indices) {
+                entries[index]
+            } else {
+                OPTION_1 // Default to the first configuration
+            }
+        }
+    }
+}

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

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

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

@@ -8,36 +8,82 @@ import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import com.v2ray.ang.AngApplication
-import me.drakeet.support.toast.ToastCompat
+import es.dmoral.toasty.Toasty
-import org.json.JSONObject
 import java.io.Serializable
 import java.net.URI
-import java.net.URLConnection
 
 val Context.v2RayApplication: AngApplication?
     get() = applicationContext as? AngApplication
 
+/**
+ * Shows a toast message with the given resource ID.
+ *
+ * @param message The resource ID of the message to show.
+ */
 fun Context.toast(message: Int) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
+    Toasty.normal(this, message).show()
 }
 
+/**
+ * Shows a toast message with the given text.
+ *
+ * @param message The text of the message to show.
+ */
 fun Context.toast(message: CharSequence) {
-    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
+    Toasty.normal(this, message).show()
 }
 
-fun JSONObject.putOpt(pair: Pair<String, Any?>) {
+/**
-    put(pair.first, pair.second)
+ * Shows a toast message with the given resource ID.
+ *
+ * @param message The resource ID of the message to show.
+ */
+fun Context.toastSuccess(message: Int) {
+    Toasty.success(this, message, Toast.LENGTH_SHORT, true).show()
 }
 
-fun JSONObject.putOpt(pairs: Map<String, Any?>) {
+/**
-    pairs.forEach { put(it.key, it.value) }
+ * Shows a toast message with the given text.
+ *
+ * @param message The text of the message to show.
+ */
+fun Context.toastSuccess(message: CharSequence) {
+    Toasty.success(this, message, Toast.LENGTH_SHORT, true).show()
+}
+
+/**
+ * Shows a toast message with the given resource ID.
+ *
+ * @param message The resource ID of the message to show.
+ */
+fun Context.toastError(message: Int) {
+    Toasty.error(this, message, Toast.LENGTH_SHORT, true).show()
+}
+
+/**
+ * Shows a toast message with the given text.
+ *
+ * @param message The text of the message to show.
+ */
+fun Context.toastError(message: CharSequence) {
+    Toasty.error(this, message, Toast.LENGTH_SHORT, true).show()
 }
 
 const val THRESHOLD = 1000L
 const val DIVISOR = 1024.0
 
+/**
+ * Converts a Long value to a speed string.
+ *
+ * @return The speed string.
+ */
 fun Long.toSpeedString(): String = this.toTrafficString() + "/s"
 
+/**
+ * Converts a Long value to a traffic string.
+ *
+ * @return The traffic string.
+ */
 fun Long.toTrafficString(): String {
     val units = arrayOf("B", "KB", "MB", "GB", "TB", "PB")
     var size = this.toDouble()
@@ -49,20 +95,30 @@ fun Long.toTrafficString(): String {
     return String.format("%.1f %s", size, units[unitIndex])
 }
 
-val URLConnection.responseLength: Long
-    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        contentLengthLong
-    } else {
-        contentLength.toLong()
-    }
-
 val URI.idnHost: String
     get() = host?.replace("[", "")?.replace("]", "").orEmpty()
 
-fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "")
+/**
+ * Removes all whitespace from the string.
+ *
+ * @return The string without whitespace.
+ */
+fun String?.removeWhiteSpace(): String? = this?.replace(" ", "")
 
+/**
+ * Converts the string to a Long value, or returns 0 if the conversion fails.
+ *
+ * @return The Long value.
+ */
 fun String.toLongEx(): Long = toLongOrNull() ?: 0
 
+/**
+ * Listens for package changes and executes a callback when a change occurs.
+ *
+ * @param onetime Whether to unregister the receiver after the first callback.
+ * @param callback The callback to execute when a package change occurs.
+ * @return The BroadcastReceiver that was registered.
+ */
 fun Context.listenForPackageChanges(onetime: Boolean = true, callback: () -> Unit) =
     object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
@@ -85,14 +141,44 @@ fun Context.listenForPackageChanges(onetime: Boolean = true, callback: () -> Uni
         }
     }
 
+/**
+ * Retrieves a serializable object from the Bundle.
+ *
+ * @param key The key of the serializable object.
+ * @return The serializable object, or null if not found.
+ */
 inline fun <reified T : Serializable> Bundle.serializable(key: String): T? = when {
     Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
     else -> @Suppress("DEPRECATION") getSerializable(key) as? T
 }
 
+/**
+ * Retrieves a serializable object from the Intent.
+ *
+ * @param key The key of the serializable object.
+ * @return The serializable object, or null if not found.
+ */
 inline fun <reified T : Serializable> Intent.serializable(key: String): T? = when {
     Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java)
     else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T
 }
 
-inline fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty())
+/**
+ * Checks if the CharSequence is not null and not empty.
+ *
+ * @return True if the CharSequence is not null and not empty, false otherwise.
+ */
+fun CharSequence?.isNotNullEmpty(): Boolean = !this.isNullOrBlank()
+
+fun String.concatUrl(vararg paths: String): String {
+    val builder = StringBuilder(this.trimEnd('/'))
+
+    paths.forEach { path ->
+        val trimmedPath = path.trim('/')
+        if (trimmedPath.isNotEmpty()) {
+            builder.append('/').append(trimmedPath)
+        }
+    }
+
+    return builder.toString()
+}

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

@@ -6,11 +6,17 @@ import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.util.JsonUtil
 
 object CustomFmt : FmtBase() {
+    /**
+     * Parses a JSON string into a ProfileItem object.
+     *
+     * @param str the JSON string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         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,38 +1,60 @@
 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.handler.MmkvManager
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 open class FmtBase {
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @param userInfo the user information to include in the URI
+     * @param dicQuery the query parameters to include in the URI
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, String>?): String {
         val query = if (dicQuery != null)
-            ("?" + dicQuery.toList().joinToString(
+            "?" + dicQuery.toList().joinToString(
                 separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) }))
+                transform = { it.first + "=" + Utils.urlEncode(it.second) })
         else ""
 
         val url = String.format(
             "%s@%s:%s",
             Utils.urlEncode(userInfo ?: ""),
-            Utils.getIpv6Address(config.server),
+            Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
             config.serverPort
         )
 
         return "${url}${query}#${Utils.urlEncode(config.remarks)}"
     }
 
+    /**
+     * Extracts query parameters from a URI.
+     *
+     * @param uri the URI to extract query parameters from
+     * @return a map of query parameters
+     */
     fun getQueryParam(uri: URI): Map<String, String> {
         return uri.rawQuery.split("&")
             .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
     }
 
+    /**
+     * Populates a ProfileItem object with values from query parameters.
+     *
+     * @param config the ProfileItem object to populate
+     * @param queryParam the query parameters to use for populating the ProfileItem
+     * @param allowInsecure whether to allow insecure connections
+     */
     fun getItemFormQuery(config: ProfileItem, queryParam: Map<String, String>, allowInsecure: Boolean) {
         config.network = queryParam["type"] ?: NetworkType.TCP.type
-        //TODO
-        if (config.network == NetworkType.SPLIT_HTTP.type) config.network = NetworkType.XHTTP.type
         config.headerType = queryParam["headerType"]
         config.host = queryParam["host"]
         config.path = queryParam["path"]
@@ -47,30 +69,51 @@ open class FmtBase {
         config.xhttpExtra = queryParam["extra"]
 
         config.security = queryParam["security"]
-        config.insecure = if (queryParam["allowInsecure"].isNullOrEmpty()) {
+        if (config.security != AppConfig.TLS && config.security != AppConfig.REALITY) {
-            allowInsecure
+            config.security = null
-        } else {
+        }
-            queryParam["allowInsecure"].orEmpty() == "1"
+        // Support multiple possible query keys for allowInsecure like the C# implementation
+        val allowInsecureKeys = arrayOf("insecure", "allowInsecure", "allow_insecure")
+        config.insecure = when {
+            allowInsecureKeys.any { queryParam[it] == "1" } -> true
+            allowInsecureKeys.any { queryParam[it] == "0" } -> false
+            else -> allowInsecure
         }
         config.sni = queryParam["sni"]
         config.fingerPrint = queryParam["fp"]
         config.alpn = queryParam["alpn"]
+        config.echConfigList = queryParam["ech"]
         config.publicKey = queryParam["pbk"]
         config.shortId = queryParam["sid"]
         config.spiderX = queryParam["spx"]
+        config.mldsa65Verify = queryParam["pqv"]
         config.flow = queryParam["flow"]
     }
 
+    /**
+     * Creates a map of query parameters from a ProfileItem object.
+     *
+     * @param config the ProfileItem object to create query parameters from
+     * @return a map of query parameters
+     */
     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.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.echConfigList.let { if (it.isNotNullEmpty()) dicQuery["ech"] = it.orEmpty() }
         config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
         config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
         config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
         config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
+        config.mldsa65Verify.let { if (it.isNotNullEmpty()) dicQuery["pqv"] = it.orEmpty() }
         config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }
+        // Add two keys for compatibility: "insecure" and "allowInsecure"
+        if (config.security == AppConfig.TLS) {
+            val insecureFlag = if (config.insecure == true) "1" else "0"
+            dicQuery["insecure"] = insecureFlag
+            dicQuery["allowInsecure"] = insecureFlag
+        }
 
         val networkType = NetworkType.fromString(config.network)
         dicQuery["type"] = networkType.type
@@ -91,7 +134,7 @@ open class FmtBase {
                 config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
             }
 
-            NetworkType.SPLIT_HTTP, NetworkType.XHTTP -> {
+            NetworkType.XHTTP -> {
                 config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
                 config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
                 config.xhttpMode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
@@ -115,9 +158,27 @@ open class FmtBase {
                 config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
                 config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
             }
+
+            else -> {}
         }
 
         return dicQuery
     }
 
-}
+    fun getServerAddress(profileItem: ProfileItem): String {
+        if (Utils.isPureIpAddress(profileItem.server.orEmpty())) {
+            return profileItem.server.orEmpty()
+        }
+
+        val domain = HttpUtil.toIdnDomain(profileItem.server.orEmpty())
+        if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") != "2") {
+            return domain
+        }
+        //Resolve and replace domain
+        val resolvedIps = HttpUtil.resolveHostToIP(domain, MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
+        if (resolvedIps.isNullOrEmpty()) {
+            return domain
+        }
+        return resolvedIps.first()
+    }
+}

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

@@ -4,14 +4,20 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.isNotNullEmpty
-import kotlin.text.orEmpty
+import com.v2ray.ang.handler.V2rayConfigManager
 
 object HttpFmt : FmtBase() {
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HTTP)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HTTP)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
             server.port = profileItem.serverPort.orEmpty().toInt()
             if (profileItem.username.isNotNullEmpty()) {
                 val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
@@ -23,6 +29,4 @@ object HttpFmt : FmtBase() {
 
         return outboundBean
     }
-
-
 }

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

@@ -1,43 +1,49 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.Hysteria2Bean
+import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.UdpMasksBean.UdpMasksSettingsBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 object Hysteria2Fmt : FmtBase() {
+    /**
+     * Parses a Hysteria2 URI string into a ProfileItem object.
+     *
+     * @param str the Hysteria2 URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.HYSTERIA2)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
         config.security = AppConfig.TLS
+        config.network = NetworkType.HYSTERIA.type
 
         if (!uri.rawQuery.isNullOrEmpty()) {
             val queryParam = getQueryParam(uri)
 
-            config.security = queryParam["security"] ?: AppConfig.TLS
+            getItemFormQuery(config, queryParam, allowInsecure)
-            config.insecure = if (queryParam["insecure"].isNullOrEmpty()) {
-                allowInsecure
-            } else {
-                queryParam["insecure"].orEmpty() == "1"
-            }
-            config.sni = queryParam["sni"]
-            config.alpn = queryParam["alpn"]
 
+            config.security = queryParam["security"] ?: AppConfig.TLS
             config.obfsPassword = queryParam["obfs-password"]
             config.portHopping = queryParam["mport"]
+            if (config.portHopping.isNotNullEmpty()) {
+                config.portHoppingInterval = queryParam["mportHopInt"]
+            }
             config.pinSHA256 = queryParam["pinSHA256"]
 
         }
@@ -45,6 +51,12 @@ object Hysteria2Fmt : FmtBase() {
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = HashMap<String, String>()
 
@@ -60,6 +72,9 @@ object Hysteria2Fmt : FmtBase() {
         if (config.portHopping.isNotNullEmpty()) {
             dicQuery["mport"] = config.portHopping.orEmpty()
         }
+        if (config.portHoppingInterval.isNotNullEmpty()) {
+            dicQuery["mportHopInt"] = config.portHoppingInterval.orEmpty()
+        }
         if (config.pinSHA256.isNotNullEmpty()) {
             dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
         }
@@ -67,54 +82,40 @@ object Hysteria2Fmt : FmtBase() {
         return toUri(config, config.password, dicQuery)
     }
 
-    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
+    /**
-
+     * Converts a ProfileItem object to an OutboundBean object.
-        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
+     *
-            Hysteria2Bean.ObfsBean(
+     * @param profileItem the ProfileItem object to convert
-                type = "salamander",
+     * @return the converted OutboundBean object, or null if conversion fails
-                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 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,
-            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
-    }
-
-
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.HYSTERIA2)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2) ?: return null
+        profileItem.network = NetworkType.HYSTERIA.type
+        profileItem.alpn = "h3"
+
+        outboundBean.settings?.let { server ->
+            server.address = getServerAddress(profileItem)
+            server.port = profileItem.serverPort.orEmpty().toInt()
+        }
+
+        val sni = outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
+        }
+
+        outboundBean.streamSettings?.let {
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+        }
+
+        if (profileItem.obfsPassword.isNotNullEmpty()) {
+            outboundBean.streamSettings?.udpmasks = mutableListOf(
+                StreamSettingsBean.UdpMasksBean(
+                    type = "salamander",
+                    settings = UdpMasksSettingsBean(
+                        password = profileItem.obfsPassword
+                    )
+                )
+            )
+        }
         return outboundBean
     }
-
 }

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

@@ -1,18 +1,33 @@
 package com.v2ray.ang.fmt
 
+import android.util.Log
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 object ShadowsocksFmt : FmtBase() {
+    /**
+     * Parses a Shadowsocks URI string into a ProfileItem object.
+     *
+     * @param str the Shadowsocks URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         return parseSip002(str) ?: parseLegacy(str)
     }
 
+    /**
+     * Parses a SIP002 Shadowsocks URI string into a ProfileItem object.
+     *
+     * @param str the SIP002 Shadowsocks URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parseSip002(str: String): ProfileItem? {
         val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
 
@@ -21,7 +36,7 @@ object ShadowsocksFmt : FmtBase() {
         if (uri.port <= 0) return null
         if (uri.userInfo.isNullOrEmpty()) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
@@ -37,18 +52,30 @@ object ShadowsocksFmt : FmtBase() {
 
         if (!uri.rawQuery.isNullOrEmpty()) {
             val queryParam = getQueryParam(uri)
-
+            if (queryParam["plugin"]?.contains("obfs=http") == true) {
-            if (queryParam["plugin"] == "obfs-local" && queryParam["obfs"] == "http") {
+                val queryPairs = HashMap<String, String>()
+                for (pair in queryParam["plugin"]?.split(";") ?: listOf()) {
+                    val idx = pair.split("=")
+                    if (idx.count() == 2) {
+                        queryPairs.put(idx.first(), idx.last())
+                    }
+                }
                 config.network = NetworkType.TCP.type
                 config.headerType = "http"
-                config.host = queryParam["obfs-host"]
+                config.host = queryPairs["obfs-host"]
-                config.path = queryParam["path"]
+                config.path = queryPairs["path"]
             }
         }
 
         return config
     }
 
+    /**
+     * Parses a legacy Shadowsocks URI string into a ProfileItem object.
+     *
+     * @param str the legacy Shadowsocks URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parseLegacy(str: String): ProfileItem? {
         val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
         var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
@@ -58,7 +85,7 @@ object ShadowsocksFmt : FmtBase() {
                 config.remarks =
                     Utils.urlDecode(result.substring(indexSplit + 1, result.length))
             } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to decode remarks in SS legacy URL", e)
             }
 
             result = result.substring(0, indexSplit)
@@ -86,48 +113,42 @@ object ShadowsocksFmt : FmtBase() {
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val pw = "${config.method}:${config.password}"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SHADOWSOCKS)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
             server.port = profileItem.serverPort.orEmpty().toInt()
             server.password = profileItem.password
             server.method = profileItem.method
         }
 
-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.let {
-            profileItem.network.orEmpty(),
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
-            profileItem.headerType,
+        }
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
 
-        outboundBean?.streamSettings?.populateTlsSettings(
+        outboundBean?.streamSettings?.let {
-            profileItem.security.orEmpty(),
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-            profileItem.insecure == true,
+        }
-            profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
 
         return outboundBean
     }
-
-
 }

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

@@ -5,11 +5,17 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
-import kotlin.text.orEmpty
 
 object SocksFmt : FmtBase() {
+    /**
+     * Parses a Socks URI string into a ProfileItem object.
+     *
+     * @param str the Socks URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         val config = ProfileItem.create(EConfigType.SOCKS)
 
@@ -17,7 +23,7 @@ object SocksFmt : FmtBase() {
         if (uri.idnHost.isEmpty()) return null
         if (uri.port <= 0) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
@@ -32,6 +38,12 @@ object SocksFmt : FmtBase() {
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val pw =
             if (config.username.isNotNullEmpty())
@@ -39,14 +51,20 @@ object SocksFmt : FmtBase() {
             else
                 ":"
 
-        return toUri(config, Utils.encode(pw), null)
+        return toUri(config, Utils.encode(pw, true), null)
     }
 
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.SOCKS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SOCKS)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
             server.port = profileItem.serverPort.orEmpty().toInt()
             if (profileItem.username.isNotNullEmpty()) {
                 val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
@@ -58,5 +76,4 @@ object SocksFmt : FmtBase() {
 
         return outboundBean
     }
-
 }

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

@@ -7,17 +7,23 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
-import kotlin.text.orEmpty
 
 object TrojanFmt : FmtBase() {
+    /**
+     * Parses a Trojan URI string into a ProfileItem object.
+     *
+     * @param str the Trojan URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.TROJAN)
 
         val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
@@ -36,45 +42,41 @@ object TrojanFmt : FmtBase() {
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = getQueryDic(config)
 
         return toUri(config, config.password, dicQuery)
     }
 
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.TROJAN)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.TROJAN)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = profileItem.server.orEmpty()
+            server.address = getServerAddress(profileItem)
             server.port = profileItem.serverPort.orEmpty().toInt()
             server.password = profileItem.password
             server.flow = profileItem.flow
         }
 
-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.let {
-            profileItem.network.orEmpty(),
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
-            profileItem.headerType,
+        }
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
 
-        outboundBean?.streamSettings?.populateTlsSettings(
+        outboundBean?.streamSettings?.let {
-            profileItem.security.orEmpty(),
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-            profileItem.insecure == true,
+        }
-            profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
 
         return outboundBean
     }

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

@@ -6,12 +6,18 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 object VlessFmt : FmtBase() {
 
+    /**
+     * Parses a Vless URI string into a ProfileItem object.
+     *
+     * @param str the Vless URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.VLESS)
@@ -20,17 +26,23 @@ object VlessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
         config.method = queryParam["encryption"] ?: "none"
 
-       getItemFormQuery(config, queryParam, allowInsecure)
+        getItemFormQuery(config, queryParam, allowInsecure)
 
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = getQueryDic(config)
         dicQuery["encryption"] = config.method ?: "none"
@@ -38,46 +50,31 @@ object VlessFmt : FmtBase() {
         return toUri(config, config.password, dicQuery)
     }
 
-
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VLESS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VLESS)
 
         outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = getServerAddress(profileItem)
             vnext.port = profileItem.serverPort.orEmpty().toInt()
             vnext.users[0].id = profileItem.password.orEmpty()
             vnext.users[0].encryption = profileItem.method
             vnext.users[0].flow = profileItem.flow
         }
 
-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.let {
-            profileItem.network.orEmpty(),
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
-            profileItem.headerType,
+        }
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
-        outboundBean?.streamSettings?.xhttpSettings?.mode = profileItem.xhttpMode
-        outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra)
 
-        outboundBean?.streamSettings?.populateTlsSettings(
+        outboundBean?.streamSettings?.let {
-            profileItem.security.orEmpty(),
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-            profileItem.insecure == true,
+        }
-            profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            profileItem.publicKey,
-            profileItem.shortId,
-            profileItem.spiderX,
-        )
 
         return outboundBean
     }
-
-
 }

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

@@ -11,34 +11,40 @@ import com.v2ray.ang.dto.VmessQRCode
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI
-import kotlin.text.orEmpty
 
 object VmessFmt : FmtBase() {
+    /**
+     * Parses a Vmess string into a ProfileItem object.
+     *
+     * @param str the Vmess string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
             return parseVmessStd(str)
         }
 
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.VMESS)
 
         var result = str.replace(EConfigType.VMESS.protocolScheme, "")
         result = Utils.decode(result)
         if (TextUtils.isEmpty(result)) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
+            Log.w(AppConfig.TAG, "Toast decoding failed")
             return null
         }
-        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
+        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)
             || TextUtils.isEmpty(vmessQRCode.id)
             || TextUtils.isEmpty(vmessQRCode.net)
         ) {
-            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_incorrect_protocol")
+            Log.w(AppConfig.TAG, "Toast incorrect protocol")
             return null
         }
 
@@ -46,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
@@ -68,18 +78,28 @@ object VmessFmt : FmtBase() {
                 config.serviceName = vmessQRCode.path
                 config.authority = vmessQRCode.host
             }
+
             else -> {}
         }
 
         config.security = vmessQRCode.tls
-        config.insecure = allowInsecure
         config.sni = vmessQRCode.sni
         config.fingerPrint = vmessQRCode.fp
         config.alpn = vmessQRCode.alpn
-
+        config.insecure = when (vmessQRCode.insecure) {
+            "1" -> true
+            "0" -> false
+            else -> allowInsecure
+        }
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val vmessQRCode = VmessQRCode()
 
@@ -108,6 +128,7 @@ object VmessFmt : FmtBase() {
                 vmessQRCode.path = config.serviceName.orEmpty()
                 vmessQRCode.host = config.authority.orEmpty()
             }
+
             else -> {}
         }
 
@@ -118,11 +139,22 @@ object VmessFmt : FmtBase() {
         vmessQRCode.sni = config.sni.orEmpty()
         vmessQRCode.fp = config.fingerPrint.orEmpty()
         vmessQRCode.alpn = config.alpn.orEmpty()
+        vmessQRCode.insecure = when (config.insecure) {
+            true -> "1"
+            false -> "0"
+            else -> ""
+        }
 
         val json = JsonUtil.toJson(vmessQRCode)
         return Utils.encode(json)
     }
 
+    /**
+     * Parses a standard Vmess URI string into a ProfileItem object.
+     *
+     * @param str the standard Vmess URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parseVmessStd(str: String): ProfileItem? {
         val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
         val config = ProfileItem.create(EConfigType.VMESS)
@@ -131,7 +163,7 @@ object VmessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
@@ -142,40 +174,29 @@ object VmessFmt : FmtBase() {
         return config
     }
 
-
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.VMESS)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VMESS)
 
         outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = profileItem.server.orEmpty()
+            vnext.address = getServerAddress(profileItem)
             vnext.port = profileItem.serverPort.orEmpty().toInt()
             vnext.users[0].id = profileItem.password.orEmpty()
             vnext.users[0].security = profileItem.method
         }
 
-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.let {
-            profileItem.network.orEmpty(),
+            V2rayConfigManager.populateTransportSettings(it, profileItem)
-            profileItem.headerType,
+        }
-            profileItem.host,
-            profileItem.path,
-            profileItem.seed,
-            profileItem.quicSecurity,
-            profileItem.quicKey,
-            profileItem.mode,
-            profileItem.serviceName,
-            profileItem.authority,
-        )
 
-        outboundBean?.streamSettings?.populateTlsSettings(
+        outboundBean?.streamSettings?.let {
-            profileItem.security.orEmpty(),
+            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-            profileItem.insecure == true,
+        }
-            profileItem.sni,
-            profileItem.fingerPrint,
-            profileItem.alpn,
-            null,
-            null,
-            null
-        )
 
         return outboundBean
     }

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

@@ -6,11 +6,18 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.extension.removeWhiteSpace
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils
 import java.net.URI
-import kotlin.text.orEmpty
 
 object WireguardFmt : FmtBase() {
+    /**
+     * Parses a URI string into a ProfileItem object.
+     *
+     * @param str the URI string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parse(str: String): ProfileItem? {
         val config = ProfileItem.create(EConfigType.WIREGUARD)
 
@@ -18,20 +25,26 @@ object WireguardFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
         config.secretKey = uri.userInfo.orEmpty()
-        config.localAddress = (queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4)
+        config.localAddress = queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.publicKey = queryParam["publickey"].orEmpty()
-        config.preSharedKey = queryParam["presharedkey"].orEmpty()
+        config.preSharedKey = queryParam["presharedkey"]?.takeIf { it.isNotEmpty() }
         config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
-        config.reserved = (queryParam["reserved"] ?: "0,0,0")
+        config.reserved = queryParam["reserved"] ?: "0,0,0"
 
         return config
     }
 
+    /**
+     * Parses a Wireguard configuration file string into a ProfileItem object.
+     *
+     * @param str the Wireguard configuration file string to parse
+     * @return the parsed ProfileItem object, or null if parsing fails
+     */
     fun parseWireguardConfFile(str: String): ProfileItem? {
         val config = ProfileItem.create(EConfigType.WIREGUARD)
 
@@ -71,7 +84,7 @@ object WireguardFmt : FmtBase() {
         config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
         config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
         config.publicKey = peerParams["publickey"].orEmpty()
-        config.preSharedKey = peerParams["presharedkey"].orEmpty()
+        config.preSharedKey = peerParams["presharedkey"]?.takeIf { it.isNotEmpty() }
         val endpoint = peerParams["endpoint"].orEmpty()
         val endpointParts = endpoint.split(":", limit = 2)
         if (endpointParts.size == 2) {
@@ -86,37 +99,49 @@ object WireguardFmt : FmtBase() {
         return config
     }
 
+    /**
+     * Converts a ProfileItem object to an OutboundBean object.
+     *
+     * @param profileItem the ProfileItem object to convert
+     * @return the converted OutboundBean object, or null if conversion fails
+     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = OutboundBean.create(EConfigType.WIREGUARD)
+        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.WIREGUARD)
 
         outboundBean?.settings?.let { wireguard ->
             wireguard.secretKey = profileItem.secretKey
             wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
             wireguard.peers?.firstOrNull()?.let { peer ->
                 peer.publicKey = profileItem.publicKey.orEmpty()
-                peer.preSharedKey = profileItem.preSharedKey.orEmpty()
+                peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
                 peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
             }
             wireguard.mtu = profileItem.mtu
-            wireguard.reserved = profileItem.reserved?.split(",")?.map { it.toInt() }
+            wireguard.reserved = profileItem.reserved?.takeIf { it.isNotBlank() }?.split(",")?.filter { it.isNotBlank() }?.map { it.trim().toInt() }
         }
 
         return outboundBean
     }
 
+    /**
+     * Converts a ProfileItem object to a URI string.
+     *
+     * @param config the ProfileItem object to convert
+     * @return the converted URI string
+     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = HashMap<String, String>()
 
         dicQuery["publickey"] = config.publicKey.orEmpty()
         if (config.reserved != null) {
-            dicQuery["reserved"] = Utils.removeWhiteSpace(config.reserved).orEmpty()
+            dicQuery["reserved"] = config.reserved.removeWhiteSpace().orEmpty()
         }
-        dicQuery["address"] = Utils.removeWhiteSpace(config.localAddress).orEmpty()
+        dicQuery["address"] = config.localAddress.removeWhiteSpace().orEmpty()
         if (config.mtu != null) {
             dicQuery["mtu"] = config.mtu.toString()
         }
         if (config.preSharedKey != null) {
-            dicQuery["presharedkey"] = Utils.removeWhiteSpace(config.preSharedKey).orEmpty()
+            dicQuery["presharedkey"] = config.preSharedKey.removeWhiteSpace().orEmpty()
         }
 
         return toUri(config, config.secretKey, dicQuery)

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

@@ -7,7 +7,9 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.*
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -16,14 +18,309 @@ import com.v2ray.ang.fmt.TrojanFmt
 import com.v2ray.ang.fmt.VlessFmt
 import com.v2ray.ang.fmt.VmessFmt
 import com.v2ray.ang.fmt.WireguardFmt
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.QRCodeDecoder
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 object AngConfigManager {
+
+
     /**
-     * parse config form qrcode or...
+     * Shares the configuration to the clipboard.
+     *
+     * @param context The context.
+     * @param guid The GUID of the configuration.
+     * @return The result code.
+     */
+    fun share2Clipboard(context: Context, guid: String): Int {
+        try {
+            val conf = shareConfig(guid)
+            if (TextUtils.isEmpty(conf)) {
+                return -1
+            }
+
+            Utils.setClipboard(context, conf)
+
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to share config to clipboard", e)
+            return -1
+        }
+        return 0
+    }
+
+    /**
+     * Shares non-custom configurations to the clipboard.
+     *
+     * @param context The context.
+     * @param serverList The list of server GUIDs.
+     * @return The number of configurations shared.
+     */
+    fun shareNonCustomConfigsToClipboard(context: Context, serverList: List<String>): Int {
+        try {
+            val sb = StringBuilder()
+            for (guid in serverList) {
+                val url = shareConfig(guid)
+                if (TextUtils.isEmpty(url)) {
+                    continue
+                }
+                sb.append(url)
+                sb.appendLine()
+            }
+            if (sb.count() > 0) {
+                Utils.setClipboard(context, sb.toString())
+            }
+            return sb.lines().count() - 1
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to share non-custom configs to clipboard", e)
+            return -1
+        }
+    }
+
+    /**
+     * Shares the configuration as a QR code.
+     *
+     * @param guid The GUID of the configuration.
+     * @return The QR code bitmap.
+     */
+    fun share2QRCode(guid: String): Bitmap? {
+        try {
+            val conf = shareConfig(guid)
+            if (TextUtils.isEmpty(conf)) {
+                return null
+            }
+            return QRCodeDecoder.createQRCode(conf)
+
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to share config as QR code", e)
+            return null
+        }
+    }
+
+    /**
+     * Shares the full content of the configuration to the clipboard.
+     *
+     * @param context The context.
+     * @param guid The GUID of the configuration.
+     * @return The result code.
+     */
+    fun shareFullContent2Clipboard(context: Context, guid: String?): Int {
+        try {
+            if (guid == null) return -1
+            val result = V2rayConfigManager.getV2rayConfig(context, guid)
+            if (result.status) {
+                Utils.setClipboard(context, result.content)
+            } else {
+                return -1
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to share full content to clipboard", e)
+            return -1
+        }
+        return 0
+    }
+
+    /**
+     * Shares the configuration.
+     *
+     * @param guid The GUID of the configuration.
+     * @return The configuration string.
+     */
+    private fun shareConfig(guid: String): String {
+        try {
+            val config = MmkvManager.decodeServerConfig(guid) ?: return ""
+
+            return config.configType.protocolScheme + when (config.configType) {
+                EConfigType.VMESS -> VmessFmt.toUri(config)
+                EConfigType.CUSTOM -> ""
+                EConfigType.SHADOWSOCKS -> ShadowsocksFmt.toUri(config)
+                EConfigType.SOCKS -> SocksFmt.toUri(config)
+                EConfigType.HTTP -> ""
+                EConfigType.VLESS -> VlessFmt.toUri(config)
+                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)
+            return ""
+        }
+    }
+
+    /**
+     * Imports a batch of configurations.
+     *
+     * @param server The server string.
+     * @param subid The subscription ID.
+     * @param append Whether to append the configurations.
+     * @return A pair containing the number of configurations and subscriptions imported.
+     */
+    fun importBatchConfig(server: String?, subid: String, append: Boolean): Pair<Int, Int> {
+        var count = parseBatchConfig(Utils.decode(server), subid, append)
+        if (count <= 0) {
+            count = parseBatchConfig(server, subid, append)
+        }
+        if (count <= 0) {
+            count = parseCustomConfigServer(server, subid)
+        }
+
+        var countSub = parseBatchSubscription(server)
+        if (countSub <= 0) {
+            countSub = parseBatchSubscription(Utils.decode(server))
+        }
+        if (countSub > 0) {
+            updateConfigViaSubAll()
+        }
+
+        return count to countSub
+    }
+
+    /**
+     * Parses a batch of subscriptions.
+     *
+     * @param servers The servers string.
+     * @return The number of subscriptions parsed.
+     */
+    private fun parseBatchSubscription(servers: String?): Int {
+        try {
+            if (servers == null) {
+                return 0
+            }
+
+            var count = 0
+            servers.lines()
+                .distinct()
+                .forEach { str ->
+                    if (Utils.isValidSubUrl(str)) {
+                        count += importUrlAsSubscription(str)
+                    }
+                }
+            return count
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to parse batch subscription", e)
+        }
+        return 0
+    }
+
+    /**
+     * Parses a batch of configurations.
+     *
+     * @param servers The servers string.
+     * @param subid The subscription ID.
+     * @param append Whether to append the configurations.
+     * @return The number of configurations parsed.
+     */
+    private fun parseBatchConfig(servers: String?, subid: String, append: Boolean): Int {
+        try {
+            if (servers == null) {
+                return 0
+            }
+            val removedSelectedServer =
+                if (!TextUtils.isEmpty(subid) && !append) {
+                    MmkvManager.decodeServerConfig(
+                        MmkvManager.getSelectServer().orEmpty()
+                    )?.let {
+                        if (it.subscriptionId == subid) {
+                            return@let it
+                        }
+                        return@let null
+                    }
+                } else {
+                    null
+                }
+            if (!append) {
+                MmkvManager.removeServerViaSubid(subid)
+            }
+
+            val subItem = MmkvManager.decodeSubscription(subid)
+            var count = 0
+            servers.lines()
+                .distinct()
+                .reversed()
+                .forEach {
+                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
+                    if (resId == 0) {
+                        count++
+                    }
+                }
+            return count
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to parse batch config", e)
+        }
+        return 0
+    }
+
+    /**
+     * Parses a custom configuration server.
+     *
+     * @param server The server string.
+     * @param subid The subscription ID.
+     * @return The number of configurations parsed.
+     */
+    private fun parseCustomConfigServer(server: String?, subid: String): Int {
+        if (server == null) {
+            return 0
+        }
+        if (server.contains("inbounds")
+            && server.contains("outbounds")
+            && server.contains("routing")
+        ) {
+            try {
+                val serverList: Array<Any> =
+                    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
+                        val key = MmkvManager.encodeServerConfig("", config)
+                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv) ?: "")
+                        count += 1
+                    }
+                    return count
+                }
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to parse custom config server JSON array", e)
+            }
+
+            try {
+                // For compatibility
+                val config = CustomFmt.parse(server) ?: return 0
+                config.subscriptionId = subid
+                val key = MmkvManager.encodeServerConfig("", config)
+                MmkvManager.encodeServerRaw(key, server)
+                return 1
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to parse custom config server as single config", e)
+            }
+            return 0
+        } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
+            try {
+                val config = WireguardFmt.parseWireguardConfFile(server) ?: return R.string.toast_incorrect_protocol
+                val key = MmkvManager.encodeServerConfig("", config)
+                MmkvManager.encodeServerRaw(key, server)
+                return 1
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to parse WireGuard config file", e)
+            }
+            return 0
+        } else {
+            return 0
+        }
+    }
+
+    /**
+     * Parses the configuration from a QR code or string.
+     *
+     * @param str The configuration string.
+     * @param subid The subscription ID.
+     * @param subItem The subscription item.
+     * @param removedSelectedServer The removed selected server.
+     * @return The result code.
      */
     private fun parseConfig(
         str: String?,
@@ -72,249 +369,17 @@ object AngConfigManager {
                 MmkvManager.setSelectServer(guid)
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to parse config", e)
             return -1
         }
         return 0
     }
 
     /**
-     * share config
+     * Updates the configuration via all subscriptions.
+     *
+     * @return The number of configurations updated.
      */
-    private fun shareConfig(guid: String): String {
-        try {
-            val config = MmkvManager.decodeServerConfig(guid) ?: return ""
-
-            return config.configType.protocolScheme + when (config.configType) {
-                EConfigType.VMESS -> VmessFmt.toUri(config)
-                EConfigType.CUSTOM -> ""
-                EConfigType.SHADOWSOCKS -> ShadowsocksFmt.toUri(config)
-                EConfigType.SOCKS -> SocksFmt.toUri(config)
-                EConfigType.HTTP -> ""
-                EConfigType.VLESS -> VlessFmt.toUri(config)
-                EConfigType.TROJAN -> TrojanFmt.toUri(config)
-                EConfigType.WIREGUARD -> WireguardFmt.toUri(config)
-                EConfigType.HYSTERIA2 -> Hysteria2Fmt.toUri(config)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return ""
-        }
-    }
-
-    /**
-     * share2Clipboard
-     */
-    fun share2Clipboard(context: Context, guid: String): Int {
-        try {
-            val conf = shareConfig(guid)
-            if (TextUtils.isEmpty(conf)) {
-                return -1
-            }
-
-            Utils.setClipboard(context, conf)
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    /**
-     * share2Clipboard
-     */
-    fun shareNonCustomConfigsToClipboard(context: Context, serverList: List<String>): Int {
-        try {
-            val sb = StringBuilder()
-            for (guid in serverList) {
-                val url = shareConfig(guid)
-                if (TextUtils.isEmpty(url)) {
-                    continue
-                }
-                sb.append(url)
-                sb.appendLine()
-            }
-            if (sb.count() > 0) {
-                Utils.setClipboard(context, sb.toString())
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    /**
-     * share2QRCode
-     */
-    fun share2QRCode(guid: String): Bitmap? {
-        try {
-            val conf = shareConfig(guid)
-            if (TextUtils.isEmpty(conf)) {
-                return null
-            }
-            return QRCodeDecoder.createQRCode(conf)
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return null
-        }
-    }
-
-    /**
-     * shareFullContent2Clipboard
-     */
-    fun shareFullContent2Clipboard(context: Context, guid: String?): Int {
-        try {
-            if (guid == null) return -1
-            val result = V2rayConfigManager.getV2rayConfig(context, guid)
-            if (result.status) {
-                Utils.setClipboard(context, result.content)
-            } else {
-                return -1
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return -1
-        }
-        return 0
-    }
-
-    fun importBatchConfig(server: String?, subid: String, append: Boolean): Pair<Int, Int> {
-        var count = parseBatchConfig(Utils.decode(server), subid, append)
-        if (count <= 0) {
-            count = parseBatchConfig(server, subid, append)
-        }
-        if (count <= 0) {
-            count = parseCustomConfigServer(server, subid)
-        }
-
-        var countSub = parseBatchSubscription(server)
-        if (countSub <= 0) {
-            countSub = parseBatchSubscription(Utils.decode(server))
-        }
-        if (countSub > 0) {
-            updateConfigViaSubAll()
-        }
-
-        return count to countSub
-    }
-
-    fun parseBatchSubscription(servers: String?): Int {
-        try {
-            if (servers == null) {
-                return 0
-            }
-
-            var count = 0
-            servers.lines()
-                .distinct()
-                .forEach { str ->
-                    if (Utils.isValidSubUrl(str)) {
-                        count += importUrlAsSubscription(str)
-                    }
-                }
-            return count
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return 0
-    }
-
-    fun parseBatchConfig(servers: String?, subid: String, append: Boolean): Int {
-        try {
-            if (servers == null) {
-                return 0
-            }
-            val removedSelectedServer =
-                if (!TextUtils.isEmpty(subid) && !append) {
-                    MmkvManager.decodeServerConfig(
-                        MmkvManager.getSelectServer().orEmpty()
-                    )?.let {
-                        if (it.subscriptionId == subid) {
-                            return@let it
-                        }
-                        return@let null
-                    }
-                } else {
-                    null
-                }
-            if (!append) {
-                MmkvManager.removeServerViaSubid(subid)
-            }
-
-            val subItem = MmkvManager.decodeSubscription(subid)
-            var count = 0
-            servers.lines()
-                .distinct()
-                .reversed()
-                .forEach {
-                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
-                    if (resId == 0) {
-                        count++
-                    }
-                }
-            return count
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return 0
-    }
-
-    fun parseCustomConfigServer(server: String?, subid: String): Int {
-        if (server == null) {
-            return 0
-        }
-        if (server.contains("inbounds")
-            && server.contains("outbounds")
-            && server.contains("routing")
-        ) {
-            try {
-                val serverList: Array<Any> =
-                    JsonUtil.fromJson(server, Array<Any>::class.java)
-
-                if (serverList.isNotEmpty()) {
-                    var count = 0
-                    for (srv in serverList.reversed()) {
-                        val config = CustomFmt.parse(JsonUtil.toJson(srv)) ?: continue
-                        config.subscriptionId = subid
-                        val key = MmkvManager.encodeServerConfig("", config)
-                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv)?:"")
-                        count += 1
-                    }
-                    return count
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-
-            try {
-                // For compatibility
-                val config = CustomFmt.parse(server) ?: return 0
-                config.subscriptionId = subid
-                val key = MmkvManager.encodeServerConfig("", config)
-                MmkvManager.encodeServerRaw(key, server)
-                return 1
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            return 0
-        } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
-            try {
-                val config = WireguardFmt.parseWireguardConfFile(server) ?: return R.string.toast_incorrect_protocol
-                val key = MmkvManager.encodeServerConfig("", config)
-                MmkvManager.encodeServerRaw(key, server)
-                return 1
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            return 0
-        } else {
-            return 0
-        }
-    }
-
     fun updateConfigViaSubAll(): Int {
         var count = 0
         try {
@@ -322,12 +387,18 @@ object AngConfigManager {
                 count += updateConfigViaSub(it)
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to update config via all subscriptions", e)
             return 0
         }
         return count
     }
 
+    /**
+     * Updates the configuration via a subscription.
+     *
+     * @param it The subscription item.
+     * @return The number of configurations updated.
+     */
     fun updateConfigViaSub(it: Pair<String, SubscriptionItem>): Int {
         try {
             if (TextUtils.isEmpty(it.first)
@@ -339,38 +410,57 @@ object AngConfigManager {
             if (!it.second.enabled) {
                 return 0
             }
-            val url = Utils.idnToASCII(it.second.url)
+            val url = HttpUtil.toIdnUrl(it.second.url)
             if (!Utils.isValidUrl(url)) {
                 return 0
             }
-            Log.d(AppConfig.ANG_PACKAGE, url)
+            if (!it.second.allowInsecureUrl) {
+                if (!Utils.isValidSubUrl(url)) {
+                    return 0
+                }
+            }
+            Log.i(AppConfig.TAG, url)
+            val userAgent = it.second.userAgent
 
             var configText = try {
                 val httpPort = SettingsManager.getHttpPort()
-                Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, userAgent, 15000, httpPort)
             } catch (e: Exception) {
-                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
+                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error", e)
-                //e.printStackTrace()
                 ""
             }
             if (configText.isEmpty()) {
                 configText = try {
-                    Utils.getUrlContentWithCustomUserAgent(url)
+                    HttpUtil.getUrlContentWithUserAgent(url, userAgent)
                 } catch (e: Exception) {
-                    e.printStackTrace()
+                    Log.e(AppConfig.TAG, "Update subscription: Failed to get URL content with user agent", e)
                     ""
                 }
             }
             if (configText.isEmpty()) {
                 return 0
             }
-            return parseConfigViaSub(configText, it.first, false)
+            val count = parseConfigViaSub(configText, it.first, false)
+            if (count > 0) {
+                it.second.lastUpdated = System.currentTimeMillis()
+                MmkvManager.encodeSubscription(it.first, it.second)
+                Log.i(AppConfig.TAG, "Subscription updated: ${it.second.remarks}, $count configs")
+            }
+            return count
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to update config via subscription", e)
             return 0
         }
     }
 
+    /**
+     * Parses the configuration via a subscription.
+     *
+     * @param server The server string.
+     * @param subid The subscription ID.
+     * @param append Whether to append the configurations.
+     * @return The number of configurations parsed.
+     */
     private fun parseConfigViaSub(server: String?, subid: String, append: Boolean): Int {
         var count = parseBatchConfig(Utils.decode(server), subid, append)
         if (count <= 0) {
@@ -382,6 +472,12 @@ object AngConfigManager {
         return count
     }
 
+    /**
+     * Imports a URL as a subscription.
+     *
+     * @param url The URL.
+     * @return The number of subscriptions imported.
+     */
     private fun importUrlAsSubscription(url: String): Int {
         val subscriptions = MmkvManager.decodeSubscriptions()
         subscriptions.forEach {

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

@@ -1,191 +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.AppConfig.ANG_PACKAGE
-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.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-
-object MigrateManager {
-    private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
-    private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-
-    fun migrateServerConfig2Profile(): Boolean {
-        if (serverStorage.count().toInt() == 0) {
-            return false
-        }
-        val serverList = serverStorage.allKeys() ?: return false
-        Log.d(ANG_PACKAGE, "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.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + config.remarks)
-        }
-        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-end")
-        return true
-    }
-
-    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
-        }
-    }
-
-    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 = Utils.removeWhiteSpace(tlsSettings?.alpn?.joinToString(",")).toString()
-
-        config.publicKey = tlsSettings?.publicKey
-        config.shortId = tlsSettings?.shortId
-        config.spiderX = tlsSettings?.spiderX
-
-        return config
-    }
-
-    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
-    }
-
-    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
-    }
-
-    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 = Utils.removeWhiteSpace((wireguard.address as List<*>).joinToString(",")).toString()
-            config.publicKey = wireguard.peers?.getOrNull(0)?.publicKey
-            config.mtu = wireguard.mtu
-            config.reserved = Utils.removeWhiteSpace(wireguard.reserved?.joinToString(",")).toString()
-        }
-        return config
-    }
-
-    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 = Utils.removeWhiteSpace(tlsSetting.alpn?.joinToString(",")).orEmpty()
-
-        }
-        config.obfsPassword = outbound.settings?.obfsPassword
-
-        return config
-    }
-
-    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
-    }
-
-
-    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,6 +1,5 @@
 package com.v2ray.ang.handler
 
-
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
 import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
@@ -9,6 +8,7 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.WebDavConfig
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 
@@ -27,6 +27,7 @@ object MmkvManager {
     private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
     private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
     private const val KEY_SUB_IDS = "SUB_IDS"
+    private const val KEY_WEBDAV_CONFIG = "WEBDAV_CONFIG"
 
     //private val profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
     private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
@@ -41,28 +42,53 @@ object MmkvManager {
 
     //region Server
 
+    /**
+     * Gets the selected server GUID.
+     *
+     * @return The selected server GUID.
+     */
     fun getSelectServer(): String? {
         return mainStorage.decodeString(KEY_SELECTED_SERVER)
     }
 
+    /**
+     * Sets the selected server GUID.
+     *
+     * @param guid The server GUID.
+     */
     fun setSelectServer(guid: String) {
         mainStorage.encode(KEY_SELECTED_SERVER, guid)
     }
 
+    /**
+     * Encodes the server list.
+     *
+     * @param serverList The list of server GUIDs.
+     */
     fun encodeServerList(serverList: MutableList<String>) {
         mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
     }
 
+    /**
+     * Decodes the server list.
+     *
+     * @return The list of server GUIDs.
+     */
     fun decodeServerList(): MutableList<String> {
         val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList() ?: mutableListOf()
         }
     }
 
-
+    /**
+     * Decodes the server configuration.
+     *
+     * @param guid The server GUID.
+     * @return The server configuration.
+     */
     fun decodeServerConfig(guid: String): ProfileItem? {
         if (guid.isBlank()) {
             return null
@@ -85,6 +111,13 @@ object MmkvManager {
 //        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
 //    }
 
+    /**
+     * Encodes the server configuration.
+     *
+     * @param guid The server GUID.
+     * @param config The server configuration.
+     * @return The server GUID.
+     */
     fun encodeServerConfig(guid: String, config: ProfileItem): String {
         val key = guid.ifBlank { Utils.getUuid() }
         profileFullStorage.encode(key, JsonUtil.toJson(config))
@@ -107,6 +140,11 @@ object MmkvManager {
         return key
     }
 
+    /**
+     * Removes the server configuration.
+     *
+     * @param guid The server GUID.
+     */
     fun removeServer(guid: String) {
         if (guid.isBlank()) {
             return
@@ -122,6 +160,11 @@ object MmkvManager {
         serverAffStorage.remove(guid)
     }
 
+    /**
+     * Removes the server configurations via subscription ID.
+     *
+     * @param subid The subscription ID.
+     */
     fun removeServerViaSubid(subid: String) {
         if (subid.isBlank()) {
             return
@@ -135,6 +178,12 @@ object MmkvManager {
         }
     }
 
+    /**
+     * Decodes the server affiliation information.
+     *
+     * @param guid The server GUID.
+     * @return The server affiliation information.
+     */
     fun decodeServerAffiliationInfo(guid: String): ServerAffiliationInfo? {
         if (guid.isBlank()) {
             return null
@@ -146,6 +195,12 @@ object MmkvManager {
         return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
     }
 
+    /**
+     * Encodes the server test delay in milliseconds.
+     *
+     * @param guid The server GUID.
+     * @param testResult The test delay in milliseconds.
+     */
     fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
         if (guid.isBlank()) {
             return
@@ -155,6 +210,11 @@ object MmkvManager {
         serverAffStorage.encode(guid, JsonUtil.toJson(aff))
     }
 
+    /**
+     * Clears all test delay results.
+     *
+     * @param keys The list of server GUIDs.
+     */
     fun clearAllTestDelayResults(keys: List<String>?) {
         keys?.forEach { key ->
             decodeServerAffiliationInfo(key)?.let { aff ->
@@ -164,18 +224,33 @@ object MmkvManager {
         }
     }
 
-    fun removeAllServer() {
+    /**
+     * Removes all server configurations.
+     *
+     * @return The number of server configurations removed.
+     */
+    fun removeAllServer(): Int {
+        val count = profileFullStorage.allKeys()?.count() ?: 0
         mainStorage.clearAll()
         profileFullStorage.clearAll()
         //profileStorage.clearAll()
         serverAffStorage.clearAll()
+        return count
     }
 
-    fun removeInvalidServer(guid: String) {
+    /**
+     * Removes invalid server configurations.
+     *
+     * @param guid The server GUID.
+     * @return The number of server configurations removed.
+     */
+    fun removeInvalidServer(guid: String): Int {
+        var count = 0
         if (guid.isNotEmpty()) {
             decodeServerAffiliationInfo(guid)?.let { aff ->
                 if (aff.testDelayMillis < 0L) {
                     removeServer(guid)
+                    count++
                 }
             }
         } else {
@@ -183,16 +258,30 @@ object MmkvManager {
                 decodeServerAffiliationInfo(key)?.let { aff ->
                     if (aff.testDelayMillis < 0L) {
                         removeServer(key)
+                        count++
                     }
                 }
             }
         }
+        return count
     }
 
+    /**
+     * Encodes the raw server configuration.
+     *
+     * @param guid The server GUID.
+     * @param config The raw server configuration.
+     */
     fun encodeServerRaw(guid: String, config: String) {
         serverRawStorage.encode(guid, config)
     }
 
+    /**
+     * Decodes the raw server configuration.
+     *
+     * @param guid The server GUID.
+     * @return The raw server configuration.
+     */
     fun decodeServerRaw(guid: String): String? {
         return serverRawStorage.decodeString(guid)
     }
@@ -201,6 +290,9 @@ object MmkvManager {
 
     //region Subscriptions
 
+    /**
+     * Initializes the subscription list.
+     */
     private fun initSubsList() {
         val subsList = decodeSubsList()
         if (subsList.isNotEmpty()) {
@@ -212,6 +304,11 @@ object MmkvManager {
         encodeSubsList(subsList)
     }
 
+    /**
+     * Decodes the subscriptions.
+     *
+     * @return The list of subscriptions.
+     */
     fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
         initSubsList()
 
@@ -219,12 +316,18 @@ object MmkvManager {
         decodeSubsList().forEach { key ->
             val json = subStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                subscriptions.add(Pair(key, JsonUtil.fromJson(json, SubscriptionItem::class.java)))
+                val item = JsonUtil.fromJson(json, SubscriptionItem::class.java)?: SubscriptionItem()
+                subscriptions.add(Pair(key, item))
             }
         }
         return subscriptions
     }
 
+    /**
+     * Removes the subscription.
+     *
+     * @param subid The subscription ID.
+     */
     fun removeSubscription(subid: String) {
         subStorage.remove(subid)
         val subsList = decodeSubsList()
@@ -234,6 +337,12 @@ object MmkvManager {
         removeServerViaSubid(subid)
     }
 
+    /**
+     * Encodes the subscription.
+     *
+     * @param guid The subscription GUID.
+     * @param subItem The subscription item.
+     */
     fun encodeSubscription(guid: String, subItem: SubscriptionItem) {
         val key = guid.ifBlank { Utils.getUuid() }
         subStorage.encode(key, JsonUtil.toJson(subItem))
@@ -245,21 +354,37 @@ object MmkvManager {
         }
     }
 
+    /**
+     * Decodes the subscription.
+     *
+     * @param subscriptionId The subscription ID.
+     * @return The subscription item.
+     */
     fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
         val json = subStorage.decodeString(subscriptionId) ?: return null
         return JsonUtil.fromJson(json, SubscriptionItem::class.java)
     }
 
+    /**
+     * Encodes the subscription list.
+     *
+     * @param subsList The list of subscription IDs.
+     */
     fun encodeSubsList(subsList: MutableList<String>) {
         mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList))
     }
 
+    /**
+     * Decodes the subscription list.
+     *
+     * @return The list of subscription IDs.
+     */
     fun decodeSubsList(): MutableList<String> {
         val json = mainStorage.decodeString(KEY_SUB_IDS)
         return if (json.isNullOrBlank()) {
             mutableListOf()
         } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList()?: mutableListOf()
         }
     }
 
@@ -267,26 +392,49 @@ object MmkvManager {
 
     //region Asset
 
+    /**
+     * Decodes the asset URLs.
+     *
+     * @return The list of asset URLs.
+     */
     fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
         val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
         assetStorage.allKeys()?.forEach { key ->
             val json = assetStorage.decodeString(key)
             if (!json.isNullOrBlank()) {
-                assetUrlItems.add(Pair(key, JsonUtil.fromJson(json, AssetUrlItem::class.java)))
+                val item = JsonUtil.fromJson(json, AssetUrlItem::class.java)?: AssetUrlItem()
+                assetUrlItems.add(Pair(key, item))
             }
         }
         return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
     }
 
+    /**
+     * Removes the asset URL.
+     *
+     * @param assetid The asset ID.
+     */
     fun removeAssetUrl(assetid: String) {
         assetStorage.remove(assetid)
     }
 
+    /**
+     * Encodes the asset.
+     *
+     * @param assetid The asset ID.
+     * @param assetItem The asset item.
+     */
     fun encodeAsset(assetid: String, assetItem: AssetUrlItem) {
         val key = assetid.ifBlank { Utils.getUuid() }
         assetStorage.encode(key, JsonUtil.toJson(assetItem))
     }
 
+    /**
+     * Decodes the asset.
+     *
+     * @param assetid The asset ID.
+     * @return The asset item.
+     */
     fun decodeAsset(assetid: String): AssetUrlItem? {
         val json = assetStorage.decodeString(assetid) ?: return null
         return JsonUtil.fromJson(json, AssetUrlItem::class.java)
@@ -296,12 +444,22 @@ object MmkvManager {
 
     //region Routing
 
+    /**
+     * Decodes the routing rulesets.
+     *
+     * @return The list of routing rulesets.
+     */
     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()
     }
 
+    /**
+     * Encodes the routing rulesets.
+     *
+     * @param rulesetList The list of routing rulesets.
+     */
     fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
         if (rulesetList.isNullOrEmpty())
             encodeSettings(PREF_ROUTING_RULESET, "")
@@ -310,59 +468,195 @@ object MmkvManager {
     }
 
     //endregion
+
+    //region settings
+    /**
+     * Encodes the settings.
+     *
+     * @param key The settings key.
+     * @param value The settings value.
+     * @return Whether the encoding was successful.
+     */
     fun encodeSettings(key: String, value: String?): 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: Int): 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: 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.
+     *
+     * @param key The settings key.
+     * @param value The settings value.
+     * @return Whether the encoding was successful.
+     */
     fun encodeSettings(key: String, value: Boolean): 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: MutableSet<String>): Boolean {
         return settingsStorage.encode(key, value)
     }
 
-
+    /**
+     * Decodes the settings string.
+     *
+     * @param key The settings key.
+     * @return The settings value.
+     */
     fun decodeSettingsString(key: String): String? {
         return settingsStorage.decodeString(key)
     }
 
+    /**
+     * Decodes the settings string.
+     *
+     * @param key The settings key.
+     * @param defaultValue The default value.
+     * @return The settings value.
+     */
     fun decodeSettingsString(key: String, defaultValue: String?): String? {
         return settingsStorage.decodeString(key, defaultValue)
     }
 
-    fun decodeSettingsBool(key: String): Boolean {
+    /**
-        return settingsStorage.decodeBool(key,false)
+     * Decodes the settings integer.
-    }
+     *
-
+     * @param key The settings key.
-    fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
+     * @param defaultValue The default value.
-        return settingsStorage.decodeBool(key, defaultValue)
+     * @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.
+     *
+     * @param key The settings key.
+     * @return The settings value.
+     */
+    fun decodeSettingsBool(key: String): Boolean {
+        return settingsStorage.decodeBool(key, false)
+    }
+
+    /**
+     * Decodes the settings boolean.
+     *
+     * @param key The settings key.
+     * @param defaultValue The default value.
+     * @return The settings value.
+     */
+    fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
+        return settingsStorage.decodeBool(key, defaultValue)
+    }
+
+    /**
+     * Decodes the settings string set.
+     *
+     * @param key The settings key.
+     * @return The settings value.
+     */
     fun decodeSettingsStringSet(key: String): MutableSet<String>? {
         return settingsStorage.decodeStringSet(key)
     }
 
-    //endregion
+    /**
-
+     * Encodes the start on boot setting.
-    //region Others
+     *
-
+     * @param startOnBoot Whether to start on boot.
+     */
     fun encodeStartOnBoot(startOnBoot: Boolean) {
-        MmkvManager.encodeSettings(PREF_IS_BOOTED, startOnBoot)
+        encodeSettings(PREF_IS_BOOTED, startOnBoot)
     }
 
+    /**
+     * Decodes the start on boot setting.
+     *
+     * @return Whether to start on boot.
+     */
     fun decodeStartOnBoot(): Boolean {
         return decodeSettingsBool(PREF_IS_BOOTED, false)
     }
 
     //endregion
 
+    //region WebDAV
+
+    /**
+     * Encodes the WebDAV config as JSON into storage.
+     */
+    fun encodeWebDavConfig(config: WebDavConfig): Boolean {
+        return mainStorage.encode(KEY_WEBDAV_CONFIG, JsonUtil.toJson(config))
+    }
+
+    /**
+     * Decodes the WebDAV config from storage.
+     */
+    fun decodeWebDavConfig(): WebDavConfig? {
+        val json = mainStorage.decodeString(KEY_WEBDAV_CONFIG) ?: return null
+        return JsonUtil.fromJson(json, WebDavConfig::class.java)
+    }
+
+    //endregion
 }

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

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

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

@@ -0,0 +1,241 @@
+package com.v2ray.ang.handler
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Build
+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.ui.MainActivity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlin.math.min
+
+object NotificationManager {
+    private const val NOTIFICATION_ID = 1
+    private const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
+    private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
+    private const val NOTIFICATION_PENDING_INTENT_RESTART_V2RAY = 2
+    private const val NOTIFICATION_ICON_THRESHOLD = 3000
+
+    private var lastQueryTime = 0L
+    private var mBuilder: NotificationCompat.Builder? = null
+    private var speedNotificationJob: Job? = null
+    private var mNotificationManager: NotificationManager? = null
+
+    /**
+     * Starts the speed notification.
+     * @param currentConfig The current profile configuration.
+     */
+    fun startSpeedNotification(currentConfig: ProfileItem?) {
+        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)
+
+        speedNotificationJob = CoroutineScope(Dispatchers.IO).launch {
+            while (isActive) {
+                val queryTime = System.currentTimeMillis()
+                val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                var proxyTotal = 0L
+                val text = StringBuilder()
+                outboundTags?.forEach {
+                    val up = V2RayServiceManager.queryStats(it, AppConfig.UPLINK)
+                    val down = V2RayServiceManager.queryStats(it, AppConfig.DOWNLINK)
+                    if (up + down > 0) {
+                        appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
+                        proxyTotal += up + down
+                    }
+                }
+                val directUplink = V2RayServiceManager.queryStats(AppConfig.TAG_DIRECT, AppConfig.UPLINK)
+                val directDownlink = V2RayServiceManager.queryStats(AppConfig.TAG_DIRECT, AppConfig.DOWNLINK)
+                val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
+                if (!zeroSpeed || !lastZeroSpeed) {
+                    if (proxyTotal == 0L) {
+                        appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
+                    }
+                    appendSpeedString(
+                        text, AppConfig.TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
+                        directDownlink / sinceLastQueryInSeconds
+                    )
+                    updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
+                }
+                lastZeroSpeed = zeroSpeed
+                lastQueryTime = queryTime
+                delay(3000)
+            }
+        }
+    }
+
+    /**
+     * Shows the notification.
+     * @param currentConfig The current profile configuration.
+     */
+    fun showNotification(currentConfig: ProfileItem?) {
+        val service = getService() ?: return
+        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)
+
+        val stopV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
+        stopV2RayIntent.`package` = AppConfig.ANG_PACKAGE
+        stopV2RayIntent.putExtra("key", AppConfig.MSG_STATE_STOP)
+        val stopV2RayPendingIntent = PendingIntent.getBroadcast(service, NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent, flags)
+
+        val restartV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
+        restartV2RayIntent.`package` = AppConfig.ANG_PACKAGE
+        restartV2RayIntent.putExtra("key", AppConfig.MSG_STATE_RESTART)
+        val restartV2RayPendingIntent = PendingIntent.getBroadcast(service, NOTIFICATION_PENDING_INTENT_RESTART_V2RAY, restartV2RayIntent, flags)
+
+        val channelId =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                createNotificationChannel()
+            } else {
+                // If earlier version channel ID is not used
+                // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                ""
+            }
+
+        mBuilder = NotificationCompat.Builder(service, channelId)
+            .setSmallIcon(R.drawable.ic_stat_name)
+            .setContentTitle(currentConfig?.remarks)
+            .setPriority(NotificationCompat.PRIORITY_MIN)
+            .setOngoing(true)
+            .setShowWhen(false)
+            .setOnlyAlertOnce(true)
+            .setContentIntent(contentPendingIntent)
+            .addAction(
+                R.drawable.ic_delete_24dp,
+                service.getString(R.string.notification_action_stop_v2ray),
+                stopV2RayPendingIntent
+            )
+            .addAction(
+                R.drawable.ic_delete_24dp,
+                service.getString(R.string.title_service_restart),
+                restartV2RayPendingIntent
+            )
+
+        //mBuilder?.setDefaults(NotificationCompat.FLAG_ONLY_ALERT_ONCE)
+
+        service.startForeground(NOTIFICATION_ID, mBuilder?.build())
+    }
+
+    /**
+     * Cancels the notification.
+     */
+    fun cancelNotification() {
+        val service = getService() ?: return
+        service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
+
+        mBuilder = null
+        speedNotificationJob?.cancel()
+        speedNotificationJob = null
+        mNotificationManager = null
+    }
+
+    /**
+     * Stops the speed notification.
+     * @param currentConfig The current profile configuration.
+     */
+    fun stopSpeedNotification(currentConfig: ProfileItem?) {
+        speedNotificationJob?.let {
+            it.cancel()
+            speedNotificationJob = null
+            updateNotification(currentConfig?.remarks, 0, 0)
+        }
+    }
+
+    /**
+     * Creates a notification channel for Android O and above.
+     * @return The channel ID.
+     */
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun createNotificationChannel(): String {
+        val channelId = AppConfig.RAY_NG_CHANNEL_ID
+        val channelName = AppConfig.RAY_NG_CHANNEL_NAME
+        val chan = NotificationChannel(
+            channelId,
+            channelName, NotificationManager.IMPORTANCE_HIGH
+        )
+        chan.lightColor = Color.DKGRAY
+        chan.importance = NotificationManager.IMPORTANCE_NONE
+        chan.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
+        getNotificationManager()?.createNotificationChannel(chan)
+        return channelId
+    }
+
+    /**
+     * Updates the notification with the given content text and traffic data.
+     * @param contentText The content text.
+     * @param proxyTraffic The proxy traffic.
+     * @param directTraffic The direct traffic.
+     */
+    private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) {
+        if (mBuilder != null) {
+            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_name)
+            } else if (proxyTraffic > directTraffic) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
+            } else {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
+            }
+            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
+            mBuilder?.setContentText(contentText)
+            getNotificationManager()?.notify(NOTIFICATION_ID, mBuilder?.build())
+        }
+    }
+
+    /**
+     * Gets the notification manager.
+     * @return The notification manager.
+     */
+    private fun getNotificationManager(): NotificationManager? {
+        if (mNotificationManager == null) {
+            val service = getService() ?: return null
+            mNotificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        }
+        return mNotificationManager
+    }
+
+    /**
+     * Appends the speed string to the given text.
+     * @param text The text to append to.
+     * @param name The name of the tag.
+     * @param up The uplink speed.
+     * @param down The downlink speed.
+     */
+    private fun appendSpeedString(text: StringBuilder, name: String?, up: Double, down: Double) {
+        var n = name ?: "no tag"
+        n = n.take(min(n.length, 6))
+        text.append(n)
+        for (i in n.length..6 step 2) {
+            text.append("\t")
+        }
+        text.append("•  ${up.toLong().toSpeedString()}↑  ${down.toLong().toSpeedString()}↓\n")
+    }
+
+    /**
+     * Gets the service instance.
+     * @return The service instance.
+     */
+    private fun getService(): Service? {
+        return V2RayServiceManager.serviceControl?.get()?.getService()
+    }
+}

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

@@ -4,26 +4,34 @@ import android.content.Context
 import android.content.res.AssetManager
 import android.text.TextUtils
 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.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.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.V2rayConfig
+import com.v2ray.ang.dto.VpnInterfaceAddressConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerList
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.Utils.parseInt
 import java.io.File
 import java.io.FileOutputStream
 import java.util.Collections
-import kotlin.Int
+import java.util.Locale
 
 object SettingsManager {
 
+    /**
+     * Initialize routing rulesets.
+     * @param context The application context.
+     */
     fun initRoutingRulesets(context: Context) {
         val exist = MmkvManager.decodeRoutingRulesets()
         if (exist.isNullOrEmpty()) {
@@ -32,6 +40,12 @@ object SettingsManager {
         }
     }
 
+    /**
+     * Get preset routing rulesets.
+     * @param context The application context.
+     * @param index The index of the routing type.
+     * @return A mutable list of RulesetItem.
+     */
     private fun getPresetRoutingRulesets(context: Context, index: Int = 0): MutableList<RulesetItem>? {
         val fileName = RoutingType.fromIndex(index).fileName
         val assets = Utils.readTextFromAssets(context, fileName)
@@ -39,22 +53,31 @@ object SettingsManager {
             return null
         }
 
-        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
+        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java)?.toMutableList()
     }
 
-
+    /**
+     * Reset routing rulesets from presets.
+     * @param context The application context.
+     * @param index The index of the routing type.
+     */
     fun resetRoutingRulesetsFromPresets(context: Context, index: Int) {
         val rulesetList = getPresetRoutingRulesets(context, index) ?: return
         resetRoutingRulesetsCommon(rulesetList)
     }
 
+    /**
+     * Reset routing rulesets.
+     * @param content The content of the rulesets.
+     * @return True if successful, false otherwise.
+     */
     fun resetRoutingRulesets(content: String?): Boolean {
         if (content.isNullOrEmpty()) {
             return false
         }
 
         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
             }
@@ -62,15 +85,19 @@ object SettingsManager {
             resetRoutingRulesetsCommon(rulesetList)
             return true
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(ANG_PACKAGE, "Failed to reset routing rulesets", e)
             return false
         }
     }
 
+    /**
+     * Common method to reset routing rulesets.
+     * @param rulesetList The list of rulesets.
+     */
     private fun resetRoutingRulesetsCommon(rulesetList: MutableList<RulesetItem>) {
         val rulesetNew: MutableList<RulesetItem> = mutableListOf()
         MmkvManager.decodeRoutingRulesets()?.forEach { key ->
-            if (key.looked == true) {
+            if (key.locked == true) {
                 rulesetNew.add(key)
             }
         }
@@ -79,6 +106,11 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetNew)
     }
 
+    /**
+     * Get a routing ruleset by index.
+     * @param index The index of the ruleset.
+     * @return The RulesetItem.
+     */
     fun getRoutingRuleset(index: Int): RulesetItem? {
         if (index < 0) return null
 
@@ -88,11 +120,18 @@ object SettingsManager {
         return rulesetList[index]
     }
 
+    /**
+     * Save a routing ruleset.
+     * @param index The index of the ruleset.
+     * @param ruleset The RulesetItem to save.
+     */
     fun saveRoutingRuleset(index: Int, ruleset: RulesetItem?) {
         if (ruleset == null) return
 
-        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        var rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) return
+        if (rulesetList.isNullOrEmpty()) {
+            rulesetList = mutableListOf()
+        }
 
         if (index < 0 || index >= rulesetList.count()) {
             rulesetList.add(0, ruleset)
@@ -102,6 +141,10 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
+    /**
+     * Remove a routing ruleset by index.
+     * @param index The index of the ruleset.
+     */
     fun removeRoutingRuleset(index: Int) {
         if (index < 0) return
 
@@ -112,7 +155,29 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
+    /**
+     * Check if routing rulesets bypass LAN.
+     * @return True if bypassing LAN, false otherwise.
+     */
     fun routingRulesetsBypassLan(): Boolean {
+        val vpnBypassLan = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_BYPASS_LAN) ?: "1"
+        if (vpnBypassLan == "1") {
+            return true
+        } else if (vpnBypassLan == "2") {
+            return false
+        }
+
+        val guid = MmkvManager.getSelectServer() ?: return false
+        val config = decodeServerConfig(guid) ?: return false
+        if (config.configType == EConfigType.CUSTOM) {
+            val raw = MmkvManager.decodeServerRaw(guid) ?: return false
+            val v2rayConfig = JsonUtil.fromJson(raw, V2rayConfig::class.java)
+            val exist = v2rayConfig?.routing?.rules?.filter { it.outboundTag == TAG_DIRECT }?.any {
+                it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
+            }
+            return exist == true
+        }
+
         val rulesetItems = MmkvManager.decodeRoutingRulesets()
         val exist = rulesetItems?.filter { it.enabled && it.outboundTag == TAG_DIRECT }?.any {
             it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
@@ -120,6 +185,11 @@ object SettingsManager {
         return exist == true
     }
 
+    /**
+     * Swap routing rulesets.
+     * @param fromPosition The position to swap from.
+     * @param toPosition The position to swap to.
+     */
     fun swapRoutingRuleset(fromPosition: Int, toPosition: Int) {
         val rulesetList = MmkvManager.decodeRoutingRulesets()
         if (rulesetList.isNullOrEmpty()) return
@@ -128,16 +198,26 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
+    /**
+     * Swap subscriptions.
+     * @param fromPosition The position to swap from.
+     * @param toPosition The position to swap to.
+     */
     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)
     }
 
+    /**
+     * Get server via remarks.
+     * @param remarks The remarks of the server.
+     * @return The ProfileItem.
+     */
     fun getServerViaRemarks(remarks: String?): ProfileItem? {
-        if (remarks == null) {
+        if (remarks.isNullOrEmpty()) {
             return null
         }
         val serverList = decodeServerList()
@@ -150,14 +230,27 @@ object SettingsManager {
         return null
     }
 
+    /**
+     * Get the SOCKS port.
+     * @return The SOCKS port.
+     */
     fun getSocksPort(): Int {
-        return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+        return Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
     }
 
+    /**
+     * Get the HTTP port.
+     * @return The HTTP port.
+     */
     fun getHttpPort(): Int {
-        return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+        return getSocksPort() + if (Utils.isXray()) 0 else 1
     }
 
+    /**
+     * Initialize assets.
+     * @param context The application context.
+     * @param assets The AssetManager.
+     */
     fun initAssets(context: Context, assets: AssetManager) {
         val extFolder = Utils.userAssetPath(context)
 
@@ -173,14 +266,150 @@ object SettingsManager {
                             input.copyTo(output)
                         }
                     }
-                    Log.i(
+                    Log.i(AppConfig.TAG, "Copied from apk assets folder to ${target.absolutePath}")
-                        ANG_PACKAGE,
-                        "Copied from apk assets folder to ${target.absolutePath}"
-                    )
                 }
         } catch (e: Exception) {
             Log.e(ANG_PACKAGE, "asset copy failed", e)
         }
+    }
 
+    /**
+     * Get domestic DNS servers from preference.
+     * @return A list of domestic DNS servers.
+     */
+    fun getDomesticDnsServers(): List<String> {
+        val domesticDns =
+            MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS) ?: AppConfig.DNS_DIRECT
+        val ret = domesticDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
+        if (ret.isEmpty()) {
+            return listOf(AppConfig.DNS_DIRECT)
+        }
+        return ret
+    }
+
+    /**
+     * Get remote DNS servers from preference.
+     * @return A list of remote DNS servers.
+     */
+    fun getRemoteDnsServers(): List<String> {
+        val remoteDns =
+            MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS) ?: AppConfig.DNS_PROXY
+        val ret = remoteDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
+        if (ret.isEmpty()) {
+            return listOf(AppConfig.DNS_PROXY)
+        }
+        return ret
+    }
+
+    /**
+     * Get VPN DNS servers from preference.
+     * @return A list of VPN DNS servers.
+     */
+    fun getVpnDnsServers(): List<String> {
+        val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
+        return vpnDns.split(",").filter { Utils.isPureIpAddress(it) }
+    }
+
+    /**
+     * Get delay test URL.
+     * @param second Whether to use the second URL.
+     * @return The delay test URL.
+     */
+    fun getDelayTestUrl(second: Boolean = false): String {
+        return if (second) {
+            AppConfig.DELAY_TEST_URL2
+        } else {
+            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
+                ?: AppConfig.DELAY_TEST_URL
+        }
+    }
+
+    /**
+     * Get the locale.
+     * @return The locale.
+     */
+    fun getLocale(): Locale {
+        val langCode =
+            MmkvManager.decodeSettingsString(AppConfig.PREF_LANGUAGE) ?: Language.AUTO.code
+        val language = Language.fromCode(langCode)
+
+        return when (language) {
+            Language.AUTO -> Utils.getSysLocale()
+            Language.ENGLISH -> Locale.ENGLISH
+            Language.CHINA -> Locale.CHINA
+            Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
+            Language.VIETNAMESE -> Locale.forLanguageTag("vi")
+            Language.RUSSIAN -> Locale.forLanguageTag("ru")
+            Language.PERSIAN -> Locale.forLanguageTag("fa")
+            Language.ARABIC -> Locale.forLanguageTag("ar")
+            Language.BANGLA -> Locale.forLanguageTag("bn")
+            Language.BAKHTIARI -> Locale.forLanguageTag("bqi-IR")
+        }
+    }
+
+    /**
+     * Set night mode.
+     */
+    fun setNightMode() {
+        when (MmkvManager.decodeSettingsString(AppConfig.PREF_UI_MODE_NIGHT, "0")) {
+            "0" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+            "1" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+            "2" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+        }
+    }
+
+    /**
+     * Retrieves the currently selected VPN interface address configuration.
+     * This method reads the user's preference for VPN interface addressing and returns
+     * the corresponding configuration containing IPv4 and IPv6 addresses.
+     *
+     * @return The selected VpnInterfaceAddressConfig instance, or the default configuration
+     *         if no valid selection is found or if the stored index is invalid.
+     */
+    fun getCurrentVpnInterfaceAddressConfig(): VpnInterfaceAddressConfig {
+        val selectedIndex = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX, "0")?.toInt()
+        return VpnInterfaceAddressConfig.getConfigByIndex(selectedIndex ?: 0)
+    }
+
+    /**
+     * Get the VPN MTU from settings, defaulting to AppConfig.VPN_MTU.
+     */
+    fun getVpnMtu(): Int {
+        return Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_MTU), AppConfig.VPN_MTU)
+    }
+
+    /**
+     * Check if HEV TUN is being used.
+     * @return True if HEV TUN is used, false otherwise.
+     */
+    fun isUsingHevTun(): Boolean {
+        return MmkvManager.decodeSettingsBool(AppConfig.PREF_USE_HEV_TUNNEL, true)
+    }
+
+    /**
+     * Ensure default settings are present in MMKV.
+     */
+    fun ensureDefaultSettings() {
+        // Write defaults in the exact order requested by the user
+        ensureDefaultValue(AppConfig.PREF_MODE, AppConfig.VPN)
+        ensureDefaultValue(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
+        ensureDefaultValue(AppConfig.PREF_VPN_MTU, AppConfig.VPN_MTU.toString())
+        ensureDefaultValue(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+        ensureDefaultValue(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
+        ensureDefaultValue(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
+        ensureDefaultValue(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
+        ensureDefaultValue(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)
+        ensureDefaultValue(AppConfig.PREF_IP_API_URL, AppConfig.IP_API_URL)
+        ensureDefaultValue(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT, AppConfig.HEVTUN_RW_TIMEOUT)
+        ensureDefaultValue(AppConfig.PREF_MUX_CONCURRENCY, "8")
+        ensureDefaultValue(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
+        ensureDefaultValue(AppConfig.PREF_FRAGMENT_LENGTH, "50-100")
+        ensureDefaultValue(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
+    }
+
+    private fun ensureDefaultValue(key: String, default: String) {
+        if (MmkvManager.decodeSettingsString(key).isNullOrEmpty()) {
+            MmkvManager.encodeSettings(key, default)
+        }
     }
 }

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

@@ -0,0 +1,147 @@
+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.R
+import com.v2ray.ang.dto.IPAPIInfo
+import com.v2ray.ang.util.HttpUtil
+import com.v2ray.ang.util.JsonUtil
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.isActive
+import java.io.IOException
+import java.net.InetSocketAddress
+import java.net.Socket
+import java.net.UnknownHostException
+
+object SpeedtestManager {
+
+    private val tcpTestingSockets = ArrayList<Socket?>()
+
+    /**
+     * Measures the TCP connection time to a given URL and port.
+     *
+     * @param url The URL to connect to.
+     * @param port The port to connect to.
+     * @return The connection time in milliseconds, or -1 if the connection failed.
+     */
+    suspend fun tcping(url: String, port: Int): Long {
+        var time = -1L
+        for (k in 0 until 2) {
+            val one = socketConnectTime(url, port)
+            if (!currentCoroutineContext().isActive) {
+                break
+            }
+            if (one != -1L && (time == -1L || one < time)) {
+                time = one
+            }
+        }
+        return time
+    }
+
+    /**
+     * Measures the time taken to establish a TCP connection to a given URL and port.
+     *
+     * @param url The URL to connect to.
+     * @param port The port to connect to.
+     * @return The connection time in milliseconds, or -1 if the connection failed.
+     */
+    fun socketConnectTime(url: String, port: Int): Long {
+        try {
+            val socket = Socket()
+            synchronized(this) {
+                tcpTestingSockets.add(socket)
+            }
+            val start = System.currentTimeMillis()
+            socket.connect(InetSocketAddress(url, port), 3000)
+            val time = System.currentTimeMillis() - start
+            synchronized(this) {
+                tcpTestingSockets.remove(socket)
+            }
+            socket.close()
+            return time
+        } catch (e: UnknownHostException) {
+            Log.e(AppConfig.TAG, "Unknown host: $url", e)
+        } catch (e: IOException) {
+            Log.e(AppConfig.TAG, "socketConnectTime IOException: $e")
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to establish socket connection to $url:$port", e)
+        }
+        return -1
+    }
+
+    /**
+     * Closes all TCP sockets that are currently being tested.
+     */
+    fun closeAllTcpSockets() {
+        synchronized(this) {
+            tcpTestingSockets.forEach {
+                it?.close()
+            }
+            tcpTestingSockets.clear()
+        }
+    }
+
+    /**
+     * Tests the connection to a given URL and port.
+     *
+     * @param context The Context in which the test is running.
+     * @param port The port to connect to.
+     * @return A pair containing the elapsed time in milliseconds and the result message.
+     */
+    fun testConnection(context: Context, port: Int): Pair<Long, String> {
+        var result: String
+        var elapsed = -1L
+
+        val conn = HttpUtil.createProxyConnection(SettingsManager.getDelayTestUrl(), port, 15000, 15000) ?: return Pair(elapsed, "")
+        try {
+            val start = SystemClock.elapsedRealtime()
+            val code = conn.responseCode
+            elapsed = SystemClock.elapsedRealtime() - start
+
+            result = when (code) {
+                204 -> context.getString(R.string.connection_test_available, elapsed)
+                200 if conn.contentLengthLong == 0L -> context.getString(R.string.connection_test_available, elapsed)
+                else -> throw IOException(
+                    context.getString(R.string.connection_test_error_status_code, code)
+                )
+            }
+        } catch (e: IOException) {
+            Log.e(AppConfig.TAG, "Connection test IOException", e)
+            result = context.getString(R.string.connection_test_error, e.message)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Connection test Exception", e)
+            result = context.getString(R.string.connection_test_error, e.message)
+        } finally {
+            conn.disconnect()
+        }
+
+        return Pair(elapsed, result)
+    }
+
+    fun getRemoteIPInfo(): String? {
+        val url = MmkvManager.decodeSettingsString(AppConfig.PREF_IP_API_URL)
+            .takeIf { !it.isNullOrBlank() } ?: AppConfig.IP_API_URL
+
+        val httpPort = SettingsManager.getHttpPort()
+        val content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: return null
+        val ipInfo = JsonUtil.fromJson(content, IPAPIInfo::class.java) ?: return null
+
+        val ip = listOf(
+            ipInfo.ip,
+            ipInfo.clientIp,
+            ipInfo.ip_addr,
+            ipInfo.query
+        ).firstOrNull { !it.isNullOrBlank() }
+
+        val country = listOf(
+            ipInfo.country_code,
+            ipInfo.country,
+            ipInfo.countryCode,
+            ipInfo.location?.country_code
+        ).firstOrNull { !it.isNullOrBlank() }
+
+        return "(${country ?: "unknown"}) ${ip ?: "unknown"}"
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.v2ray.ang.service
+package com.v2ray.ang.handler
 
 import android.annotation.SuppressLint
 import android.app.NotificationChannel
@@ -11,21 +11,16 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
-import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
-import com.v2ray.ang.handler.AngConfigManager.updateConfigViaSub
-import com.v2ray.ang.handler.MmkvManager
 
 object SubscriptionUpdater {
 
-
     class UpdateTask(context: Context, params: WorkerParameters) :
         CoroutineWorker(context, params) {
 
         private val notificationManager = NotificationManagerCompat.from(applicationContext)
         private val notification =
-            NotificationCompat.Builder(applicationContext, SUBSCRIPTION_UPDATE_CHANNEL)
+            NotificationCompat.Builder(applicationContext, AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
                 .setWhen(0)
                 .setTicker("Update")
                 .setContentTitle(context.getString(R.string.title_pref_auto_update_subscription))
@@ -33,9 +28,13 @@ object SubscriptionUpdater {
                 .setCategory(NotificationCompat.CATEGORY_SERVICE)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
+        /**
+         * Performs the subscription update work.
+         * @return The result of the work.
+         */
         @SuppressLint("MissingPermission")
         override suspend fun doWork(): Result {
-            Log.d(AppConfig.ANG_PACKAGE, "subscription automatic update starting")
+            Log.i(AppConfig.TAG, "subscription automatic update starting")
 
             val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
 
@@ -43,21 +42,18 @@ object SubscriptionUpdater {
                 val subItem = sub.second
 
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    notification.setChannelId(SUBSCRIPTION_UPDATE_CHANNEL)
+                    notification.setChannelId(AppConfig.SUBSCRIPTION_UPDATE_CHANNEL)
                     val channel =
                         NotificationChannel(
-                            SUBSCRIPTION_UPDATE_CHANNEL,
+                            AppConfig.SUBSCRIPTION_UPDATE_CHANNEL,
-                            SUBSCRIPTION_UPDATE_CHANNEL_NAME,
+                            AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME,
                             NotificationManager.IMPORTANCE_MIN
                         )
                     notificationManager.createNotificationChannel(channel)
                 }
                 notificationManager.notify(3, notification.build())
-                Log.d(
+                Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
-                    AppConfig.ANG_PACKAGE,
+                AngConfigManager.updateConfigViaSub(Pair(sub.first, subItem))
-                    "subscription automatic update: ---${subItem.remarks}"
-                )
-                updateConfigViaSub(Pair(sub.first, subItem))
                 notification.setContentText("Updating ${subItem.remarks}")
             }
             notificationManager.cancel(3)

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

@@ -0,0 +1,125 @@
+package com.v2ray.ang.handler
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.dto.CheckUpdateResult
+import com.v2ray.ang.dto.GitHubRelease
+import com.v2ray.ang.extension.concatUrl
+import com.v2ray.ang.util.HttpUtil
+import com.v2ray.ang.util.JsonUtil
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
+
+object UpdateCheckerManager {
+    suspend fun checkForUpdate(includePreRelease: Boolean = false): CheckUpdateResult = withContext(Dispatchers.IO) {
+        val url = if (includePreRelease) {
+            AppConfig.APP_API_URL
+        } else {
+            AppConfig.APP_API_URL.concatUrl("latest")
+        }
+
+        var response = HttpUtil.getUrlContent(url, 5000)
+        if (response.isNullOrEmpty()) {
+            val httpPort = SettingsManager.getHttpPort()
+            response = HttpUtil.getUrlContent(url, 5000, httpPort)
+                ?: throw IllegalStateException("Failed to get response")
+        }
+
+        val latestRelease = if (includePreRelease) {
+            JsonUtil.fromJson(response, Array<GitHubRelease>::class.java)
+                ?.firstOrNull()
+                ?: throw IllegalStateException("No pre-release found")
+        } else {
+            JsonUtil.fromJson(response, GitHubRelease::class.java)
+        }
+        if (latestRelease == null) {
+            return@withContext CheckUpdateResult(hasUpdate = false)
+        }
+
+        val latestVersion = latestRelease.tagName.removePrefix("v")
+        Log.i(
+            AppConfig.TAG,
+            "Found new version: $latestVersion (current: ${BuildConfig.VERSION_NAME})"
+        )
+
+        return@withContext if (compareVersions(latestVersion, BuildConfig.VERSION_NAME) > 0) {
+            val downloadUrl = getDownloadUrl(latestRelease, Build.SUPPORTED_ABIS[0])
+            CheckUpdateResult(
+                hasUpdate = true,
+                latestVersion = latestVersion,
+                releaseNotes = latestRelease.body,
+                downloadUrl = downloadUrl,
+                isPreRelease = latestRelease.prerelease
+            )
+        } else {
+            CheckUpdateResult(hasUpdate = false)
+        }
+    }
+
+    suspend fun downloadApk(context: Context, downloadUrl: String): File? = withContext(Dispatchers.IO) {
+        try {
+            val httpPort = SettingsManager.getHttpPort()
+            val connection = HttpUtil.createProxyConnection(downloadUrl, httpPort, 10000, 10000, true)
+                ?: throw IllegalStateException("Failed to create connection")
+
+            try {
+                val apkFile = File(context.cacheDir, "update.apk")
+                Log.i(AppConfig.TAG, "Downloading APK to: ${apkFile.absolutePath}")
+
+                FileOutputStream(apkFile).use { outputStream ->
+                    connection.inputStream.use { inputStream ->
+                        inputStream.copyTo(outputStream)
+                    }
+                }
+                Log.i(AppConfig.TAG, "APK download completed")
+                return@withContext apkFile
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to download APK: ${e.message}")
+                return@withContext null
+            } finally {
+                try {
+                    connection.disconnect()
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Error closing connection: ${e.message}")
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to initiate download: ${e.message}")
+            return@withContext null
+        }
+    }
+
+    private fun compareVersions(version1: String, version2: String): Int {
+        val v1 = version1.split(".")
+        val v2 = version2.split(".")
+
+        for (i in 0 until maxOf(v1.size, v2.size)) {
+            val num1 = if (i < v1.size) v1[i].toInt() else 0
+            val num2 = if (i < v2.size) v2[i].toInt() else 0
+            if (num1 != num2) return num1 - num2
+        }
+        return 0
+    }
+
+    private fun getDownloadUrl(release: GitHubRelease, abi: String): String {
+        val fDroid = "fdroid"
+
+        val assetsByAbi = release.assets.filter {
+            (it.name.contains(abi, true))
+        }
+
+        val asset = if (BuildConfig.APPLICATION_ID.contains(fDroid, ignoreCase = true)) {
+            assetsByAbi.firstOrNull { it.name.contains(fDroid) }
+        } else {
+            assetsByAbi.firstOrNull { !it.name.contains(fDroid) }
+        }
+
+        return asset?.browserDownloadUrl
+            ?: throw IllegalStateException("No compatible APK found")
+    }
+}

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

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

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

@@ -0,0 +1,371 @@
+package com.v2ray.ang.handler
+
+import android.app.Service
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+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.dto.ProfileItem
+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.util.Utils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import libv2ray.CoreCallbackHandler
+import libv2ray.CoreController
+import java.lang.ref.SoftReference
+
+object V2RayServiceManager {
+
+    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
+            V2RayNativeManager.initCoreEnv(value?.get()?.getService())
+        }
+
+    /**
+     * Starts the V2Ray service from a toggle action.
+     * @param context The context from which the service is started.
+     * @return True if the service was started successfully, false otherwise.
+     */
+    fun startVServiceFromToggle(context: Context): Boolean {
+        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+            context.toast(R.string.app_tile_first_use)
+            return false
+        }
+        startContextService(context)
+        return true
+    }
+
+    /**
+     * Starts the V2Ray service.
+     * @param context The context from which the service is started.
+     * @param guid The GUID of the server configuration to use (optional).
+     */
+    fun startVService(context: Context, guid: String? = null) {
+        if (guid != null) {
+            MmkvManager.setSelectServer(guid)
+        }
+        startContextService(context)
+    }
+
+    /**
+     * Stops the V2Ray service.
+     * @param context The context from which the service is stopped.
+     */
+    fun stopVService(context: Context) {
+        //context.toast(R.string.toast_services_stop)
+        MessageUtil.sendMsg2Service(context, AppConfig.MSG_STATE_STOP, "")
+    }
+
+    /**
+     * Checks if the V2Ray service is running.
+     * @return True if the service is running, false otherwise.
+     */
+    fun isRunning() = coreController.isRunning
+
+    /**
+     * Gets the name of the currently running server.
+     * @return The name of the running server.
+     */
+    fun getRunningServerName() = currentConfig?.remarks.orEmpty()
+
+    /**
+     * Starts the context service for V2Ray.
+     * Chooses between VPN service or Proxy-only service based on user settings.
+     * @param context The context from which the service is started.
+     */
+    private fun startContextService(context: Context) {
+        if (coreController.isRunning) {
+            return
+        }
+        val guid = MmkvManager.getSelectServer() ?: return
+        val config = MmkvManager.decodeServerConfig(guid) ?: return
+        if (config.configType != EConfigType.CUSTOM
+            && config.configType != EConfigType.POLICYGROUP
+            && !Utils.isValidUrl(config.server)
+            && !Utils.isPureIpAddress(config.server.orEmpty())
+        ) return
+//        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
+//        if (!result.status) return
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING)) {
+            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) {
+            Intent(context.applicationContext, V2RayVpnService::class.java)
+        } else {
+            Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
+        }
+        ContextCompat.startForegroundService(context, intent)
+    }
+
+    /**
+     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
+     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
+     * Starts the V2Ray core service.
+     */
+    fun startCoreLoop(vpnInterface: ParcelFileDescriptor?): Boolean {
+        if (coreController.isRunning) {
+            return false
+        }
+
+        val service = getService() ?: return false
+        val guid = MmkvManager.getSelectServer() ?: return false
+        val config = MmkvManager.decodeServerConfig(guid) ?: return false
+        val result = V2rayConfigManager.getV2rayConfig(service, guid)
+        if (!result.status)
+            return false
+
+        try {
+            val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
+            mFilter.addAction(Intent.ACTION_SCREEN_ON)
+            mFilter.addAction(Intent.ACTION_SCREEN_OFF)
+            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)
+            return false
+        }
+
+        currentConfig = config
+        var tunFd = vpnInterface?.fd ?: 0
+        if (SettingsManager.isUsingHevTun()) {
+            tunFd = 0
+        }
+
+        try {
+            coreController.startLoop(result.content, tunFd)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to start Core loop", e)
+            return false
+        }
+
+        if (coreController.isRunning == false) {
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
+            NotificationManager.cancelNotification()
+            return false
+        }
+
+        try {
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
+            NotificationManager.showNotification(currentConfig)
+            NotificationManager.startSpeedNotification(currentConfig)
+
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to startup service", e)
+            return false
+        }
+        return true
+    }
+
+    /**
+     * Stops the V2Ray core service.
+     * Unregisters broadcast receivers, stops notifications, and shuts down plugins.
+     * @return True if the core was stopped successfully, false otherwise.
+     */
+    fun stopCoreLoop(): Boolean {
+        val service = getService() ?: return false
+
+        if (coreController.isRunning) {
+            CoroutineScope(Dispatchers.IO).launch {
+                try {
+                    coreController.stopLoop()
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to stop V2Ray loop", e)
+                }
+            }
+        }
+
+        MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_STOP_SUCCESS, "")
+        NotificationManager.cancelNotification()
+
+        try {
+            service.unregisterReceiver(mMsgReceive)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
+        }
+
+        return true
+    }
+
+    /**
+     * Queries the statistics for a given tag and link.
+     * @param tag The tag to query.
+     * @param link The link to query.
+     * @return The statistics value.
+     */
+    fun queryStats(tag: String, link: String): Long {
+        return coreController.queryStats(tag, link)
+    }
+
+    /**
+     * Measures the connection delay for the current V2Ray configuration.
+     * Tests with primary URL first, then falls back to alternative URL if needed.
+     * Also fetches remote IP information if the delay test was successful.
+     */
+    private fun measureV2rayDelay() {
+        if (coreController.isRunning == false) {
+            return
+        }
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val service = getService() ?: return@launch
+            var time = -1L
+            var errorStr = ""
+
+            try {
+                time = coreController.measureDelay(SettingsManager.getDelayTestUrl())
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to measure delay with primary URL", e)
+                errorStr = e.message?.substringAfter("\":") ?: "empty message"
+            }
+            if (time == -1L) {
+                try {
+                    time = coreController.measureDelay(SettingsManager.getDelayTestUrl(true))
+                } catch (e: Exception) {
+                    Log.e(AppConfig.TAG, "Failed to measure delay with alternative URL", e)
+                    errorStr = e.message?.substringAfter("\":") ?: "empty message"
+                }
+            }
+
+            val result = if (time >= 0) {
+                service.getString(R.string.connection_test_available, time)
+            } else {
+                service.getString(R.string.connection_test_error, errorStr)
+            }
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
+
+            // Only fetch IP info if the delay test was successful
+            if (time >= 0) {
+                SpeedtestManager.getRemoteIPInfo()?.let { ip ->
+                    MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, "$result\n$ip")
+                }
+            }
+        }
+    }
+
+    /**
+     * Gets the current service instance.
+     * @return The current service instance, or null if not available.
+     */
+    private fun getService(): Service? {
+        return serviceControl?.get()?.getService()
+    }
+
+    /**
+     * Core callback handler implementation for handling V2Ray core events.
+     * Handles startup, shutdown, socket protection, and status emission.
+     */
+    private class CoreCallback : CoreCallbackHandler {
+        /**
+         * Called when V2Ray core starts up.
+         * @return 0 for success, any other value for failure.
+         */
+        override fun startup(): Long {
+            return 0
+        }
+
+        /**
+         * Called when V2Ray core shuts down.
+         * @return 0 for success, any other value for failure.
+         */
+        override fun shutdown(): Long {
+            val serviceControl = serviceControl?.get() ?: return -1
+            return try {
+                serviceControl.stopService()
+                0
+            } catch (e: Exception) {
+                Log.e(AppConfig.TAG, "Failed to stop service in callback", e)
+                -1
+            }
+        }
+
+        /**
+         * Called when V2Ray core emits status information.
+         * @param l Status code.
+         * @param s Status message.
+         * @return Always returns 0.
+         */
+        override fun onEmitStatus(l: Long, s: String?): Long {
+            return 0
+        }
+    }
+
+    /**
+     * Broadcast receiver for handling messages sent to the service.
+     * Handles registration, service control, and screen events.
+     */
+    private class ReceiveMessageHandler : BroadcastReceiver() {
+        /**
+         * Handles received broadcast messages.
+         * Processes service control messages and screen state changes.
+         * @param ctx The context in which the receiver is running.
+         * @param intent The intent being received.
+         */
+        override fun onReceive(ctx: Context?, intent: Intent?) {
+            val serviceControl = serviceControl?.get() ?: return
+            when (intent?.getIntExtra("key", 0)) {
+                AppConfig.MSG_REGISTER_CLIENT -> {
+                    if (coreController.isRunning) {
+                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
+                    } else {
+                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_NOT_RUNNING, "")
+                    }
+                }
+
+                AppConfig.MSG_UNREGISTER_CLIENT -> {
+                    // nothing to do
+                }
+
+                AppConfig.MSG_STATE_START -> {
+                    // nothing to do
+                }
+
+                AppConfig.MSG_STATE_STOP -> {
+                    Log.i(AppConfig.TAG, "Stop Service")
+                    serviceControl.stopService()
+                }
+
+                AppConfig.MSG_STATE_RESTART -> {
+                    Log.i(AppConfig.TAG, "Restart Service")
+                    serviceControl.stopService()
+                    Thread.sleep(500L)
+                    startVService(serviceControl.getService())
+                }
+
+                AppConfig.MSG_MEASURE_DELAY -> {
+                    measureV2rayDelay()
+                }
+            }
+
+            when (intent?.action) {
+                Intent.ACTION_SCREEN_OFF -> {
+                    Log.i(AppConfig.TAG, "SCREEN_OFF, stop querying stats")
+                    NotificationManager.stopSpeedNotification(currentConfig)
+                }
+
+                Intent.ACTION_SCREEN_ON -> {
+                    Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats")
+                    NotificationManager.startSpeedNotification(currentConfig)
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.v2ray.ang.helper
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class CustomDividerItemDecoration(
+    private val divider: Drawable,
+    private val orientation: Int
+) : RecyclerView.ItemDecoration() {
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (orientation == RecyclerView.VERTICAL) {
+            drawVerticalDividers(canvas, parent)
+        } else {
+            drawHorizontalDividers(canvas, parent)
+        }
+    }
+
+    private fun drawVerticalDividers(canvas: Canvas, parent: RecyclerView) {
+        val left = parent.paddingLeft
+        val right = parent.width - parent.paddingRight
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val top = child.bottom + params.bottomMargin
+            val bottom = top + divider.intrinsicHeight
+
+            divider.setBounds(left, top, right, bottom)
+            divider.draw(canvas)
+        }
+    }
+
+    private fun drawHorizontalDividers(canvas: Canvas, parent: RecyclerView) {
+        val top = parent.paddingTop
+        val bottom = parent.height - parent.paddingBottom
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val left = child.right + params.rightMargin
+            val right = left + divider.intrinsicWidth
+
+            divider.setBounds(left, top, right, bottom)
+            divider.draw(canvas)
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        if (orientation == RecyclerView.VERTICAL) {
+            outRect.set(0, 0, 0, divider.intrinsicHeight)
+        } else {
+            outRect.set(0, 0, divider.intrinsicWidth, 0)
+        }
+    }
+}

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

@@ -16,7 +16,6 @@
 package com.v2ray.ang.helper
 
 import android.animation.ValueAnimator
-import android.animation.ValueAnimator.AnimatorUpdateListener
 import android.graphics.Canvas
 import android.view.animation.DecelerateInterpolator
 import androidx.recyclerview.widget.GridLayoutManager
@@ -35,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,
@@ -50,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)
     }
@@ -108,7 +107,7 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
             addUpdateListener { animation ->
                 val value = animation.animatedValue as Float
                 viewHolder.itemView.translationX = value
-                viewHolder.itemView.alpha = (1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD))
+                viewHolder.itemView.alpha = 1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD)
             }
             interpolator = DecelerateInterpolator()
             duration = ANIMATION_DURATION
@@ -145,4 +144,4 @@ class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter
         private const val SWIPE_THRESHOLD = 0.25f
         private const val ANIMATION_DURATION: Long = 200
     }
-}
+}

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 android.widget.Toast
-import androidx.core.os.bundleOf
-import com.v2ray.ang.AngApplication
-import com.v2ray.ang.extension.listenForPackageChanges
-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 }}"
-            Toast.makeText(AngApplication.application, message, Toast.LENGTH_LONG).show()
-            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.get(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,45 +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.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 {
-        AngApplication.application.getPackageInfo(componentInfo.packageName).versionCode
-    }
-    override val versionName: String by lazy {
-        AngApplication.application.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
-}

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

@@ -4,15 +4,20 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager
 
 class BootReceiver : BroadcastReceiver() {
+    /**
+     * This method is called when the BroadcastReceiver is receiving an Intent broadcast.
+     * It checks if the context is not null and the action is ACTION_BOOT_COMPLETED.
+     * If the conditions are met, it starts the V2Ray service.
+     *
+     * @param context The Context in which the receiver is running.
+     * @param intent The Intent being received.
+     */
     override fun onReceive(context: Context?, intent: Intent?) {
-        //Check if context is not null and action is the one we want
         if (context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) return
-        //Check if flag is true and a server is selected
         if (!MmkvManager.decodeStartOnBoot() || MmkvManager.getSelectServer().isNullOrEmpty()) return
-        //Start v2ray
+        V2RayServiceManager.startVService(context)
-        V2RayServiceManager.startV2Ray(context)
     }
 }

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

@@ -5,14 +5,19 @@ import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2RayServiceManager
-import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.Utils
 
 class TaskerReceiver : BroadcastReceiver() {
 
+    /**
+     * This method is called when the BroadcastReceiver is receiving an Intent broadcast.
+     * It retrieves the bundle from the intent and checks the switch and guid values.
+     * Depending on the switch value, it starts or stops the V2Ray service.
+     *
+     * @param context The Context in which the receiver is running.
+     * @param intent The Intent being received.
+     */
     override fun onReceive(context: Context, intent: Intent?) {
-
         try {
             val bundle = intent?.getBundleExtra(AppConfig.TASKER_EXTRA_BUNDLE)
             val switch = bundle?.getBoolean(AppConfig.TASKER_EXTRA_BUNDLE_SWITCH, false)
@@ -22,16 +27,15 @@ class TaskerReceiver : BroadcastReceiver() {
                 return
             } else if (switch) {
                 if (guid == AppConfig.TASKER_DEFAULT_GUID) {
-                    Utils.startVServiceFromToggle(context)
+                    V2RayServiceManager.startVServiceFromToggle(context)
                 } else {
-                    MmkvManager.setSelectServer(guid)
+                    V2RayServiceManager.startVService(context, guid)
-                    V2RayServiceManager.startV2Ray(context)
                 }
             } else {
-                Utils.stopVService(context)
+                V2RayServiceManager.stopVService(context)
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            android.util.Log.e(AppConfig.TAG, "Error processing Tasker broadcast", e)
         }
     }
 }

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

@@ -6,23 +6,33 @@ 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
-import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.handler.V2RayServiceManager
-import com.v2ray.ang.util.Utils
 
 class WidgetProvider : AppWidgetProvider() {
     /**
-     * 每次窗口小部件被更新都调用一次该方法
+     * This method is called every time the widget is updated.
+     * It updates the widget background based on the V2Ray service running state.
+     *
+     * @param context The Context in which the receiver is running.
+     * @param appWidgetManager The AppWidgetManager instance.
+     * @param appWidgetIds The appWidgetIds for which an update is needed.
      */
     override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
         super.onUpdate(context, appWidgetManager, appWidgetIds)
-        updateWidgetBackground(context, appWidgetManager, appWidgetIds, V2RayServiceManager.v2rayPoint.isRunning)
+        updateWidgetBackground(context, appWidgetManager, appWidgetIds, V2RayServiceManager.isRunning())
     }
 
-
+    /**
+     * Updates the widget background based on whether the V2Ray service is running.
+     *
+     * @param context The Context in which the receiver is running.
+     * @param appWidgetManager The AppWidgetManager instance.
+     * @param appWidgetIds The appWidgetIds for which an update is needed.
+     * @param isRunning Boolean indicating if the V2Ray service is running.
+     */
     private fun updateWidgetBackground(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray, isRunning: Boolean) {
         val remoteViews = RemoteViews(context.packageName, R.layout.widget_switch)
         val intent = Intent(context, WidgetProvider::class.java)
@@ -31,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) {
@@ -52,15 +58,19 @@ class WidgetProvider : AppWidgetProvider() {
     }
 
     /**
-     * 接收窗口小部件发送的广播
+     * This method is called when the BroadcastReceiver is receiving an Intent broadcast.
+     * It handles widget click actions and updates the widget background based on the V2Ray service state.
+     *
+     * @param context The Context in which the receiver is running.
+     * @param intent The Intent being received.
      */
     override fun onReceive(context: Context, intent: Intent) {
         super.onReceive(context, intent)
         if (AppConfig.BROADCAST_ACTION_WIDGET_CLICK == intent.action) {
-            if (V2RayServiceManager.v2rayPoint.isRunning) {
+            if (V2RayServiceManager.isRunning()) {
-                Utils.stopVService(context)
+                V2RayServiceManager.stopVService(context)
             } else {
-                Utils.startVServiceFromToggle(context)
+                V2RayServiceManager.startVServiceFromToggle(context)
             }
         } else if (AppConfig.BROADCAST_ACTION_ACTIVITY == intent.action) {
             AppWidgetManager.getInstance(context)?.let { manager ->

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

@@ -2,7 +2,7 @@ package com.v2ray.ang.service
 
 import android.content.Context
 import android.util.Log
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -10,8 +10,13 @@ import kotlinx.coroutines.launch
 class ProcessService {
     private var process: Process? = null
 
+    /**
+     * Runs a process with the given command.
+     * @param context The context.
+     * @param cmd The command to run.
+     */
     fun runProcess(context: Context, cmd: MutableList<String>) {
-        Log.d(ANG_PACKAGE, cmd.toString())
+        Log.i(AppConfig.TAG, cmd.toString())
 
         try {
             val proBuilder = ProcessBuilder(cmd)
@@ -22,23 +27,26 @@ class ProcessService {
 
             CoroutineScope(Dispatchers.IO).launch {
                 Thread.sleep(50L)
-                Log.d(ANG_PACKAGE, "runProcess check")
+                Log.i(AppConfig.TAG, "runProcess check")
                 process?.waitFor()
-                Log.d(ANG_PACKAGE, "runProcess exited")
+                Log.i(AppConfig.TAG, "runProcess exited")
             }
-            Log.d(ANG_PACKAGE, process.toString())
+            Log.i(AppConfig.TAG, process.toString())
 
         } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, e.toString(), e)
         }
     }
 
+    /**
+     * Stops the running process.
+     */
     fun stopProcess() {
         try {
-            Log.d(ANG_PACKAGE, "runProcess destroy")
+            Log.i(AppConfig.TAG, "runProcess destroy")
             process?.destroy()
         } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
+            Log.e(AppConfig.TAG, "Failed to destroy process", e)
         }
     }
 }

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

@@ -1,33 +1,35 @@
 package com.v2ray.ang.service
 
-import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 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.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
 
-@TargetApi(Build.VERSION_CODES.N)
 class QSTileService : TileService() {
 
+    /**
+     * Sets the state of the tile.
+     * @param state The state to set.
+     */
     fun setState(state: Int) {
+        qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         if (state == Tile.STATE_INACTIVE) {
             qsTile?.state = Tile.STATE_INACTIVE
             qsTile?.label = getString(R.string.app_name)
-            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         } else if (state == Tile.STATE_ACTIVE) {
             qsTile?.state = Tile.STATE_ACTIVE
-            qsTile?.label = V2RayServiceManager.currentConfig?.remarks
+            qsTile?.label = V2RayServiceManager.getRunningServerName()
-            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         }
 
         qsTile?.updateTile()
@@ -37,17 +39,23 @@ class QSTileService : TileService() {
      * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
      * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
      */
-
     override fun onStartListening() {
         super.onStartListening()
 
-        setState(Tile.STATE_INACTIVE)
+        if (V2RayServiceManager.isRunning()) {
+            setState(Tile.STATE_ACTIVE)
+        } else {
+            setState(Tile.STATE_INACTIVE)
+        }
         mMsgReceive = ReceiveMessageHandler(this)
         val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
         ContextCompat.registerReceiver(applicationContext, mMsgReceive, mFilter, Utils.receiverFlags())
         MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")
     }
 
+    /**
+     * Called when the tile stops listening.
+     */
     override fun onStopListening() {
         super.onStopListening()
 
@@ -55,20 +63,23 @@ class QSTileService : TileService() {
             applicationContext.unregisterReceiver(mMsgReceive)
             mMsgReceive = null
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(AppConfig.TAG, "Failed to unregister receiver", e)
         }
 
     }
 
+    /**
+     * Called when the tile is clicked.
+     */
     override fun onClick() {
         super.onClick()
         when (qsTile.state) {
             Tile.STATE_INACTIVE -> {
-                Utils.startVServiceFromToggle(this)
+                V2RayServiceManager.startVServiceFromToggle(this)
             }
 
             Tile.STATE_ACTIVE -> {
-                Utils.stopVService(this)
+                V2RayServiceManager.stopVService(this)
             }
         }
     }

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

@@ -3,11 +3,26 @@ package com.v2ray.ang.service
 import android.app.Service
 
 interface ServiceControl {
+    /**
+     * Gets the service instance.
+     * @return The service instance.
+     */
     fun getService(): Service
 
+    /**
+     * Starts the service.
+     */
     fun startService()
 
+    /**
+     * Stops the service.
+     */
     fun stopService()
 
+    /**
+     * Protects the VPN socket.
+     * @param socket The socket to protect.
+     * @return True if the socket is protected, false otherwise.
+     */
     fun vpnProtect(socket: Int): Boolean
 }

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

@@ -0,0 +1,100 @@
+package com.v2ray.ang.service
+
+import android.content.Context
+import android.os.ParcelFileDescriptor
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
+import java.io.File
+
+/**
+ * Manages the tun2socks process that handles VPN traffic
+ */
+class TProxyService(
+    private val context: Context,
+    private val vpnInterface: ParcelFileDescriptor,
+    private val isRunningProvider: () -> Boolean,
+    private val restartCallback: () -> Unit
+) : Tun2SocksControl {
+    companion object {
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyStartService(configPath: String, fd: Int)
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyStopService()
+        @JvmStatic
+        @Suppress("FunctionName")
+        private external fun TProxyGetStats(): LongArray?
+
+        init {
+            System.loadLibrary("hev-socks5-tunnel")
+        }
+    }
+
+    /**
+     * Starts the tun2socks process with the appropriate parameters.
+     */
+    override fun startTun2Socks() {
+//        Log.i(AppConfig.TAG, "Starting HevSocks5Tunnel via JNI")
+
+        val configContent = buildConfig()
+        val configFile = File(context.filesDir, "hev-socks5-tunnel.yaml").apply {
+            writeText(configContent)
+        }
+//        Log.i(AppConfig.TAG, "Config file created: ${configFile.absolutePath}")
+        Log.d(AppConfig.TAG, "HevSocks5Tunnel Config content:\n$configContent")
+
+        try {
+//            Log.i(AppConfig.TAG, "TProxyStartService...")
+            TProxyStartService(configFile.absolutePath, vpnInterface.fd)
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "HevSocks5Tunnel exception: ${e.message}")
+        }
+    }
+
+    private fun buildConfig(): String {
+        val socksPort = SettingsManager.getSocksPort()
+        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
+        return buildString {
+            appendLine("tunnel:")
+            appendLine("  mtu: ${SettingsManager.getVpnMtu()}")
+            appendLine("  ipv4: ${vpnConfig.ipv4Client}")
+
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
+                appendLine("  ipv6: '${vpnConfig.ipv6Client}'")
+            }
+
+            appendLine("socks5:")
+            appendLine("  port: ${socksPort}")
+            appendLine("  address: ${AppConfig.LOOPBACK}")
+            appendLine("  udp: 'udp'")
+
+            // Read-write timeout settings
+            val timeoutSetting = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT
+            val parts = timeoutSetting.split(",")
+                .map { it.trim() }
+                .filter { it.isNotEmpty() }
+            val tcpTimeout = parts.getOrNull(0)?.toIntOrNull() ?: 300
+            val udpTimeout = parts.getOrNull(1)?.toIntOrNull() ?: 60
+
+            appendLine("misc:")
+            appendLine("  tcp-read-write-timeout: ${tcpTimeout * 1000}")
+            appendLine("  udp-read-write-timeout: ${udpTimeout * 1000}")
+            appendLine("  log-level: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "warn"}")
+        }
+    }
+
+    /**
+     * Stops the tun2socks process
+     */
+    override fun stopTun2Socks() {
+        try {
+            Log.i(AppConfig.TAG, "TProxyStopService...")
+            TProxyStopService()
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to stop hev-socks5-tunnel", e)
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.v2ray.ang.service
+
+/**
+ * Interface that defines the control operations for tun2socks implementations.
+ * 
+ * This interface is implemented by different tunnel solutions like:
+ */
+interface Tun2SocksControl {
+    /**
+     * Starts the tun2socks process with the appropriate parameters.
+     * This initializes the VPN tunnel and connects it to the SOCKS proxy.
+     */
+    fun startTun2Socks()
+    
+    /**
+     * Stops the tun2socks process and cleans up resources.
+     */
+    fun stopTun2Socks()
+}

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

@@ -3,53 +3,88 @@ package com.v2ray.ang.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.IBinder
-import androidx.annotation.RequiresApi
+import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
 
 class V2RayProxyOnlyService : Service(), ServiceControl {
+    /**
+     * Initializes the service.
+     */
     override fun onCreate() {
         super.onCreate()
         V2RayServiceManager.serviceControl = SoftReference(this)
     }
 
+    /**
+     * 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 {
-        V2RayServiceManager.startV2rayPoint()
+        V2RayServiceManager.startCoreLoop(null)
         return START_STICKY
     }
 
+    /**
+     * Destroys the service.
+     */
     override fun onDestroy() {
         super.onDestroy()
-        V2RayServiceManager.stopV2rayPoint()
+        V2RayServiceManager.stopCoreLoop()
     }
 
+    /**
+     * Gets the service instance.
+     * @return The service instance.
+     */
     override fun getService(): Service {
         return this
     }
 
+    /**
+     * Starts the service.
+     */
     override fun startService() {
         // do nothing
     }
 
+    /**
+     * Stops the service.
+     */
     override fun stopService() {
         stopSelf()
     }
 
+    /**
+     * Protects the VPN socket.
+     * @param socket The socket to protect.
+     * @return True if the socket is protected, false otherwise.
+     */
     override fun vpnProtect(socket: Int): Boolean {
         return true
     }
 
+    /**
+     * Binds the service.
+     * @param intent The intent.
+     * @return The binder.
+     */
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
 
-    @RequiresApi(Build.VERSION_CODES.N)
+    /**
+     * Attaches the base context to the service.
+     * @param newBase The new base context.
+     */
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
-            MyContextWrapper.wrap(newBase, Utils.getLocale())
+            MyContextWrapper.wrap(newBase, SettingsManager.getLocale())
         }
         super.attachBaseContext(context)
     }

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

@@ -1,441 +0,0 @@
-package com.v2ray.ang.service
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.graphics.Color
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.AppConfig.VPN
-import com.v2ray.ang.R
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.toSpeedString
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.V2rayConfigManager
-import com.v2ray.ang.ui.MainActivity
-import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
-import com.v2ray.ang.util.Utils
-import go.Seq
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.Disposable
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import libv2ray.Libv2ray
-import libv2ray.V2RayPoint
-import libv2ray.V2RayVPNServiceSupportsSet
-import java.lang.ref.SoftReference
-import kotlin.math.min
-
-object V2RayServiceManager {
-    private const val NOTIFICATION_ID = 1
-    private const val NOTIFICATION_PENDING_INTENT_CONTENT = 0
-    private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
-    private const val NOTIFICATION_ICON_THRESHOLD = 3000
-
-    val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
-    private val mMsgReceive = ReceiveMessageHandler()
-
-    var serviceControl: SoftReference<ServiceControl>? = null
-        set(value) {
-            field = value
-            Seq.setContext(value?.get()?.getService()?.applicationContext)
-            Libv2ray.initV2Env(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
-        }
-    var currentConfig: ProfileItem? = null
-
-    private var lastQueryTime = 0L
-    private var mBuilder: NotificationCompat.Builder? = null
-    private var mDisposable: Disposable? = null
-    private var mNotificationManager: NotificationManager? = null
-
-    fun startV2Ray(context: Context) {
-        if (v2rayPoint.isRunning) return
-        val guid = MmkvManager.getSelectServer() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
-        if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) return
-//        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
-//        if (!result.status) return
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) == true) {
-            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) ?: VPN) == VPN) {
-            Intent(context.applicationContext, V2RayVpnService::class.java)
-        } else {
-            Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
-        }
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
-            context.startForegroundService(intent)
-        } else {
-            context.startService(intent)
-        }
-    }
-
-    private class V2RayCallback : V2RayVPNServiceSupportsSet {
-        override fun shutdown(): Long {
-            val serviceControl = serviceControl?.get() ?: return -1
-            // called by go
-            return try {
-                serviceControl.stopService()
-                0
-            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
-                -1
-            }
-        }
-
-        override fun prepare(): Long {
-            return 0
-        }
-
-        override fun protect(l: Long): Boolean {
-            val serviceControl = serviceControl?.get() ?: return true
-            return serviceControl.vpnProtect(l.toInt())
-        }
-
-        override fun onEmitStatus(l: Long, s: String?): Long {
-            return 0
-        }
-
-        override fun setup(s: String): Long {
-            val serviceControl = serviceControl?.get() ?: return -1
-            return try {
-                serviceControl.startService()
-                lastQueryTime = System.currentTimeMillis()
-                startSpeedNotification()
-                0
-            } catch (e: Exception) {
-                Log.d(ANG_PACKAGE, e.toString())
-                -1
-            }
-        }
-    }
-
-    /**
-     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
-     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
-     */
-
-    fun startV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
-        val guid = MmkvManager.getSelectServer() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return
-        if (v2rayPoint.isRunning) {
-            return
-        }
-        val result = V2rayConfigManager.getV2rayConfig(service, guid)
-        if (!result.status)
-            return
-
-        try {
-            val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
-            mFilter.addAction(Intent.ACTION_SCREEN_ON)
-            mFilter.addAction(Intent.ACTION_SCREEN_OFF)
-            mFilter.addAction(Intent.ACTION_USER_PRESENT)
-            ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-
-        v2rayPoint.configureFileContent = result.content
-        v2rayPoint.domainName = result.domainPort
-        currentConfig = config
-
-        try {
-            v2rayPoint.runLoop(MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-
-        if (v2rayPoint.isRunning) {
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            showNotification()
-
-            PluginUtil.runPlugin(service, config, result.domainPort)
-        } else {
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
-            cancelNotification()
-        }
-    }
-
-    fun stopV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
-
-        if (v2rayPoint.isRunning) {
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    v2rayPoint.stopLoop()
-                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, e.toString())
-                }
-            }
-        }
-
-        MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_STOP_SUCCESS, "")
-        cancelNotification()
-
-        try {
-            service.unregisterReceiver(mMsgReceive)
-        } catch (e: Exception) {
-            Log.d(ANG_PACKAGE, e.toString())
-        }
-        PluginUtil.stopPlugin()
-    }
-
-    private class ReceiveMessageHandler : BroadcastReceiver() {
-        override fun onReceive(ctx: Context?, intent: Intent?) {
-            val serviceControl = serviceControl?.get() ?: return
-            when (intent?.getIntExtra("key", 0)) {
-                AppConfig.MSG_REGISTER_CLIENT -> {
-                    if (v2rayPoint.isRunning) {
-                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
-                    } else {
-                        MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_NOT_RUNNING, "")
-                    }
-                }
-
-                AppConfig.MSG_UNREGISTER_CLIENT -> {
-                    // nothing to do
-                }
-
-                AppConfig.MSG_STATE_START -> {
-                    // nothing to do
-                }
-
-                AppConfig.MSG_STATE_STOP -> {
-                    serviceControl.stopService()
-                }
-
-                AppConfig.MSG_STATE_RESTART -> {
-                    startV2rayPoint()
-                }
-
-                AppConfig.MSG_MEASURE_DELAY -> {
-                    measureV2rayDelay()
-                }
-            }
-
-            when (intent?.action) {
-                Intent.ACTION_SCREEN_OFF -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
-                    stopSpeedNotification()
-                }
-
-                Intent.ACTION_SCREEN_ON -> {
-                    Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
-                    startSpeedNotification()
-                }
-            }
-        }
-    }
-
-    private fun measureV2rayDelay() {
-        CoroutineScope(Dispatchers.IO).launch {
-            val service = serviceControl?.get()?.getService() ?: return@launch
-            var time = -1L
-            var errstr = ""
-            if (v2rayPoint.isRunning) {
-                try {
-                    time = v2rayPoint.measureDelay(Utils.getDelayTestUrl())
-                } catch (e: Exception) {
-                    Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                    errstr = e.message?.substringAfter("\":") ?: "empty message"
-                }
-                if (time == -1L) {
-                    try {
-                        time = v2rayPoint.measureDelay(Utils.getDelayTestUrl(true))
-                    } catch (e: Exception) {
-                        Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
-                        errstr = e.message?.substringAfter("\":") ?: "empty message"
-                    }
-                }
-            }
-            val result = if (time == -1L) {
-                service.getString(R.string.connection_test_error, errstr)
-            } else {
-                service.getString(R.string.connection_test_available, time)
-            }
-
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result)
-        }
-    }
-
-    private fun showNotification() {
-        val service = serviceControl?.get()?.getService() ?: return
-        val startMainIntent = Intent(service, MainActivity::class.java)
-        val contentPendingIntent = PendingIntent.getActivity(
-            service,
-            NOTIFICATION_PENDING_INTENT_CONTENT, startMainIntent,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
-        )
-
-        val stopV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
-        stopV2RayIntent.`package` = ANG_PACKAGE
-        stopV2RayIntent.putExtra("key", AppConfig.MSG_STATE_STOP)
-
-        val stopV2RayPendingIntent = PendingIntent.getBroadcast(
-            service,
-            NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
-        )
-
-        val channelId =
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                createNotificationChannel()
-            } else {
-                // If earlier version channel ID is not used
-                // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                ""
-            }
-
-        mBuilder = NotificationCompat.Builder(service, channelId)
-            .setSmallIcon(R.drawable.ic_stat_name)
-            .setContentTitle(currentConfig?.remarks)
-            .setPriority(NotificationCompat.PRIORITY_MIN)
-            .setOngoing(true)
-            .setShowWhen(false)
-            .setOnlyAlertOnce(true)
-            .setContentIntent(contentPendingIntent)
-            .addAction(
-                R.drawable.ic_delete_24dp,
-                service.getString(R.string.notification_action_stop_v2ray),
-                stopV2RayPendingIntent
-            )
-        //.build()
-
-        //mBuilder?.setDefaults(NotificationCompat.FLAG_ONLY_ALERT_ONCE)  //取消震动,铃声其他都不好使
-
-        service.startForeground(NOTIFICATION_ID, mBuilder?.build())
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun createNotificationChannel(): String {
-        val channelId = AppConfig.RAY_NG_CHANNEL_ID
-        val channelName = AppConfig.RAY_NG_CHANNEL_NAME
-        val chan = NotificationChannel(
-            channelId,
-            channelName, NotificationManager.IMPORTANCE_HIGH
-        )
-        chan.lightColor = Color.DKGRAY
-        chan.importance = NotificationManager.IMPORTANCE_NONE
-        chan.lockscreenVisibility = Notification.VISIBILITY_PRIVATE
-        getNotificationManager()?.createNotificationChannel(chan)
-        return channelId
-    }
-
-    fun cancelNotification() {
-        val service = serviceControl?.get()?.getService() ?: return
-        service.stopForeground(true)
-        mBuilder = null
-        mDisposable?.dispose()
-        mDisposable = null
-    }
-
-    private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) {
-        if (mBuilder != null) {
-            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_name)
-            } else if (proxyTraffic > directTraffic) {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
-            } else {
-                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
-            }
-            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
-            mBuilder?.setContentText(contentText) // Emui4.1 need content text even if style is set as BigTextStyle
-            getNotificationManager()?.notify(NOTIFICATION_ID, mBuilder?.build())
-        }
-    }
-
-    private fun getNotificationManager(): NotificationManager? {
-        if (mNotificationManager == null) {
-            val service = serviceControl?.get()?.getService() ?: return null
-            mNotificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        }
-        return mNotificationManager
-    }
-
-    private fun startSpeedNotification() {
-        if (mDisposable == null &&
-            v2rayPoint.isRunning &&
-            MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) == true
-        ) {
-            var lastZeroSpeed = false
-            val outboundTags = currentConfig?.getAllOutboundTags()
-            outboundTags?.remove(TAG_DIRECT)
-
-            mDisposable = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
-                .subscribe {
-                    val queryTime = System.currentTimeMillis()
-                    val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
-                    var proxyTotal = 0L
-                    val text = StringBuilder()
-                    outboundTags?.forEach {
-                        val up = v2rayPoint.queryStats(it, AppConfig.UPLINK)
-                        val down = v2rayPoint.queryStats(it, AppConfig.DOWNLINK)
-                        if (up + down > 0) {
-                            appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
-                            proxyTotal += up + down
-                        }
-                    }
-                    val directUplink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.UPLINK)
-                    val directDownlink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.DOWNLINK)
-                    val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
-                    if (!zeroSpeed || !lastZeroSpeed) {
-                        if (proxyTotal == 0L) {
-                            appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
-                        }
-                        appendSpeedString(
-                            text, TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
-                            directDownlink / sinceLastQueryInSeconds
-                        )
-                        updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
-                    }
-                    lastZeroSpeed = zeroSpeed
-                    lastQueryTime = queryTime
-                }
-        }
-    }
-
-    private fun appendSpeedString(text: StringBuilder, name: String?, up: Double, down: Double) {
-        var n = name ?: "no tag"
-        n = n.substring(0, min(n.length, 6))
-        text.append(n)
-        for (i in n.length..6 step 2) {
-            text.append("\t")
-        }
-        text.append("•  ${up.toLong().toSpeedString()}↑  ${down.toLong().toSpeedString()}↓\n")
-    }
-
-    private fun stopSpeedNotification() {
-        mDisposable?.let {
-            it.dispose() //stop queryStats
-            mDisposable = null
-            updateNotification(currentConfig?.remarks, 0, 0)
-        }
-    }
-
-}

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

@@ -3,69 +3,77 @@ package com.v2ray.ang.service
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_CANCEL
-import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.serializable
-import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2RayNativeManager
-import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.PluginUtil
+import java.util.Collections
-import com.v2ray.ang.util.SpeedtestUtil
-import com.v2ray.ang.util.Utils
-import go.Seq
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.asCoroutineDispatcher
-import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.launch
-import libv2ray.Libv2ray
-import java.util.concurrent.Executors
 
 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.initV2Env(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
-    }
-
-    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)
     }
 
+    /**
+     * Binds the service.
+     * @param intent The intent.
+     * @return The binder.
+     */
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
 
-    private fun startRealPing(guid: String): Long {
+    /**
-        val retFailure = -1L
+     * Cleans up resources when the service is destroyed.
-
+     */
-        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
+    override fun onDestroy() {
-        if (config.configType == EConfigType.HYSTERIA2) {
+        super.onDestroy()
-            val delay = PluginUtil.realPingHy2(this, config)
+        // cancel any active workers
-            return delay
+        val snapshot = ArrayList(activeWorkers)
-        } else {
+        snapshot.forEach { it.cancel() }
-            val config = V2rayConfigManager.getV2rayConfig(this, guid)
+        activeWorkers.clear()
-            if (!config.status) {
-                return retFailure
-            }
-            return SpeedtestUtil.realPing(config.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 {
+        when (intent?.getIntExtra("key", 0)) {
+            MSG_MEASURE_CONFIG -> {
+                val guidsList = intent.serializable<ArrayList<String>>("content")
+                if (guidsList != null && guidsList.isNotEmpty()) {
+                    lateinit var worker: RealPingWorkerService
+                    worker = RealPingWorkerService(this, guidsList) { status ->
+                        // notify UI and remove the worker from active list when finished
+                        MessageUtil.sendMsg2UI(this@V2RayTestService, AppConfig.MSG_MEASURE_CONFIG_FINISH, status)
+                        activeWorkers.remove(worker)
+                    }
+                    activeWorkers.add(worker)
+                    worker.start()
+                }
+            }
+
+            MSG_MEASURE_CONFIG_CANCEL -> {
+                // cancel all running batch workers independently
+                val snapshot = ArrayList(activeWorkers)
+                snapshot.forEach { it.cancel() }
+                activeWorkers.clear()
+            }
+        }
+        return super.onStartCommand(intent, flags, startId)
+    }
+}

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

@@ -5,8 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.ConnectivityManager
-import android.net.LocalSocket
-import android.net.LocalSocketAddress
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
@@ -18,36 +16,20 @@ import android.os.StrictMode
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.R
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.NotificationManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.V2RayServiceManager
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
 import java.lang.ref.SoftReference
 
 class V2RayVpnService : VpnService(), ServiceControl {
-    companion object {
-        private const val VPN_MTU = 1500
-        private const val PRIVATE_VLAN4_CLIENT = "26.26.26.1"
-        private const val PRIVATE_VLAN4_ROUTER = "26.26.26.2"
-        private const val PRIVATE_VLAN6_CLIENT = "da26:2626::1"
-        private const val PRIVATE_VLAN6_ROUTER = "da26:2626::2"
-        private const val TUN2SOCKS = "libtun2socks.so"
-    }
-
-
     private lateinit var mInterface: ParcelFileDescriptor
     private var isRunning = false
-
+    private var tun2SocksService: Tun2SocksControl? = null
-    //val fd: Int get() = mInterface.fd
-    private lateinit var process: Process
 
     /**destroy
      * Unfortunately registerDefaultNetworkCallback is going to return our VPN interface: https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
@@ -88,7 +70,6 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onCreate() {
         super.onCreate()
-
         val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
         V2RayServiceManager.serviceControl = SoftReference(this)
@@ -105,26 +86,112 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onDestroy() {
         super.onDestroy()
-        V2RayServiceManager.cancelNotification()
+        NotificationManager.cancelNotification()
     }
 
-    private fun setup() {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        setupVpnService()
+        startService()
+        return START_STICKY
+        //return super.onStartCommand(intent, flags, startId)
+    }
+
+    override fun getService(): Service {
+        return this
+    }
+
+    override fun startService() {
+        if (mInterface == null) {
+            Log.e(AppConfig.TAG, "Failed to create VPN interface")
+            return
+        }
+        V2RayServiceManager.startCoreLoop(mInterface)
+    }
+
+    override fun stopService() {
+        stopV2Ray(true)
+    }
+
+    override fun vpnProtect(socket: Int): Boolean {
+        return protect(socket)
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        val context = newBase?.let {
+            MyContextWrapper.wrap(newBase, SettingsManager.getLocale())
+        }
+        super.attachBaseContext(context)
+    }
+
+    /**
+     * Sets up the VPN service.
+     * Prepares the VPN and configures it if preparation is successful.
+     */
+    private fun setupVpnService() {
         val prepare = prepare(this)
         if (prepare != null) {
             return
         }
 
-        // If the old interface has exactly the same parameters, use it!
+        if (configureVpnService() != true) {
-        // Configure a builder while parsing the parameters.
+            return
-        val builder = Builder()
+        }
-        //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
 
-        builder.setMtu(VPN_MTU)
+        runTun2socks()
-        builder.addAddress(PRIVATE_VLAN4_CLIENT, 30)
+    }
-        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+
+    /**
+     * Configures the VPN service.
+     * @return True if the VPN service was configured successfully, false otherwise.
+     */
+    private fun configureVpnService(): Boolean {
+        val builder = Builder()
+
+        // Configure network settings (addresses, routing and DNS)
+        configureNetworkSettings(builder)
+
+        // Configure app-specific settings (session name and per-app proxy)
+        configurePerAppProxy(builder)
+
+        // Close the old interface since the parameters have been changed
+        try {
+            mInterface.close()
+        } catch (ignored: Exception) {
+            // ignored
+        }
+
+        // Configure platform-specific features
+        configurePlatformFeatures(builder)
+
+        // Create a new interface using the builder and save the parameters
+        try {
+            mInterface = builder.establish()!!
+            isRunning = true
+            return true
+        } catch (e: Exception) {
+            Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
+            stopV2Ray()
+        }
+        return false
+    }
+
+    /**
+     * Configures the basic network settings for the VPN.
+     * This includes IP addresses, routing rules, and DNS servers.
+     *
+     * @param builder The VPN Builder to configure
+     */
+    private fun configureNetworkSettings(builder: Builder) {
+        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
         val bypassLan = SettingsManager.routingRulesetsBypassLan()
+
+        // Configure IPv4 settings
+        builder.setMtu(SettingsManager.getVpnMtu())
+        builder.addAddress(vpnConfig.ipv4Client, 30)
+
+        // Configure routing rules
         if (bypassLan) {
-            resources.getStringArray(R.array.bypass_private_ip_address).forEach {
+            AppConfig.ROUTED_IP_LIST.forEach {
                 val addr = it.split('/')
                 builder.addRoute(addr[0], addr[1].toInt())
             }
@@ -132,157 +199,122 @@ class V2RayVpnService : VpnService(), ServiceControl {
             builder.addRoute("0.0.0.0", 0)
         }
 
+        // Configure IPv6 if enabled
         if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
-            builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
+            builder.addAddress(vpnConfig.ipv6Client, 126)
             if (bypassLan) {
-                builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
+                builder.addRoute("2000::", 3) // Currently only 1/8 of total IPv6 is in use
+                builder.addRoute("fc00::", 18) // Xray-core default FakeIPv6 Pool
             } else {
                 builder.addRoute("::", 0)
             }
         }
 
-//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+        // Configure DNS servers
-//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+        //if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-//        } else {
+        //  builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        Utils.getVpnDnsServers()
+        //} else {
-            .forEach {
+        SettingsManager.getVpnDnsServers().forEach {
-                if (Utils.isPureIpAddress(it)) {
+            if (Utils.isPureIpAddress(it)) {
-                    builder.addDnsServer(it)
+                builder.addDnsServer(it)
-                }
             }
-//        }
-
-        builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
-
-        val selfPackageName = BuildConfig.APPLICATION_ID
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
-            val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-            val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
-            //process self package
-            if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
-            apps?.forEach {
-                try {
-                    if (bypassApps)
-                        builder.addDisallowedApplication(it)
-                    else
-                        builder.addAllowedApplication(it)
-                } catch (e: PackageManager.NameNotFoundException) {
-                    Log.d(ANG_PACKAGE, "setup error : --${e.localizedMessage}")
-                }
-            }
-        } else {
-            builder.addDisallowedApplication(selfPackageName)
         }
 
-        // Close the old interface since the parameters have been changed.
+        builder.setSession(V2RayServiceManager.getRunningServerName())
-        try {
+    }
-            mInterface.close()
-        } catch (ignored: Exception) {
-            // ignored
-        }
 
+    /**
+     * Configures platform-specific VPN features for different Android versions.
+     *
+     * @param builder The VPN Builder to configure
+     */
+    private fun configurePlatformFeatures(builder: Builder) {
+        // Android P (API 28) and above: Configure network callbacks
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             try {
                 connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
             } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.TAG, "Failed to request default network", e)
             }
         }
 
+        // Android Q (API 29) and above: Configure metering and HTTP proxy
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             builder.setMetered(false)
-            builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
-        }
+                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
-
-        // Create a new interface using the builder and save the parameters.
-        try {
-            mInterface = builder.establish()!!
-            isRunning = true
-            runTun2socks()
-        } catch (e: Exception) {
-            // non-nullable lateinit var
-            e.printStackTrace()
-            stopV2Ray()
-        }
-    }
-
-    private fun runTun2socks() {
-        val socksPort = SettingsManager.getSocksPort()
-        val cmd = arrayListOf(
-            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-            "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,
-            "--netif-netmask", "255.255.255.252",
-            "--socks-server-addr", "$LOOPBACK:${socksPort}",
-            "--tunmtu", VPN_MTU.toString(),
-            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
-            "--enable-udprelay",
-            "--loglevel", "notice"
-        )
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
-            cmd.add("--netif-ip6addr")
-            cmd.add(PRIVATE_VLAN6_ROUTER)
-        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
-            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
-            cmd.add("--dnsgw")
-            cmd.add("$LOOPBACK:${localDnsPort}")
-        }
-        Log.d(packageName, cmd.toString())
-
-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(applicationContext.filesDir)
-                .start()
-            Thread {
-                Log.d(packageName, "$TUN2SOCKS check")
-                process.waitFor()
-                Log.d(packageName, "$TUN2SOCKS exited")
-                if (isRunning) {
-                    Log.d(packageName, "$TUN2SOCKS restart")
-                    runTun2socks()
-                }
-            }.start()
-            Log.d(packageName, process.toString())
-
-            sendFd()
-        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
-        }
-    }
-
-    private fun sendFd() {
-        val fd = mInterface.fileDescriptor
-        val path = File(applicationContext.filesDir, "sock_path").absolutePath
-        Log.d(packageName, path)
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var tries = 0
-            while (true) try {
-                Thread.sleep(50L shl tries)
-                Log.d(packageName, "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.d(packageName, e.toString())
-                if (tries > 5) break
-                tries += 1
             }
         }
     }
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+    /**
-        V2RayServiceManager.startV2rayPoint()
+     * Configures per-app proxy rules for the VPN builder.
-        return START_STICKY
+     *
-        //return super.onStartCommand(intent, flags, startId)
+     * - If per-app proxy is not enabled, disallow the VPN service's own package.
+     * - If no apps are selected, disallow the VPN service's own package.
+     * - If bypass mode is enabled, disallow all selected apps (including self).
+     * - If proxy mode is enabled, only allow the selected apps (excluding self).
+     *
+     * @param builder The VPN Builder to configure.
+     */
+    private fun configurePerAppProxy(builder: Builder) {
+        val selfPackageName = BuildConfig.APPLICATION_ID
+
+        // If per-app proxy is not enabled, disallow the VPN service's own package and return
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY) == false) {
+            builder.addDisallowedApplication(selfPackageName)
+            return
+        }
+
+        // If no apps are selected, disallow the VPN service's own package and return
+        val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+        if (apps.isNullOrEmpty()) {
+            builder.addDisallowedApplication(selfPackageName)
+            return
+        }
+
+        val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
+        // Handle the VPN service's own package according to the mode
+        if (bypassApps) apps.add(selfPackageName) else apps.remove(selfPackageName)
+
+        apps.forEach {
+            try {
+                if (bypassApps) {
+                    // In bypass mode, disallow the selected apps
+                    builder.addDisallowedApplication(it)
+                } else {
+                    // In proxy mode, only allow the selected apps
+                    builder.addAllowedApplication(it)
+                }
+            } catch (e: PackageManager.NameNotFoundException) {
+                Log.e(AppConfig.TAG, "Failed to configure app in VPN: ${e.localizedMessage}", e)
+            }
+        }
     }
 
+    /**
+     * Runs the tun2socks process.
+     * Starts the tun2socks process with the appropriate parameters.
+     */
+    private fun runTun2socks() {
+        if (SettingsManager.isUsingHevTun()) {
+            tun2SocksService = TProxyService(
+                context = applicationContext,
+                vpnInterface = mInterface,
+                isRunningProvider = { isRunning },
+                restartCallback = { runTun2socks() }
+            )
+        } else {
+            tun2SocksService = null
+        }
+
+        tun2SocksService?.startTun2Socks()
+    }
+
+    /**
+     * 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()
@@ -297,14 +329,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
             }
         }
 
-        try {
+        tun2SocksService?.stopTun2Socks()
-            Log.d(packageName, "tun2socks destroy")
+        tun2SocksService = null
-            process.destroy()
-        } catch (e: Exception) {
-            Log.d(packageName, e.toString())
-        }
 
-        V2RayServiceManager.stopV2rayPoint()
+        V2RayServiceManager.stopCoreLoop()
 
         if (isForced) {
             //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
@@ -316,33 +344,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
             try {
                 mInterface.close()
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
-                // ignored
+                Log.e(AppConfig.TAG, "Failed to close VPN interface", e)
             }
         }
     }
-
-    override fun getService(): Service {
-        return this
-    }
-
-    override fun startService() {
-        setup()
-    }
-
-    override fun stopService() {
-        stopV2Ray(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, Utils.getLocale())
-        }
-        super.attachBaseContext(context)
-    }
 }
+

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

@@ -1,179 +1,52 @@
 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.FileProvider
-import com.tbruyelle.rxpermissions3.RxPermissions
-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.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.ZipUtil
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Locale
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-
 
 class AboutActivity : BaseActivity() {
     private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
-    private val extDir by lazy { File(Utils.backupPath(this)) }
 
     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) {
-                toast(R.string.toast_success)
-            } else {
-                toast(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 {
-                toast(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
-            }
-            RxPermissions(this)
-                .request(permission)
-                .subscribe {
-                    if (it) {
-                        try {
-                            showFileChooser()
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    } else
-                        toast(R.string.toast_permission_denied)
-                }
-        }
 
         binding.layoutSoureCcode.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGUrl)
+            Utils.openUri(this, AppConfig.APP_URL)
         }
 
         binding.layoutFeedback.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGIssues)
+            Utils.openUri(this, AppConfig.APP_ISSUES_URL)
         }
-        binding.layoutOssLicenses.setOnClickListener{
+
-            startActivity(Intent(this, OssLicensesMenuActivity::class.java))
+        binding.layoutOssLicenses.setOnClickListener {
+            val webView = android.webkit.WebView(this)
+            webView.loadUrl("file:///android_asset/open_source_licenses.html")
+            android.app.AlertDialog.Builder(this)
+                .setTitle("Open source licenses")
+                .setView(webView)
+                .setPositiveButton("OK") { dialog, _ -> dialog.dismiss() }
+                .show()
         }
 
         binding.layoutTgChannel.setOnClickListener {
-            Utils.openUri(this, AppConfig.TgChannelUrl)
+            Utils.openUri(this, AppConfig.TG_CHANNEL_URL)
         }
 
         binding.layoutPrivacyPolicy.setOnClickListener {
-            Utils.openUri(this, AppConfig.v2rayNGPrivacyPolicy)
+            Utils.openUri(this, AppConfig.APP_PRIVACY_POLICY)
         }
 
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestUtil.getLibVersion()})".also {
+        "v${BuildConfig.VERSION_NAME} (${V2RayNativeManager.getLibVersion()})".also {
             binding.tvVersion.text = it
         }
-    }
+        BuildConfig.APPLICATION_ID.also {
-
+            binding.tvAppId.text = it
-    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, "")
         }
     }
-
-    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.ANG_PACKAGE, "File chooser activity not found: ${ex.message}", ex)
-            toast(R.string.toast_require_file_manager)
-        }
-    }
-
-    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            val uri = it.data?.data
-            if (it.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)) {
-                        toast(R.string.toast_success)
-                    } else {
-                        toast(R.string.toast_failure)
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e)
-                    toast(R.string.toast_failure)
-                }
-            }
-        }
-
 }

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

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