up 1.9.41

Optimize and improve removeWhiteSpace
Fix
2025-03-24 15:45:56 +08:00 · 2025-03-24 15:44:08 +08:00 · 2025-03-24 14:43:07 +08:00 · 2025-03-24 10:50:13 +08:00 · 2025-03-24 10:34:59 +08:00 · 2025-03-23 19:25:20 +08:00
172 changed files with 6867 additions and 2974 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,13 +1,14 @@
 name: Build APK

 on:
-  push:
  workflow_dispatch:
    inputs:
-      XRAY_CORE_VERSION:
-        description: 'Xray core version or commit hash'
+      release_tag:
        required: false
-
+        type: string
+  push:
+    branches:
+      - master

 jobs:
  build:
@@ -15,79 +16,144 @@ jobs:

    steps:
    - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v4.2.2
+      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=3 \
+          --install "ndk;29.0.13113456"
+        echo "NDK_HOME=$ANDROID_HOME/ndk/29.0.13113456" >> $GITHUB_ENV
+        sed -i '10i\
+        \
+            ndkVersion = "29.0.13113456"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
+
+    - name: Restore cached libtun2socks
+      id: cache-libtun2socks-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ github.workspace }}/libs
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+
+    - name: Build libtun2socks
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      run: |
+        bash compile-tun2socks.sh
+
+    - name: Save libtun2socks
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ github.workspace }}/libs
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+
+    - name: Copy libtun2socks
+      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: Restore cached libhysteria2
+      id: cache-libhysteria2-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ github.workspace }}/hysteria/libs
+        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
+
+    - name: Setup Golang
+      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      uses: actions/setup-go@v5.4.0
+      with:
+        go-version-file: 'AndroidLibXrayLite/go.mod'
+        cache: false
+
+    - name: Build libhysteria2
+      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      run: |
+        bash libhysteria2.sh
+
+    - name: Save libhysteria2
+      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ github.workspace }}/hysteria/libs
+        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
+
+    - name: Copy libhysteria2
+      run: |
+        cp -r ${{ github.workspace }}/hysteria/libs ${{ github.workspace }}/V2rayNG/app

    - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v4.7.0
      with:
        distribution: 'temurin'
        java-version: '21'

-    - name: Setup Golang
-      uses: actions/setup-go@v5
+    - name: Decode Keystore
+      uses: timheuer/base64-to-file@v1.2.4
+      id: android_keystore
      with:
-        go-version: '1.23.2'
-        cache: false
-
-    - 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/
+        fileName: "android_keystore.jks"
+        encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }}

    - 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
-    
-    - name: Upload Other APKs
-      uses: actions/upload-artifact@v4
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*x86*.apk
+
+    - name: Upload to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
      with:
-        name: others-apk
-        path: |
-          ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*arm64-v8a*.apk
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*armeabi-v7a*.apk
-          !${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/*x86*.apk
+        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*playstore*/release/*.apk
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true
--- a/.github/workflows/fastlane.yml
+++ b/.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.0.0
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 V2rayNG/app/release/output.json
 .idea/
 .gradle/
+*.so
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "hysteria"]
+	path = hysteria
+	url = https://github.com/apernet/hysteria
+[submodule "AndroidLibXrayLite"]
+	path = AndroidLibXrayLite
+	url = https://github.com/2dust/AndroidLibXrayLite
+[submodule "badvpn"]
+	path = badvpn
+	url = https://github.com/XTLS/badvpn
+[submodule "libancillary"]
+	path = libancillary
+	url = https://github.com/shadowsocks/libancillary
--- a/AndroidLibV2rayLite/README.md
+++ b/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)
--- a/1
+++ b/1
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)

 [![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.0.21-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.1.20-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
+    id("com.jaredsburrows.license")
 }

 android {
@@ -11,20 +12,26 @@ android {
        applicationId = "com.v2ray.ang"
        minSdk = 21
        targetSdk = 35
-        versionCode = 614
-        versionName = "1.9.18"
+        versionCode = 641
+        versionName = "1.9.41"
        multiDexEnabled = true

+        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
        splits {
            abi {
                isEnable = true
-                include(
-                    "arm64-v8a",
-                    "armeabi-v7a",
-                    "x86_64",
-                    "x86"
-                )
-                isUniversalApk = true
+                reset()
+                if (abiFilterList != null && abiFilterList.isNotEmpty()) {
+                    include(*abiFilterList.toTypedArray())
+                } else {
+                    include(
+                        "arm64-v8a",
+                        "armeabi-v7a",
+                        "x86_64",
+                        "x86"
+                    )
+                }
+                isUniversalApk = abiFilterList.isNullOrEmpty()
            }
        }

@@ -41,6 +48,19 @@ 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")
@@ -49,34 +69,55 @@ android {


    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
    }
    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
    }

    applicationVariants.all {
        val variant = this
-        val versionCodes =
-            mapOf("armeabi-v7a" to 4, "arm64-v8a" to 4, "x86" to 4, "x86_64" to 4, "universal" to 4)
+        val isFdroid = variant.productFlavors.any { it.name == "fdroid" }
+        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
-            .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
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+                .forEach { output ->
+                    val abi = output.getFilter("ABI") ?: "universal"
+                    output.outputFileName = "v2rayNG_${variant.versionName}-fdroid_${abi}.apk"
+                    if (versionCodes.containsKey(abi)) {
+                        output.versionCodeOverride =
+                            (100 * variant.versionCode + versionCodes[abi]!!).plus(5000000)
+                    } 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 {
@@ -103,6 +144,7 @@ dependencies {
    implementation(libs.androidx.constraintlayout)
    implementation(libs.preference.ktx)
    implementation(libs.recyclerview)
+    implementation(libs.androidx.swiperefreshlayout)

    // UI Libraries
    implementation(libs.material)
@@ -115,16 +157,15 @@ dependencies {
    implementation(libs.gson)

    // Reactive and Utility Libraries
-    implementation(libs.rxjava)
-    implementation(libs.rxandroid)
-    implementation(libs.rxpermissions)
+    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.kotlinx.coroutines.core)

    // 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
@@ -145,4 +186,5 @@ dependencies {
    androidTestImplementation(libs.androidx.espresso.core)
    testImplementation(libs.org.mockito.mockito.inline)
    testImplementation(libs.mockito.kotlin)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 }
--- a/V2rayNG/app/libs/arm64-v8a/libhysteria2.so
+++ b/V2rayNG/app/libs/arm64-v8a/libhysteria2.so
--- a/V2rayNG/app/libs/arm64-v8a/libtun2socks.so
+++ b/V2rayNG/app/libs/arm64-v8a/libtun2socks.so
--- a/V2rayNG/app/libs/armeabi-v7a/libhysteria2.so
+++ b/V2rayNG/app/libs/armeabi-v7a/libhysteria2.so
--- a/V2rayNG/app/libs/armeabi-v7a/libtun2socks.so
+++ b/V2rayNG/app/libs/armeabi-v7a/libtun2socks.so
--- a/V2rayNG/app/libs/x86/libhysteria2.so
+++ b/V2rayNG/app/libs/x86/libhysteria2.so
--- a/V2rayNG/app/libs/x86/libtun2socks.so
+++ b/V2rayNG/app/libs/x86/libtun2socks.so
--- a/V2rayNG/app/libs/x86_64/libhysteria2.so
+++ b/V2rayNG/app/libs/x86_64/libhysteria2.so
--- a/V2rayNG/app/libs/x86_64/libtun2socks.so
+++ b/V2rayNG/app/libs/x86_64/libtun2socks.so
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -55,6 +55,7 @@
        android:supportsRtl="true"
        android:theme="@style/AppThemeDayNight"
        android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
        tools:targetApi="m">

        <activity
--- a/V2rayNG/app/src/main/assets/custom_routing_white
+++ b/V2rayNG/app/src/main/assets/custom_routing_white
@@ -99,10 +99,5 @@
    "domain": [
      "geosite:cn"
    ]
-  },
-  {
-    "remarks": "最终代理",
-    "port": "0-65535",
-    "outboundTag": "proxy"
  }
 ]
--- a/V2rayNG/app/src/main/assets/custom_routing_white_iran
+++ b/V2rayNG/app/src/main/assets/custom_routing_white_iran
@@ -40,10 +40,5 @@
    "ip": [
       "geoip:ir"
    ]
-  },
-  {
-    "remarks": "Final Agent",
-    "port": "0-65535",
-    "outboundTag": "proxy"
  }
 ]
--- a/V2rayNG/app/src/main/assets/open_source_licenses.html
+++ b/V2rayNG/app/src/main/assets/open_source_licenses.html
--- a/V2rayNG/app/src/main/assets/proxy_packagename.txt
+++ b/V2rayNG/app/src/main/assets/proxy_packagename.txt
@@ -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
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt
+++ b/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,18 @@ 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()
+        SettingsManager.setNightMode()
        // Initialize WorkManager with the custom configuration
        WorkManager.initialize(this, workManagerConfiguration)

        SettingsManager.initRoutingRulesets(this)
    }
-
-    fun getPackageInfo(packageName: String) = packageManager.getPackageInfo(
-        packageName, if (Build.VERSION.SDK_INT >= 28) PackageManager.GET_SIGNING_CERTIFICATES
-        else @Suppress("DEPRECATION") PackageManager.GET_SIGNATURES
-    )!!
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
@@ -12,7 +12,6 @@ object AppConfig {

    /** 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 +21,10 @@ 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_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
    const val PREF_ROUTING_RULESET = "pref_routing_ruleset"
    const val PREF_MUX_ENABLED = "pref_mux_enabled"
@@ -47,9 +48,9 @@ object AppConfig {
    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_LOGLEVEL = "pref_core_loglevel"
    const val PREF_MODE = "pref_mode"
@@ -111,7 +112,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"
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt
@@ -9,6 +9,7 @@ data class Hysteria2Bean(
    val http: Socks5Bean? = null,
    val tls: TlsBean? = null,
    val transport: TransportBean? = null,
+    val bandwidth: BandwidthBean? = null,
 ) {
    data class ObfsBean(
        val type: String?,
@@ -37,4 +38,9 @@ data class Hysteria2Bean(
            val hopInterval: String?,
        )
    }
-}
+
+    data class BandwidthBean(
+        val down: String?,
+        val up: String?,
+    )
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt
@@ -5,7 +5,6 @@ enum class NetworkType(val type: String) {
    KCP("kcp"),
    WS("ws"),
    HTTP_UPGRADE("httpupgrade"),
-    SPLIT_HTTP("splithttp"),
    XHTTP("xhttp"),
    HTTP("http"),
    H2("h2"),
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt
+++ b/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
@@ -53,6 +55,8 @@ data class ProfileItem(
    var portHopping: String? = null,
    var portHoppingInterval: String? = null,
    var pinSHA256: String? = null,
+    var bandwidthDown: String? = null,
+    var bandwidthUp: String? = null,

    ) {
    companion object {
@@ -66,6 +70,9 @@ data class ProfileItem(
    }

    fun getServerAddressAndPort(): String {
+        if (server.isNullOrEmpty() && configType == EConfigType.CUSTOM) {
+            return "$LOOPBACK:$PORT_SOCKS"
+        }
        return Utils.getIpv6Address(server) + ":" + serverPort
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/RulesetItem.kt
+++ b/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,
 )
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt
@@ -8,8 +8,10 @@ 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.dto.V2rayConfig.OutboundBean.OutSettingsBean.ServersBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.UsersBean
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.WireGuardBean
 import com.v2ray.ang.util.Utils
 import java.lang.reflect.Type

@@ -202,7 +204,7 @@ data class V2rayConfig(

        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,
@@ -257,7 +259,9 @@ 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(
@@ -357,7 +361,7 @@ data class V2rayConfig(
                authority: String?
            ): String? {
                var sni: String? = null
-                network = transport
+                network = if (transport.isEmpty()) NetworkType.TCP.type else transport
                when (network) {
                    NetworkType.TCP.type -> {
                        val tcpSetting = TcpSettingsBean()
@@ -368,11 +372,11 @@ data class V2rayConfig(
                                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
+                                sni = requestObj.headers.Host?.getOrNull(0)
                            }
                        } else {
                            tcpSetting.header.type = "none"
-                            sni = host.orEmpty()
+                            sni = host
                        }
                        tcpSettings = tcpSetting
                    }
@@ -385,13 +389,18 @@ data class V2rayConfig(
                        } else {
                            kcpsetting.seed = seed
                        }
+                        if (host.isNullOrEmpty()) {
+                            kcpsetting.header.domain = null
+                        } else {
+                            kcpsetting.header.domain = host
+                        }
                        kcpSettings = kcpsetting
                    }

                    NetworkType.WS.type -> {
                        val wssetting = WsSettingsBean()
                        wssetting.headers.Host = host.orEmpty()
-                        sni = wssetting.headers.Host
+                        sni = host
                        wssetting.path = path ?: "/"
                        wsSettings = wssetting
                    }
@@ -399,15 +408,15 @@ data class V2rayConfig(
                    NetworkType.HTTP_UPGRADE.type -> {
                        val httpupgradeSetting = HttpupgradeSettingsBean()
                        httpupgradeSetting.host = host.orEmpty()
-                        sni = httpupgradeSetting.host
+                        sni = host
                        httpupgradeSetting.path = path ?: "/"
                        httpupgradeSettings = httpupgradeSetting
                    }

-                    NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
+                    NetworkType.XHTTP.type -> {
                        val xhttpSetting = XhttpSettingsBean()
                        xhttpSetting.host = host.orEmpty()
-                        sni = xhttpSetting.host
+                        sni = host
                        xhttpSetting.path = path ?: "/"
                        xhttpSettings = xhttpSetting
                    }
@@ -416,7 +425,7 @@ data class V2rayConfig(
                        network = NetworkType.H2.type
                        val h2Setting = HttpSettingsBean()
                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                        sni = h2Setting.host.getOrNull(0) ?: sni
+                        sni = h2Setting.host.getOrNull(0)
                        h2Setting.path = path ?: "/"
                        httpSettings = h2Setting
                    }
@@ -436,7 +445,7 @@ data class V2rayConfig(
                        grpcSetting.authority = authority.orEmpty()
                        grpcSetting.idle_timeout = 60
                        grpcSetting.health_check_timeout = 20
-                        sni = authority.orEmpty()
+                        sni = authority
                        grpcSettings = grpcSetting
                    }
                }
@@ -453,15 +462,16 @@ data class V2rayConfig(
                shortId: String?,
                spiderX: String?
            ) {
-                security = streamSecurity
+                security = if (streamSecurity.isEmpty()) null else streamSecurity
+                if (security == null) return
                val tlsSetting = TlsSettingsBean(
                    allowInsecure = allowInsecure,
-                    serverName = sni,
-                    fingerprint = fingerprint,
+                    serverName = if (sni.isNullOrEmpty()) null else sni,
+                    fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
-                    publicKey = publicKey,
-                    shortId = shortId,
-                    spiderX = spiderX
+                    publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
+                    shortId = if (shortId.isNullOrEmpty()) null else shortId,
+                    spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
                )
                if (security == AppConfig.TLS) {
                    tlsSettings = tlsSetting
@@ -475,9 +485,9 @@ data class V2rayConfig(

        data class MuxBean(
            var enabled: Boolean,
-            var concurrency: Int = 8,
-            var xudpConcurrency: Int = 8,
-            var xudpProxyUDP443: String = "",
+            var concurrency: Int? = null,
+            var xudpConcurrency: Int? = null,
+            var xudpProxyUDP443: String? = null,
        )

        fun getServerAddress(): String? {
@@ -595,7 +605,7 @@ data class V2rayConfig(
                        )
                    }

-                    NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
+                    NetworkType.XHTTP.type -> {
                        val xhttpSettings = streamSettings?.xhttpSettings ?: return null
                        listOf(
                            "",
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt
@@ -17,18 +17,38 @@ 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()
 }

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

+/**
+ * Puts a key-value pair into the JSONObject.
+ *
+ * @param pair The key-value pair to put.
+ */
 fun JSONObject.putOpt(pair: Pair<String, Any?>) {
    put(pair.first, pair.second)
 }

+/**
+ * Puts multiple key-value pairs into the JSONObject.
+ *
+ * @param pairs The map of key-value pairs to put.
+ */
 fun JSONObject.putOpt(pairs: Map<String, Any?>) {
    pairs.forEach { put(it.key, it.value) }
 }
@@ -36,8 +56,18 @@ fun JSONObject.putOpt(pairs: Map<String, Any?>) {
 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()
@@ -59,10 +89,27 @@ val URLConnection.responseLength: Long
 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 +132,31 @@ 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 != null && this.isNotEmpty())
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt
@@ -6,6 +6,12 @@ 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)

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
@@ -1,5 +1,6 @@
 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
@@ -7,6 +8,14 @@ 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(
@@ -24,15 +33,26 @@ open class FmtBase {
        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,6 +67,9 @@ open class FmtBase {
        config.xhttpExtra = queryParam["extra"]

        config.security = queryParam["security"]
+        if (config.security != AppConfig.TLS && config.security != AppConfig.REALITY) {
+            config.security = null
+        }
        config.insecure = if (queryParam["allowInsecure"].isNullOrEmpty()) {
            allowInsecure
        } else {
@@ -61,6 +84,12 @@ open class FmtBase {
        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()
@@ -91,7 +120,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() }
@@ -119,5 +148,4 @@ open class FmtBase {

        return dicQuery
    }
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
@@ -4,9 +4,14 @@ 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

 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)

@@ -23,6 +28,4 @@ object HttpFmt : FmtBase() {

        return outboundBean
    }
-
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt
@@ -13,6 +13,12 @@ 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)
@@ -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>()

@@ -67,6 +79,13 @@ object Hysteria2Fmt : FmtBase() {
        return toUri(config, config.password, dicQuery)
    }

+    /**
+     * Converts a ProfileItem object to a Hysteria2Bean object.
+     *
+     * @param config the ProfileItem object to convert
+     * @param socksPort the port number for the socks5 proxy
+     * @return the converted Hysteria2Bean object, or null if conversion fails
+     */
    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {

        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
@@ -85,6 +104,12 @@ object Hysteria2Fmt : FmtBase() {
                )
            )

+        val bandwidth = if (config.bandwidthDown.isNullOrEmpty() || config.bandwidthUp.isNullOrEmpty()) null else
+            Hysteria2Bean.BandwidthBean(
+                down = config.bandwidthDown,
+                up = config.bandwidthUp,
+            )
+
        val server =
            if (config.portHopping.isNullOrEmpty())
                config.getServerAddressAndPort()
@@ -96,6 +121,7 @@ object Hysteria2Fmt : FmtBase() {
            auth = config.password,
            obfs = obfs,
            transport = transport,
+            bandwidth = bandwidth,
            socks5 = Hysteria2Bean.Socks5Bean(
                listen = "$LOOPBACK:${socksPort}",
            ),
@@ -111,10 +137,14 @@ object Hysteria2Fmt : FmtBase() {
        return bean
    }

-
+    /**
+     * 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.HYSTERIA2)
        return outboundBean
    }
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
@@ -9,10 +9,22 @@ 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)

@@ -37,18 +49,30 @@ object ShadowsocksFmt : FmtBase() {

        if (!uri.rawQuery.isNullOrEmpty()) {
            val queryParam = getQueryParam(uri)
-
-            if (queryParam["plugin"] == "obfs-local" && queryParam["obfs"] == "http") {
+            if (queryParam["plugin"]?.contains("obfs=http") == true) {
+                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.path = queryParam["path"]
+                config.host = queryPairs["obfs-host"]
+                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, "")
@@ -86,12 +110,24 @@ 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)
    }

+    /**
+     * 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)

@@ -102,8 +138,30 @@ object ShadowsocksFmt : FmtBase() {
            server.method = profileItem.method
        }

+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
+            profileItem.network.orEmpty(),
+            profileItem.headerType,
+            profileItem.host,
+            profileItem.path,
+            profileItem.seed,
+            profileItem.quicSecurity,
+            profileItem.quicKey,
+            profileItem.mode,
+            profileItem.serviceName,
+            profileItem.authority,
+        )
+
+        outboundBean?.streamSettings?.populateTlsSettings(
+            profileItem.security.orEmpty(),
+            profileItem.insecure == true,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
+            profileItem.fingerPrint,
+            profileItem.alpn,
+            profileItem.publicKey,
+            profileItem.shortId,
+            profileItem.spiderX,
+        )
+
        return outboundBean
    }
-
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
@@ -7,9 +7,14 @@ import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 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)

@@ -32,6 +37,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())
@@ -42,6 +53,12 @@ object SocksFmt : FmtBase() {
        return toUri(config, Utils.encode(pw), 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)

@@ -58,5 +75,4 @@ object SocksFmt : FmtBase() {

        return outboundBean
    }
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
@@ -9,9 +9,14 @@ import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
 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)
@@ -36,12 +41,24 @@ 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)

@@ -52,7 +69,7 @@ object TrojanFmt : FmtBase() {
            server.flow = profileItem.flow
        }

-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
            profileItem.network.orEmpty(),
            profileItem.headerType,
            profileItem.host,
@@ -68,7 +85,7 @@ object TrojanFmt : FmtBase() {
        outboundBean?.streamSettings?.populateTlsSettings(
            profileItem.security.orEmpty(),
            profileItem.insecure == true,
-            profileItem.sni,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
            profileItem.fingerPrint,
            profileItem.alpn,
            profileItem.publicKey,
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
@@ -12,6 +12,12 @@ 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)
@@ -26,11 +32,17 @@ object VlessFmt : FmtBase() {
        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,7 +50,12 @@ 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)

@@ -50,7 +67,7 @@ object VlessFmt : FmtBase() {
            vnext.users[0].flow = profileItem.flow
        }

-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
            profileItem.network.orEmpty(),
            profileItem.headerType,
            profileItem.host,
@@ -68,7 +85,7 @@ object VlessFmt : FmtBase() {
        outboundBean?.streamSettings?.populateTlsSettings(
            profileItem.security.orEmpty(),
            profileItem.insecure == true,
-            profileItem.sni,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
            profileItem.fingerPrint,
            profileItem.alpn,
            profileItem.publicKey,
@@ -78,6 +95,4 @@ object VlessFmt : FmtBase() {

        return outboundBean
    }
-
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
@@ -14,9 +14,14 @@ import com.v2ray.ang.handler.MmkvManager
 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)
@@ -80,6 +85,12 @@ object VmessFmt : 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 vmessQRCode = VmessQRCode()

@@ -123,6 +134,12 @@ object VmessFmt : FmtBase() {
        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)
@@ -142,7 +159,12 @@ 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)

@@ -153,7 +175,7 @@ object VmessFmt : FmtBase() {
            vnext.users[0].security = profileItem.method
        }

-        outboundBean?.streamSettings?.populateTransportSettings(
+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
            profileItem.network.orEmpty(),
            profileItem.headerType,
            profileItem.host,
@@ -169,7 +191,7 @@ object VmessFmt : FmtBase() {
        outboundBean?.streamSettings?.populateTlsSettings(
            profileItem.security.orEmpty(),
            profileItem.insecure == true,
-            profileItem.sni,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
            profileItem.fingerPrint,
            profileItem.alpn,
            null,
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
@@ -6,11 +6,17 @@ 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.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)

@@ -32,6 +38,12 @@ object WireguardFmt : FmtBase() {
        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)

@@ -86,6 +98,12 @@ 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)

@@ -104,19 +122,25 @@ object WireguardFmt : FmtBase() {
        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)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
@@ -16,14 +16,314 @@ 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) {
+            e.printStackTrace()
+            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()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            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) {
+            e.printStackTrace()
+            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) {
+                val config = MmkvManager.decodeServerConfig(guid)
+                if (config?.configType == EConfigType.HYSTERIA2) {
+                    val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
+                    val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort)
+                    Utils.setClipboard(context, JsonUtil.toJsonPretty(hy2Config) + "\n" + result.content)
+                    return 0
+                }
+                Utils.setClipboard(context, result.content)
+            } else {
+                return -1
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            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)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            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) {
+            e.printStackTrace()
+        }
+        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) {
+            e.printStackTrace()
+        }
+        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)
+
+                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
+        }
+    }
+
+    /**
+     * 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?,
@@ -79,242 +379,10 @@ object AngConfigManager {
    }

    /**
-     * 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 {
@@ -328,6 +396,12 @@ object AngConfigManager {
        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,7 +413,7 @@ object AngConfigManager {
            if (!it.second.enabled) {
                return 0
            }
-            val url = Utils.idnToASCII(it.second.url)
+            val url = HttpUtil.idnToASCII(it.second.url)
            if (!Utils.isValidUrl(url)) {
                return 0
            }
@@ -347,7 +421,7 @@ object AngConfigManager {

            var configText = try {
                val httpPort = SettingsManager.getHttpPort()
-                Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, 15000, httpPort)
            } catch (e: Exception) {
                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
                //e.printStackTrace()
@@ -355,7 +429,7 @@ object AngConfigManager {
            }
            if (configText.isEmpty()) {
                configText = try {
-                    Utils.getUrlContentWithCustomUserAgent(url)
+                    HttpUtil.getUrlContentWithUserAgent(url)
                } catch (e: Exception) {
                    e.printStackTrace()
                    ""
@@ -371,6 +445,14 @@ object AngConfigManager {
        }
    }

+    /**
+     * 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 +464,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 {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt
@@ -8,14 +8,19 @@ import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServerConfig
+import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.util.JsonUtil
-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) }

+    /**
+     * Migrates server configurations to profile items.
+     *
+     * @return True if migration was successful, false otherwise.
+     */
    fun migrateServerConfig2Profile(): Boolean {
        if (serverStorage.count().toInt() == 0) {
            return false
@@ -44,6 +49,12 @@ object MigrateManager {
        return true
    }

+    /**
+     * Migrates a server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrateServerConfig2ProfileSub(configOld: ServerConfig): ProfileItem? {
        return when (configOld.getProxyOutbound()?.protocol) {
            EConfigType.VMESS.name.lowercase() -> migrate2ProfileCommon(configOld)
@@ -62,6 +73,12 @@ object MigrateManager {
        }
    }

+    /**
+     * Migrates a common server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileCommon(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(configOld.configType)

@@ -92,7 +109,7 @@ object MigrateManager {
        config.insecure = tlsSettings?.allowInsecure
        config.sni = tlsSettings?.serverName
        config.fingerPrint = tlsSettings?.fingerprint
-        config.alpn = Utils.removeWhiteSpace(tlsSettings?.alpn?.joinToString(",")).toString()
+        config.alpn = tlsSettings?.alpn?.joinToString(",").removeWhiteSpace().toString()

        config.publicKey = tlsSettings?.publicKey
        config.shortId = tlsSettings?.shortId
@@ -101,6 +118,12 @@ object MigrateManager {
        return config
    }

+    /**
+     * Migrates a SOCKS server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileSocks(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(EConfigType.SOCKS)

@@ -114,6 +137,12 @@ object MigrateManager {
        return config
    }

+    /**
+     * Migrates an HTTP server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileHttp(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(EConfigType.HTTP)

@@ -127,6 +156,12 @@ object MigrateManager {
        return config
    }

+    /**
+     * Migrates a WireGuard server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileWireguard(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(EConfigType.WIREGUARD)

@@ -137,14 +172,20 @@ object MigrateManager {

        outbound.settings?.let { wireguard ->
            config.secretKey = wireguard.secretKey
-            config.localAddress = Utils.removeWhiteSpace((wireguard.address as List<*>).joinToString(",")).toString()
+            config.localAddress =  (wireguard.address as List<*>).joinToString(",").removeWhiteSpace().toString()
            config.publicKey = wireguard.peers?.getOrNull(0)?.publicKey
            config.mtu = wireguard.mtu
-            config.reserved = Utils.removeWhiteSpace(wireguard.reserved?.joinToString(",")).toString()
+            config.reserved = wireguard.reserved?.joinToString(",").removeWhiteSpace().toString()
        }
        return config
    }

+    /**
+     * Migrates a Hysteria2 server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileHysteria2(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(EConfigType.HYSTERIA2)

@@ -158,7 +199,7 @@ object MigrateManager {
        outbound.streamSettings?.tlsSettings?.let { tlsSetting ->
            config.insecure = tlsSetting.allowInsecure
            config.sni = tlsSetting.serverName
-            config.alpn = Utils.removeWhiteSpace(tlsSetting.alpn?.joinToString(",")).orEmpty()
+            config.alpn = tlsSetting.alpn?.joinToString(",").removeWhiteSpace().orEmpty()

        }
        config.obfsPassword = outbound.settings?.obfsPassword
@@ -166,6 +207,12 @@ object MigrateManager {
        return config
    }

+    /**
+     * Migrates a custom server configuration to a profile item.
+     *
+     * @param configOld The old server configuration.
+     * @return The profile item.
+     */
    private fun migrate2ProfileCustom(configOld: ServerConfig): ProfileItem? {
        val config = ProfileItem.create(EConfigType.CUSTOM)

@@ -177,7 +224,12 @@ object MigrateManager {
        return config
    }

-
+    /**
+     * Decodes the old server configuration.
+     *
+     * @param guid The server GUID.
+     * @return The old server configuration.
+     */
    private fun decodeServerConfigOld(guid: String): ServerConfig? {
        if (guid.isBlank()) {
            return null
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt
+++ b/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
@@ -41,18 +40,38 @@ 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()) {
@@ -62,7 +81,12 @@ object MmkvManager {
        }
    }

-
+    /**
+     * 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 +109,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 +138,11 @@ object MmkvManager {
        return key
    }

+    /**
+     * Removes the server configuration.
+     *
+     * @param guid The server GUID.
+     */
    fun removeServer(guid: String) {
        if (guid.isBlank()) {
            return
@@ -122,6 +158,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 +176,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 +193,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 +208,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 +222,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 +256,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 +288,9 @@ object MmkvManager {

    //region Subscriptions

+    /**
+     * Initializes the subscription list.
+     */
    private fun initSubsList() {
        val subsList = decodeSubsList()
        if (subsList.isNotEmpty()) {
@@ -212,6 +302,11 @@ object MmkvManager {
        encodeSubsList(subsList)
    }

+    /**
+     * Decodes the subscriptions.
+     *
+     * @return The list of subscriptions.
+     */
    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
        initSubsList()

@@ -225,6 +320,11 @@ object MmkvManager {
        return subscriptions
    }

+    /**
+     * Removes the subscription.
+     *
+     * @param subid The subscription ID.
+     */
    fun removeSubscription(subid: String) {
        subStorage.remove(subid)
        val subsList = decodeSubsList()
@@ -234,6 +334,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,15 +351,31 @@ 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()) {
@@ -267,6 +389,11 @@ 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 ->
@@ -278,15 +405,32 @@ object MmkvManager {
        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 +440,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()
    }

+    /**
+     * Encodes the routing rulesets.
+     *
+     * @param rulesetList The list of routing rulesets.
+     */
    fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
        if (rulesetList.isNullOrEmpty())
            encodeSettings(PREF_ROUTING_RULESET, "")
@@ -310,43 +464,99 @@ object MmkvManager {
    }

    //endregion
+
+    /**
+     * 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: 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)
    }

+    /**
+     * Decodes the settings boolean.
+     *
+     * @param key The settings key.
+     * @return The settings value.
+     */
    fun decodeSettingsBool(key: String): Boolean {
-        return settingsStorage.decodeBool(key,false)
+        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)
    }

-    fun decodeSettingsInt(key: String, defaultValue: Int): Int {
-        return settingsStorage.decodeInt(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)
    }
@@ -355,10 +565,20 @@ object MmkvManager {

    //region Others

+    /**
+     * Encodes the start on boot setting.
+     *
+     * @param startOnBoot Whether to start on boot.
+     */
    fun encodeStartOnBoot(startOnBoot: Boolean) {
        MmkvManager.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)
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt
@@ -4,26 +4,33 @@ 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.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 +39,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)
@@ -42,12 +55,21 @@ object SettingsManager {
        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
@@ -67,10 +89,14 @@ object SettingsManager {
        }
    }

+    /**
+     * 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 +105,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,20 +119,31 @@ 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()
-        if (rulesetList.isNullOrEmpty()) return
+        var rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) {
+            rulesetList = mutableListOf()
+        }

        if (index < 0 || index >= rulesetList.count()) {
-            rulesetList.add(ruleset)
+            rulesetList.add(0, ruleset)
        } else {
            rulesetList[index] = ruleset
        }
        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 +154,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) ?: "0"
+        if (vpnBypassLan == "1") {
+            return true
+        } else if (vpnBypassLan == "2") {
+            return false
+        }
+
+        val guid = MmkvManager.getSelectServer() ?: return false
+        val config = MmkvManager.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 +184,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,6 +197,11 @@ 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
@@ -136,6 +210,11 @@ object SettingsManager {
        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) {
            return null
@@ -150,14 +229,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)

@@ -181,6 +273,89 @@ object SettingsManager {
        } 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.DelayTestUrl2
+        } else {
+            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
+                ?: AppConfig.DelayTestUrl
+        }
+    }
+
+    /**
+     * 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("vi")
+            Language.RUSSIAN -> Locale("ru")
+            Language.PERSIAN -> Locale("fa")
+            Language.BANGLA -> Locale("bn")
+            Language.BAKHTIARI -> Locale("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)
+        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt
@@ -1,28 +1,32 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler

 import android.content.Context
 import android.os.SystemClock
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.responseLength
+import com.v2ray.ang.util.HttpUtil
 import kotlinx.coroutines.isActive
 import libv2ray.Libv2ray
 import java.io.IOException
-import java.net.HttpURLConnection
 import java.net.InetSocketAddress
-import java.net.Proxy
 import java.net.Socket
-import java.net.URL
 import java.net.UnknownHostException
 import kotlin.coroutines.coroutineContext

-object SpeedtestUtil {
+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) {
@@ -37,15 +41,27 @@ object SpeedtestUtil {
        return time
    }

+    /**
+     * Measures the real ping time using the V2Ray library.
+     *
+     * @param config The configuration string for the V2Ray library.
+     * @return The ping time in milliseconds, or -1 if the ping failed.
+     */
    fun realPing(config: String): Long {
        return try {
-            Libv2ray.measureOutboundDelay(config, Utils.getDelayTestUrl())
+            Libv2ray.measureOutboundDelay(config, SettingsManager.getDelayTestUrl())
        } catch (e: Exception) {
            Log.d(AppConfig.ANG_PACKAGE, "realPing: $e")
            -1L
        }
    }

+    /**
+     * Measures the ping time to a given URL using the system ping command.
+     *
+     * @param url The URL to ping.
+     * @return The ping time in milliseconds as a string, or "-1ms" if the ping failed.
+     */
    fun ping(url: String): String {
        try {
            val command = "/system/bin/ping -c 3 $url"
@@ -65,6 +81,13 @@ object SpeedtestUtil {
        return "-1ms"
    }

+    /**
+     * 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()
@@ -89,6 +112,9 @@ object SpeedtestUtil {
        return -1
    }

+    /**
+     * Closes all TCP sockets that are currently being tested.
+     */
    fun closeAllTcpSockets() {
        synchronized(this) {
            tcpTestingSockets.forEach {
@@ -98,26 +124,19 @@ object SpeedtestUtil {
        }
    }

+    /**
+     * 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
-        var conn: HttpURLConnection? = null

+        val conn = HttpUtil.createProxyConnection(SettingsManager.getDelayTestUrl(), port, 15000, 15000) ?: return Pair(elapsed, "")
        try {
-            val url = URL(Utils.getDelayTestUrl())
-
-            conn = url.openConnection(
-                Proxy(
-                    Proxy.Type.HTTP,
-                    InetSocketAddress(LOOPBACK, port)
-                )
-            ) as HttpURLConnection
-            conn.connectTimeout = 30000
-            conn.readTimeout = 30000
-            conn.setRequestProperty("Connection", "close")
-            conn.instanceFollowRedirects = false
-            conn.useCaches = false
-
            val start = SystemClock.elapsedRealtime()
            val code = conn.responseCode
            elapsed = SystemClock.elapsedRealtime() - start
@@ -133,11 +152,9 @@ object SpeedtestUtil {
                )
            }
        } catch (e: IOException) {
-            // network exception
            Log.d(AppConfig.ANG_PACKAGE, "testConnection IOException: " + Log.getStackTraceString(e))
            result = context.getString(R.string.connection_test_error, e.message)
        } catch (e: Exception) {
-            // library exception, eg sumsung
            Log.d(AppConfig.ANG_PACKAGE, "testConnection Exception: " + Log.getStackTraceString(e))
            result = context.getString(R.string.connection_test_error, e.message)
        } finally {
@@ -147,6 +164,11 @@ object SpeedtestUtil {
        return Pair(elapsed, result)
    }

+    /**
+     * Gets the version of the V2Ray library.
+     *
+     * @return The version of the V2Ray library.
+     */
    fun getLibVersion(): String {
        return Libv2ray.checkVersionX()
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt
@@ -34,10 +34,12 @@ import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
 import com.v2ray.ang.dto.ConfigResult
 import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
+import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.fmt.HttpFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -51,6 +53,13 @@ import com.v2ray.ang.util.Utils

 object V2rayConfigManager {

+    /**
+     * Retrieves the V2ray configuration for the given GUID.
+     *
+     * @param context The context of the caller.
+     * @param guid The unique identifier for the V2ray configuration.
+     * @return A ConfigResult object containing the configuration details or indicating failure.
+     */
    fun getV2rayConfig(context: Context, guid: String): ConfigResult {
        try {
            val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
@@ -70,6 +79,13 @@ object V2rayConfigManager {
        }
    }

+    /**
+     * Retrieves the non-custom V2ray configuration.
+     *
+     * @param context The context in which the function is called.
+     * @param config The profile item containing the configuration details.
+     * @return A ConfigResult object containing the result of the configuration retrieval.
+     */
    private fun getV2rayNonCustomConfig(context: Context, config: ProfileItem): ConfigResult {
        val result = ConfigResult(false)

@@ -81,7 +97,6 @@ object V2rayConfigManager {
            }
        }

-        //取得默认配置
        val assets = Utils.readTextFromAssets(context, "v2ray_config.json")
        if (TextUtils.isEmpty(assets)) {
            return result
@@ -120,7 +135,6 @@ object V2rayConfigManager {
    private fun inbounds(v2rayConfig: V2rayConfig): Boolean {
        try {
            val socksPort = SettingsManager.getSocksPort()
-            val httpPort = SettingsManager.getHttpPort()

            v2rayConfig.inbounds.forEach { curInbound ->
                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
@@ -142,14 +156,13 @@ object V2rayConfigManager {
                v2rayConfig.inbounds[0].sniffing?.destOverride?.add("fakedns")
            }

-            v2rayConfig.inbounds[1].port = httpPort
+            if (Utils.isXray()) {
+                v2rayConfig.inbounds.removeAt(1)
+            } else {
+                val httpPort = SettingsManager.getHttpPort()
+                v2rayConfig.inbounds[1].port = httpPort
+            }

-//            if (httpPort > 0) {
-//                val httpCopy = v2rayConfig.inbounds[0].copy()
-//                httpCopy.port = httpPort
-//                httpCopy.protocol = "http"
-//                v2rayConfig.inbounds.add(httpCopy)
-//            }
        } catch (e: Exception) {
            e.printStackTrace()
            return false
@@ -240,7 +253,7 @@ object V2rayConfigManager {

        val rulesetItems = MmkvManager.decodeRoutingRulesets()
        rulesetItems?.forEach { key ->
-            if (key != null && key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
+            if (key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) {
                key.domain?.forEach {
                    if (it != GEOSITE_PRIVATE
                        && (it.startsWith("geosite:") || it.startsWith("domain:"))
@@ -270,8 +283,8 @@ object V2rayConfigManager {
                )
            }

-            // DNS inbound对象
-            val remoteDns = Utils.getRemoteDnsServers()
+            // DNS inbound
+            val remoteDns = SettingsManager.getRemoteDnsServers()
            if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) {
                val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean(
                    address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY,
@@ -295,7 +308,7 @@ object V2rayConfigManager {
                )
            }

-            // DNS outbound对象
+            // DNS outbound
            if (v2rayConfig.outbounds.none { e -> e.protocol == "dns" && e.tag == "dns-out" }) {
                v2rayConfig.outbounds.add(
                    V2rayConfig.OutboundBean(
@@ -329,26 +342,26 @@ object V2rayConfigManager {
            val servers = ArrayList<Any>()

            //remote Dns
-            val remoteDns = Utils.getRemoteDnsServers()
+            val remoteDns = SettingsManager.getRemoteDnsServers()
            val proxyDomain = userRule2Domain(TAG_PROXY)
            remoteDns.forEach {
                servers.add(it)
            }
-            if (proxyDomain.size > 0) {
+            if (proxyDomain.isNotEmpty()) {
                servers.add(
                    V2rayConfig.DnsBean.ServersBean(
-                        address =  remoteDns.first(),
-                        domains =  proxyDomain,
+                        address = remoteDns.first(),
+                        domains = proxyDomain,
                    )
                )
            }

            // domestic DNS
-            val domesticDns = Utils.getDomesticDnsServers()
+            val domesticDns = SettingsManager.getDomesticDnsServers()
            val directDomain = userRule2Domain(TAG_DIRECT)
            val isCnRoutingMode = directDomain.contains(GEOSITE_CN)
            val geoipCn = arrayListOf(GEOIP_CN)
-            if (directDomain.size > 0) {
+            if (directDomain.isNotEmpty()) {
                servers.add(
                    V2rayConfig.DnsBean.ServersBean(
                        address = domesticDns.first(),
@@ -370,9 +383,23 @@ object V2rayConfigManager {
                )
            }

+            //User DNS hosts
+            try {
+                val userHosts = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
+                if (userHosts.isNotNullEmpty()) {
+                    var userHostsMap = userHosts?.split(",")
+                        ?.filter { it.isNotEmpty() }
+                        ?.filter { it.contains(":") }
+                        ?.associate { it.split(":").let { (k, v) -> k to v } }
+                    if (userHostsMap != null) hosts.putAll(userHostsMap)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
            //block dns
            val blkDomain = userRule2Domain(TAG_BLOCKED)
-            if (blkDomain.size > 0) {
+            if (blkDomain.isNotEmpty()) {
                hosts.putAll(blkDomain.map { it to LOOPBACK })
            }

@@ -388,7 +415,7 @@ object V2rayConfigManager {
            hosts[DNS_YANDEX_DOMAIN] = DNS_YANDEX_ADDRESSES


-            // DNS dns对象
+            // DNS dns
            v2rayConfig.dns = V2rayConfig.DnsBean(
                servers = servers,
                hosts = hosts
@@ -424,19 +451,18 @@ object V2rayConfigManager {
                || protocol.equals(EConfigType.HYSTERIA2.name, true)
            ) {
                muxEnabled = false
-            } else if (protocol.equals(EConfigType.VLESS.name, true)
-                && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true
-            ) {
+            } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) {
                muxEnabled = false
            }
+
            if (muxEnabled == true) {
                outbound.mux?.enabled = true
-                outbound.mux?.concurrency =
-                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_CONCURRENCY, 8)
-                outbound.mux?.xudpConcurrency =
-                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_XUDP_CONCURRENCY, 16)
-                outbound.mux?.xudpProxyUDP443 =
-                    MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC) ?: "reject"
+                outbound.mux?.concurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8").orEmpty().toInt()
+                outbound.mux?.xudpConcurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "16").orEmpty().toInt()
+                outbound.mux?.xudpProxyUDP443 = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC,"reject")
+                if (protocol.equals(EConfigType.VLESS.name, true) && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true) {
+                    outbound.mux?.concurrency = -1
+                }
            } else {
                outbound.mux?.enabled = false
                outbound.mux?.concurrency = -1
@@ -617,6 +643,12 @@ object V2rayConfigManager {
        return returnPair
    }

+    /**
+     * Retrieves the proxy outbound configuration for the given profile item.
+     *
+     * @param profileItem The profile item for which to get the proxy outbound configuration.
+     * @return The proxy outbound configuration as a V2rayConfig.OutboundBean, or null if not found.
+     */
    fun getProxyOutbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? {
        return when (profileItem.configType) {
            EConfigType.VMESS -> VmessFmt.toOutbound(profileItem)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt
+++ b/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)
+        }
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt
+++ b/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
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt
@@ -222,7 +222,7 @@ object PluginManager {
        return File(pluginDir, pluginId).absolutePath
    }

-    fun ComponentInfo.loadString(key: String) = when (val value = metaData.get(key)) {
+    fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(key)) {
        is String -> value
        is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo)
            .getString(value)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/ResolvedPlugin.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/ResolvedPlugin.kt
@@ -22,6 +22,7 @@
 package com.v2ray.ang.plugin

 import android.content.pm.ComponentInfo
+import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.graphics.drawable.Drawable
 import android.os.Build
@@ -33,13 +34,18 @@ abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin()

    override val id by lazy { componentInfo.loadString(PluginContract.METADATA_KEY_ID)!! }
    override val version by lazy {
-        AngApplication.application.getPackageInfo(componentInfo.packageName).versionCode
+        getPackageInfo(componentInfo.packageName).versionCode
    }
    override val versionName: String by lazy {
-        AngApplication.application.getPackageInfo(componentInfo.packageName).versionName!!
+        getPackageInfo(componentInfo.packageName).versionName!!
    }
    override val label: CharSequence get() = resolveInfo.loadLabel(AngApplication.application.packageManager)
    override val icon: Drawable get() = resolveInfo.loadIcon(AngApplication.application.packageManager)
    override val packageName: String get() = componentInfo.packageName
    override val directBootAware get() = Build.VERSION.SDK_INT < 24 || componentInfo.directBootAware
+
+    fun getPackageInfo(packageName: String) = AngApplication.application.packageManager.getPackageInfo(
+        packageName, if (Build.VERSION.SDK_INT >= 28) PackageManager.GET_SIGNING_CERTIFICATES
+        else @Suppress("DEPRECATION") PackageManager.GET_SIGNATURES
+    )!!
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt
@@ -7,12 +7,17 @@ import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.service.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.startV2Ray(context)
+        V2RayServiceManager.startVService(context)
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt
@@ -5,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.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,13 +27,12 @@ class TaskerReceiver : BroadcastReceiver() {
                return
            } else if (switch) {
                if (guid == AppConfig.TASKER_DEFAULT_GUID) {
-                    Utils.startVServiceFromToggle(context)
+                    V2RayServiceManager.startVServiceFromToggle(context)
                } else {
-                    MmkvManager.setSelectServer(guid)
-                    V2RayServiceManager.startV2Ray(context)
+                    V2RayServiceManager.startVService(context, guid)
                }
            } else {
-                Utils.stopVService(context)
+                V2RayServiceManager.stopVService(context)
            }
        } catch (e: Exception) {
            e.printStackTrace()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt
@@ -11,18 +11,29 @@ import android.widget.RemoteViews
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.service.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)
@@ -52,15 +63,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) {
-                Utils.stopVService(context)
+            if (V2RayServiceManager.isRunning()) {
+                V2RayServiceManager.stopVService(context)
            } else {
-                Utils.startVServiceFromToggle(context)
+                V2RayServiceManager.startVServiceFromToggle(context)
            }
        } else if (AppConfig.BROADCAST_ACTION_ACTIVITY == intent.action) {
            AppWidgetManager.getInstance(context)?.let { manager ->
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt
@@ -0,0 +1,251 @@
+package com.v2ray.ang.service
+
+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.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.TAG_DIRECT
+import com.v2ray.ang.R
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.toSpeedString
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.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 NotificationService {
+    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(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(TAG_DIRECT, AppConfig.UPLINK)
+                val directDownlink = V2RayServiceManager.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
+                delay(3000)
+            }
+        }
+    }
+
+    /**
+     * Shows the notification.
+     * @param currentConfig The current profile configuration.
+     */
+    fun showNotification(currentConfig: ProfileItem?) {
+        val service = getService() ?: return
+        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        } else {
+            PendingIntent.FLAG_UPDATE_CURRENT
+        }
+
+        val 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` = ANG_PACKAGE
+        stopV2RayIntent.putExtra("key", AppConfig.MSG_STATE_STOP)
+        val stopV2RayPendingIntent = PendingIntent.getBroadcast(service, NOTIFICATION_PENDING_INTENT_STOP_V2RAY, stopV2RayIntent, flags)
+
+        val restartV2RayIntent = Intent(AppConfig.BROADCAST_ACTION_SERVICE)
+        restartV2RayIntent.`package` = ANG_PACKAGE
+        restartV2RayIntent.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
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
+        } else {
+            service.stopForeground(true)
+        }
+
+        mBuilder = null
+        speedNotificationJob?.cancel()
+        speedNotificationJob = 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.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")
+    }
+
+    /**
+     * Gets the service instance.
+     * @return The service instance.
+     */
+    private fun getService(): Service? {
+        return V2RayServiceManager.serviceControl?.get()?.getService()
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt
@@ -10,6 +10,11 @@ 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())

@@ -33,6 +38,9 @@ class ProcessService {
        }
    }

+    /**
+     * Stops the running process.
+     */
    fun stopProcess() {
        try {
            Log.d(ANG_PACKAGE, "runProcess destroy")
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt
@@ -19,6 +19,10 @@ 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) {
        if (state == Tile.STATE_INACTIVE) {
            qsTile?.state = Tile.STATE_INACTIVE
@@ -26,7 +30,7 @@ class QSTileService : TileService() {
            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)
        }

@@ -37,7 +41,6 @@ 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()

@@ -48,6 +51,9 @@ class QSTileService : TileService() {
        MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")
    }

+    /**
+     * Called when the tile stops listening.
+     */
    override fun onStopListening() {
        super.onStopListening()

@@ -60,15 +66,18 @@ class QSTileService : TileService() {

    }

+    /**
+     * 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)
            }
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ServiceControl.kt
+++ b/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
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt
@@ -19,7 +19,6 @@ import com.v2ray.ang.handler.MmkvManager

 object SubscriptionUpdater {

-
    class UpdateTask(context: Context, params: WorkerParameters) :
        CoroutineWorker(context, params) {

@@ -33,6 +32,10 @@ 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")
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt
@@ -6,50 +6,87 @@ 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.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()
        return START_STICKY
    }

+    /**
+     * Destroys the service.
+     */
    override fun onDestroy() {
        super.onDestroy()
        V2RayServiceManager.stopV2rayPoint()
    }

+    /**
+     * 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
    }

+    /**
+     * Attaches the base context to the service.
+     * @param newBase The new base context.
+     */
    @RequiresApi(Build.VERSION_CODES.N)
    override fun attachBaseContext(newBase: Context?) {
        val context = newBase?.let {
-            MyContextWrapper.wrap(newBase, Utils.getLocale())
+            MyContextWrapper.wrap(newBase, SettingsManager.getLocale())
        }
        super.attachBaseContext(context)
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt
@@ -1,36 +1,26 @@
 package com.v2ray.ang.service

-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
+import android.app.Service
 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.EConfigType
 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.SettingsManager
 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
@@ -38,16 +28,12 @@ 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 v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
    private val mMsgReceive = ReceiveMessageHandler()
+    private var currentConfig: ProfileItem? = null

    var serviceControl: SoftReference<ServiceControl>? = null
        set(value) {
@@ -55,18 +41,66 @@ object V2RayServiceManager {
            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
+    /**
+     * 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
+    }

-    fun startV2Ray(context: Context) {
+    /**
+     * 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() = v2rayPoint.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.
+     * @param context The context from which the service is started.
+     */
+    private fun startContextService(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
+        if (config.configType != EConfigType.CUSTOM
+            && !Utils.isValidUrl(config.server)
+            && !Utils.isIpAddress(config.server)
+        ) return
 //        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
 //        if (!result.status) return

@@ -75,7 +109,7 @@ object V2RayServiceManager {
        } else {
            context.toast(R.string.toast_services_start)
        }
-        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
+        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)
@@ -87,53 +121,13 @@ object V2RayServiceManager {
        }
    }

-    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)`.
+     * Starts the V2Ray point.
     */
-
    fun startV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
+        val service = getService() ?: return
        val guid = MmkvManager.getSelectServer() ?: return
        val config = MmkvManager.decodeServerConfig(guid) ?: return
        if (v2rayPoint.isRunning) {
@@ -165,17 +159,20 @@ object V2RayServiceManager {

        if (v2rayPoint.isRunning) {
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            showNotification()
+            NotificationService.showNotification(currentConfig)

            PluginUtil.runPlugin(service, config, result.domainPort)
        } else {
            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
-            cancelNotification()
+            NotificationService.cancelNotification()
        }
    }

+    /**
+     * Stops the V2Ray point.
+     */
    fun stopV2rayPoint() {
-        val service = serviceControl?.get()?.getService() ?: return
+        val service = getService() ?: return

        if (v2rayPoint.isRunning) {
            CoroutineScope(Dispatchers.IO).launch {
@@ -188,7 +185,7 @@ object V2RayServiceManager {
        }

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

        try {
            service.unregisterReceiver(mMsgReceive)
@@ -198,7 +195,114 @@ object V2RayServiceManager {
        PluginUtil.stopPlugin()
    }

+    /**
+     * 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 v2rayPoint.queryStats(tag, link)
+    }
+
+    /**
+     * Measures the delay for V2Ray.
+     */
+    private fun measureV2rayDelay() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val service = getService() ?: return@launch
+            var time = -1L
+            var errstr = ""
+            if (v2rayPoint.isRunning) {
+                try {
+                    time = v2rayPoint.measureDelay(SettingsManager.getDelayTestUrl())
+                } catch (e: Exception) {
+                    Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
+                    errstr = e.message?.substringAfter("\":") ?: "empty message"
+                }
+                if (time == -1L) {
+                    try {
+                        time = v2rayPoint.measureDelay(SettingsManager.getDelayTestUrl(true))
+                    } catch (e: Exception) {
+                        Log.d(ANG_PACKAGE, "measureV2rayDelay: $e")
+                        errstr = e.message?.substringAfter("\":") ?: "empty message"
+                    }
+                }
+            }
+            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)
+        }
+    }
+
+    /**
+     * Gets the current service instance.
+     * @return The current service instance, or null if not available.
+     */
+    private fun getService(): Service? {
+        return serviceControl?.get()?.getService()
+    }
+
+    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())
+        }
+
+        /**
+         * Called by Go to emit status.
+         * @param l The status code.
+         * @param s The status message.
+         * @return The status code.
+         */
+        override fun onEmitStatus(l: Long, s: String?): Long {
+            return 0
+        }
+
+        /**
+         * Called by Go to set up the service.
+         * @param s The setup string.
+         * @return The status code.
+         */
+        override fun setup(s: String): Long {
+            val serviceControl = serviceControl?.get() ?: return -1
+            return try {
+                serviceControl.startService()
+                NotificationService.startSpeedNotification(currentConfig)
+                0
+            } catch (e: Exception) {
+                Log.d(ANG_PACKAGE, e.toString())
+                -1
+            }
+        }
+    }
+
    private class ReceiveMessageHandler : BroadcastReceiver() {
+        /**
+         * Handles received broadcast messages.
+         * @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)) {
@@ -219,11 +323,15 @@ object V2RayServiceManager {
                }

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

                AppConfig.MSG_STATE_RESTART -> {
-                    startV2rayPoint()
+                    Log.d(ANG_PACKAGE, "Restart Service")
+                    serviceControl.stopService()
+                    Thread.sleep(500L)
+                    startVService(serviceControl.getService())
                }

                AppConfig.MSG_MEASURE_DELAY -> {
@@ -234,208 +342,14 @@ object V2RayServiceManager {
            when (intent?.action) {
                Intent.ACTION_SCREEN_OFF -> {
                    Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
-                    stopSpeedNotification()
+                    NotificationService.stopSpeedNotification(currentConfig)
                }

                Intent.ACTION_SCREEN_ON -> {
                    Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
-                    startSpeedNotification()
+                    NotificationService.startSpeedNotification(currentConfig)
                }
            }
        }
    }
-
-    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)
-        }
-    }
-
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt
@@ -9,10 +9,10 @@ import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.PluginUtil
-import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
@@ -26,12 +26,22 @@ import java.util.concurrent.Executors
 class V2RayTestService : Service() {
    private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()).asCoroutineDispatcher()) }

+    /**
+     * Initializes the V2Ray environment.
+     */
    override fun onCreate() {
        super.onCreate()
        Seq.setContext(this)
        Libv2ray.initV2Env(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
    }

+    /**
+     * Handles the start command for the service.
+     * @param intent The intent.
+     * @param flags The flags.
+     * @param startId The start ID.
+     * @return The start mode.
+     */
    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
        when (intent?.getIntExtra("key", 0)) {
            MSG_MEASURE_CONFIG -> {
@@ -49,10 +59,20 @@ class V2RayTestService : Service() {
        return super.onStartCommand(intent, flags, startId)
    }

+    /**
+     * Binds the service.
+     * @param intent The intent.
+     * @return The binder.
+     */
    override fun onBind(intent: Intent?): IBinder? {
        return null
    }

+    /**
+     * Starts the real ping test.
+     * @param guid The GUID of the configuration.
+     * @return The ping result.
+     */
    private fun startRealPing(guid: String): Long {
        val retFailure = -1L

@@ -65,7 +85,7 @@ class V2RayTestService : Service() {
            if (!config.status) {
                return retFailure
            }
-            return SpeedtestUtil.realPing(config.content)
+            return SpeedtestManager.realPing(config.content)
        }
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt
@@ -10,6 +10,7 @@ import android.net.LocalSocketAddress
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.net.ProxyInfo
 import android.net.VpnService
 import android.os.Build
 import android.os.ParcelFileDescriptor
@@ -34,18 +35,15 @@ 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 PRIVATE_VLAN4_CLIENT = "10.10.14.1"
+        private const val PRIVATE_VLAN4_ROUTER = "10.10.14.2"
+        private const val PRIVATE_VLAN6_CLIENT = "fc00::10:10:14:1"
+        private const val PRIVATE_VLAN6_ROUTER = "fc00::10:10:14:2"
        private const val TUN2SOCKS = "libtun2socks.so"
    }

-
    private lateinit var mInterface: ParcelFileDescriptor
    private var isRunning = false
-
-    //val fd: Int get() = mInterface.fd
    private lateinit var process: Process

    /**destroy
@@ -87,7 +85,6 @@ class V2RayVpnService : VpnService(), ServiceControl {

    override fun onCreate() {
        super.onCreate()
-
        val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
        StrictMode.setThreadPolicy(policy)
        V2RayServiceManager.serviceControl = SoftReference(this)
@@ -104,15 +101,61 @@ class V2RayVpnService : VpnService(), ServiceControl {

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

+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        V2RayServiceManager.startV2rayPoint()
+        return START_STICKY
+        //return super.onStartCommand(intent, flags, startId)
+    }
+
+    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, SettingsManager.getLocale())
+        }
+        super.attachBaseContext(context)
+    }
+
+    /**
+     * Sets up the VPN service.
+     * Prepares the VPN and configures it if preparation is successful.
+     */
    private fun setup() {
        val prepare = prepare(this)
        if (prepare != null) {
            return
        }

+        if (setupVpnService() != true) {
+            return
+        }
+
+        runTun2socks()
+    }
+
+    /**
+     * Configures the VPN service.
+     * @return True if the VPN service was configured successfully, false otherwise.
+     */
+    private fun setupVpnService(): Boolean {
        // If the old interface has exactly the same parameters, use it!
        // Configure a builder while parsing the parameters.
        val builder = Builder()
@@ -143,7 +186,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
 //        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
 //            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
 //        } else {
-        Utils.getVpnDnsServers()
+        SettingsManager.getVpnDnsServers()
            .forEach {
                if (Utils.isPureIpAddress(it)) {
                    builder.addDnsServer(it)
@@ -151,7 +194,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
            }
 //        }

-        builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
+        builder.setSession(V2RayServiceManager.getRunningServerName())

        val selfPackageName = BuildConfig.APPLICATION_ID
        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
@@ -190,20 +233,28 @@ class V2RayVpnService : VpnService(), ServiceControl {

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
            builder.setMetered(false)
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
+                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
+            }
        }

        // Create a new interface using the builder and save the parameters.
        try {
            mInterface = builder.establish()!!
            isRunning = true
-            runTun2socks()
+            return true
        } catch (e: Exception) {
            // non-nullable lateinit var
            e.printStackTrace()
            stopV2Ray()
        }
+        return false
    }

+    /**
+     * Runs the tun2socks process.
+     * Starts the tun2socks process with the appropriate parameters.
+     */
    private fun runTun2socks() {
        val socksPort = SettingsManager.getSocksPort()
        val cmd = arrayListOf(
@@ -251,6 +302,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
        }
    }

+    /**
+     * Sends the file descriptor to the tun2socks process.
+     * Attempts to send the file descriptor multiple times if necessary.
+     */
    private fun sendFd() {
        val fd = mInterface.fileDescriptor
        val path = File(applicationContext.filesDir, "sock_path").absolutePath
@@ -275,12 +330,10 @@ class V2RayVpnService : VpnService(), ServiceControl {
        }
    }

-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        V2RayServiceManager.startV2rayPoint()
-        return START_STICKY
-        //return super.onStartCommand(intent, flags, startId)
-    }
-
+    /**
+     * 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()
@@ -319,28 +372,4 @@ class V2RayVpnService : VpnService(), ServiceControl {
            }
        }
    }
-
-    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)
-    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
@@ -5,16 +5,16 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
+import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 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.util.SpeedtestUtil
+import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.util.ZipUtil
 import java.io.File
@@ -22,9 +22,23 @@ import java.text.SimpleDateFormat
 import java.util.Locale

 class AboutActivity : BaseActivity() {
+
    private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
    private val extDir by lazy { File(Utils.backupPath(this)) }

+    private val requestPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
+            if (isGranted) {
+                try {
+                    showFileChooser()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            } else {
+                toast(R.string.toast_permission_denied)
+            }
+        }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
@@ -32,6 +46,7 @@ class AboutActivity : BaseActivity() {
        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) {
@@ -49,7 +64,8 @@ class AboutActivity : BaseActivity() {
                        Intent(Intent.ACTION_SEND).setType("application/zip")
                            .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                            .putExtra(
-                                Intent.EXTRA_STREAM, FileProvider.getUriForFile(
+                                Intent.EXTRA_STREAM,
+                                FileProvider.getUriForFile(
                                    this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second)
                                )
                            ), getString(R.string.title_configuration_share)
@@ -61,23 +77,22 @@ class AboutActivity : BaseActivity() {
        }

        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)
+            val permission =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Manifest.permission.READ_MEDIA_IMAGES
+                } else {
+                    Manifest.permission.READ_EXTERNAL_STORAGE
                }
+
+            if (ContextCompat.checkSelfPermission(this, permission) == android.content.pm.PackageManager.PERMISSION_GRANTED) {
+                try {
+                    showFileChooser()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            } else {
+                requestPermissionLauncher.launch(permission)
+            }
        }

        binding.layoutSoureCcode.setOnClickListener {
@@ -88,6 +103,16 @@ class AboutActivity : BaseActivity() {
            Utils.openUri(this, AppConfig.v2rayNGIssues)
        }

+        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)
        }
@@ -96,7 +121,7 @@ class AboutActivity : BaseActivity() {
            Utils.openUri(this, AppConfig.v2rayNGPrivacyPolicy)
        }

-        "v${BuildConfig.VERSION_NAME} (${SpeedtestUtil.getLibVersion()})".also {
+        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
            binding.tvVersion.text = it
        }
    }
@@ -148,9 +173,9 @@ class AboutActivity : BaseActivity() {
    }

    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            val uri = it.data?.data
-            if (it.resultCode == RESULT_OK && uri != null) {
+        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")
@@ -171,4 +196,7 @@ class AboutActivity : BaseActivity() {
            }
        }

+    private fun toast(messageResId: Int) {
+        Toast.makeText(this, getString(messageResId), Toast.LENGTH_SHORT).show()
+    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt
@@ -6,10 +6,16 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.helper.CustomDividerItemDecoration
 import com.v2ray.ang.util.MyContextWrapper
 import com.v2ray.ang.util.Utils

+
 abstract class BaseActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -34,6 +40,26 @@ abstract class BaseActivity : AppCompatActivity() {

    @RequiresApi(Build.VERSION_CODES.N)
    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, Utils.getLocale()))
+        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, SettingsManager.getLocale()))
+    }
+
+    /**
+     * Adds a custom divider to a RecyclerView.
+     *
+     * @param recyclerView  The target RecyclerView to which the divider will be added.
+     * @param context       The context used to access resources.
+     * @param drawableResId The resource ID of the drawable to be used as the divider.
+     * @param orientation   The orientation of the divider (DividerItemDecoration.VERTICAL or DividerItemDecoration.HORIZONTAL).
+     */
+    fun addCustomDividerToRecyclerView(recyclerView: RecyclerView, context: Context?, drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
+        // Get the drawable from resources
+        val drawable = ContextCompat.getDrawable(context!!, drawableResId)
+        requireNotNull(drawable) { "Drawable resource not found" }
+
+        // Create a DividerItemDecoration with the specified orientation
+        val dividerItemDecoration = CustomDividerItemDecoration(drawable, orientation)
+
+        // Add the divider to the RecyclerView
+        recyclerView.addItemDecoration(dividerItemDecoration)
    }
 }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt
@@ -1,13 +1,12 @@
 package com.v2ray.ang.ui

 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.text.method.ScrollingMovementMethod
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
+import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
@@ -18,10 +17,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException

-class LogcatActivity : BaseActivity() {
-    private val binding by lazy {
-        ActivityLogcatBinding.inflate(layoutInflater)
-    }
+
+class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
+    private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
+
+    var logsetsAll: MutableList<String> = mutableListOf()
+    var logsets: MutableList<String> = mutableListOf()
+    private val adapter by lazy { LogcatRecyclerAdapter(this) }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -29,63 +31,118 @@ class LogcatActivity : BaseActivity() {

        title = getString(R.string.title_logcat)

-        logcat(false)
+        binding.recyclerView.setHasFixedSize(true)
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
+        binding.recyclerView.adapter = adapter
+
+        binding.refreshLayout.setOnRefreshListener(this)
+
+        logsets.add(getString(R.string.pull_down_to_refresh))
    }

-    private fun logcat(shouldFlushLog: Boolean) {
-        binding.pbWaiting.visibility = View.VISIBLE
+    private fun getLogcat() {

-        lifecycleScope.launch(Dispatchers.Default) {
-            try {
-                if (shouldFlushLog) {
-                    val lst = linkedSetOf("logcat", "-c")
-                    withContext(Dispatchers.IO) {
-                        val process = Runtime.getRuntime().exec(lst.toTypedArray())
-                        process.waitFor()
-                    }
-                }
-                val lst = linkedSetOf(
-                    "logcat", "-d", "-v", "time", "-s",
-                    "GoLog,tun2socks,$ANG_PACKAGE,AndroidRuntime,System.err"
-                )
+        try {
+            binding.refreshLayout.isRefreshing = true
+
+            lifecycleScope.launch(Dispatchers.Default) {
+                val lst = LinkedHashSet<String>()
+                lst.add("logcat")
+                lst.add("-d")
+                lst.add("-v")
+                lst.add("time")
+                lst.add("-s")
+                lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err")
                val process = withContext(Dispatchers.IO) {
                    Runtime.getRuntime().exec(lst.toTypedArray())
                }
-                val allText = process.inputStream.bufferedReader().use { it.readText() }
-                withContext(Dispatchers.Main) {
-                    binding.tvLogcat.text = allText
-                    binding.tvLogcat.movementMethod = ScrollingMovementMethod()
-                    binding.pbWaiting.visibility = View.GONE
-                    Handler(Looper.getMainLooper()).post { binding.svLogcat.fullScroll(View.FOCUS_DOWN) }
+
+                val allText = process.inputStream.bufferedReader().use { it.readLines() }.reversed()
+                launch(Dispatchers.Main) {
+                    logsetsAll = allText.toMutableList()
+                    logsets = allText.toMutableList()
+                    adapter.notifyDataSetChanged()
+                    binding.refreshLayout.isRefreshing = false
                }
-            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    binding.pbWaiting.visibility = View.GONE
-                    toast(R.string.toast_failure)
-                }
-                e.printStackTrace()
            }
+        } catch (e: IOException) {
+            e.printStackTrace()
        }
    }

+    private fun clearLogcat() {
+        try {
+            lifecycleScope.launch(Dispatchers.Default) {
+                val lst = LinkedHashSet<String>()
+                lst.add("logcat")
+                lst.add("-c")
+                withContext(Dispatchers.IO) {
+                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                    process.waitFor()
+                }
+                launch(Dispatchers.Main) {
+                    logsetsAll.clear()
+                    logsets.clear()
+                    adapter.notifyDataSetChanged()
+                }
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }

    override fun onCreateOptionsMenu(menu: Menu): Boolean {
        menuInflater.inflate(R.menu.menu_logcat, menu)
+
+        val searchItem = menu.findItem(R.id.search_view)
+        if (searchItem != null) {
+            val searchView = searchItem.actionView as SearchView
+            searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String?): Boolean = false
+
+                override fun onQueryTextChange(newText: String?): Boolean {
+                    filterLogs(newText)
+                    return false
+                }
+            })
+            searchView.setOnCloseListener {
+                filterLogs("")
+                false
+            }
+        }
+
        return super.onCreateOptionsMenu(menu)
    }

    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
        R.id.copy_all -> {
-            Utils.setClipboard(this, binding.tvLogcat.text.toString())
+            Utils.setClipboard(this, logsets.joinToString("\n"))
            toast(R.string.toast_success)
            true
        }

        R.id.clear_all -> {
-            logcat(true)
+            clearLogcat()
            true
        }

        else -> super.onOptionsItemSelected(item)
    }
-}
+
+    private fun filterLogs(content: String?): Boolean {
+        val key = content?.trim()
+        logsets = if (key.isNullOrEmpty()) {
+            logsetsAll.toMutableList()
+        } else {
+            logsetsAll.filter { it.contains(key) }.toMutableList()
+        }
+
+        adapter?.notifyDataSetChanged()
+        return true
+    }
+
+    override fun onRefresh() {
+        getLogcat()
+    }
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt
@@ -0,0 +1,41 @@
+package com.v2ray.ang.ui
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.databinding.ItemRecyclerLogcatBinding
+
+class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
+    private var mActivity: LogcatActivity = activity
+
+    override fun getItemCount() = mActivity.logsets.size
+
+    override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
+        try {
+            val log = mActivity.logsets[position]
+            if (log.isEmpty()) {
+                holder.itemSubSettingBinding.logTag.text = ""
+                holder.itemSubSettingBinding.logContent.text = ""
+            } else {
+                val content = log.split("):", limit = 2)
+                holder.itemSubSettingBinding.logTag.text = content.first().split("(", limit = 2).first().trim()
+                holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
+        return MainViewHolder(
+            ItemRecyclerLogcatBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+        )
+    }
+
+    class MainViewHolder(val itemSubSettingBinding: ItemRecyclerLogcatBinding) : RecyclerView.ViewHolder(itemSubSettingBinding.root)
+
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@@ -1,18 +1,16 @@
 package com.v2ray.ang.ui

 import android.Manifest
-import android.content.ActivityNotFoundException
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -27,7 +25,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.tabs.TabLayout
-import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
@@ -41,14 +38,10 @@ import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import me.drakeet.support.toast.ToastCompat
-import java.util.concurrent.TimeUnit

 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
    private val binding by lazy {
@@ -81,6 +74,64 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
    private var mItemTouchHelper: ItemTouchHelper? = null
    val mainViewModel: MainViewModel by viewModels()

+    // register activity result for requesting permission
+    private val requestPermissionLauncher =
+        registerForActivityResult(
+            ActivityResultContracts.RequestPermission()
+        ) { isGranted: Boolean ->
+            if (isGranted) {
+                when (pendingAction) {
+                    Action.IMPORT_QR_CODE_CONFIG ->
+                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+
+//                    Action.IMPORT_QR_CODE_URL ->
+//                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
+
+                    Action.READ_CONTENT_FROM_URI ->
+                        chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
+                            type = "*/*"
+                            addCategory(Intent.CATEGORY_OPENABLE)
+                        }, getString(R.string.title_file_chooser)))
+
+                    Action.POST_NOTIFICATIONS -> {}
+                    else -> {}
+                }
+            } else {
+                toast(R.string.toast_permission_denied)
+            }
+            pendingAction = Action.NONE
+        }
+
+    private var pendingAction: Action = Action.NONE
+
+    enum class Action {
+        NONE,
+        IMPORT_QR_CODE_CONFIG,
+
+        //IMPORT_QR_CODE_URL,
+        READ_CONTENT_FROM_URI,
+        POST_NOTIFICATIONS
+    }
+
+    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val uri = it.data?.data
+        if (it.resultCode == RESULT_OK && uri != null) {
+            readContentFromUri(uri)
+        }
+    }
+
+    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_OK) {
+            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
+        }
+    }
+
+//    private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+//        if (it.resultCode == RESULT_OK) {
+//            importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
+//        }
+//    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
@@ -89,7 +140,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList

        binding.fab.setOnClickListener {
            if (mainViewModel.isRunning.value == true) {
-                Utils.stopVService(this)
+                V2RayServiceManager.stopVService(this)
            } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
                val intent = VpnService.prepare(this)
                if (intent == null) {
@@ -112,6 +163,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList

        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
        binding.recyclerView.adapter = adapter

        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
@@ -129,12 +181,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        migrateLegacy()

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            RxPermissions(this)
-                .request(Manifest.permission.POST_NOTIFICATIONS)
-                .subscribe {
-                    if (!it)
-                        toast(R.string.toast_permission_denied_notification)
-                }
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+                pendingAction = Action.POST_NOTIFICATIONS
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
        }

        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
@@ -142,8 +192,9 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
                    binding.drawerLayout.closeDrawer(GravityCompat.START)
                } else {
-                    //super.onBackPressed()
+                    isEnabled = false
                    onBackPressedDispatcher.onBackPressed()
+                    isEnabled = true
                }
            }
        })
@@ -219,18 +270,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            toast(R.string.title_file_chooser)
            return
        }
-        V2RayServiceManager.startV2Ray(this)
+        V2RayServiceManager.startVService(this)
    }

    fun restartV2Ray() {
        if (mainViewModel.isRunning.value == true) {
-            Utils.stopVService(this)
+            V2RayServiceManager.stopVService(this)
+        }
+        lifecycleScope.launch {
+            delay(500)
+            startV2Ray()
        }
-        Observable.timer(500, TimeUnit.MILLISECONDS)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                startV2Ray()
-            }
    }

    public override fun onResume() {
@@ -276,6 +326,11 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            true
        }

+        R.id.import_local -> {
+            importConfigLocal()
+            true
+        }
+
        R.id.import_manually_vmess -> {
            importManually(EConfigType.VMESS.value)
            true
@@ -316,55 +371,39 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            true
        }

-        R.id.import_config_custom_clipboard -> {
-            importConfigCustomClipboard()
-            true
-        }
-
-        R.id.import_config_custom_local -> {
-            importConfigCustomLocal()
-            true
-        }
-
-        R.id.import_config_custom_url -> {
-            importConfigCustomUrlClipboard()
-            true
-        }
-
-        R.id.import_config_custom_url_scan -> {
-            importQRcode(false)
-            true
-        }
-
-        R.id.sub_update -> {
-            importConfigViaSub()
-            true
-        }
+//        R.id.import_config_custom_clipboard -> {
+//            importConfigCustomClipboard()
+//            true
+//        }
+//
+//        R.id.import_config_custom_local -> {
+//            importConfigCustomLocal()
+//            true
+//        }
+//
+//        R.id.import_config_custom_url -> {
+//            importConfigCustomUrlClipboard()
+//            true
+//        }
+//
+//        R.id.import_config_custom_url_scan -> {
+//            importQRcode(false)
+//            true
+//        }

        R.id.export_all -> {
-            binding.pbWaiting.show()
-            lifecycleScope.launch(Dispatchers.IO) {
-                val ret = mainViewModel.exportAllServer()
-                launch(Dispatchers.Main) {
-                    if (ret == 0)
-                        toast(R.string.toast_success)
-                    else
-                        toast(R.string.toast_failure)
-                    binding.pbWaiting.hide()
-                }
-            }
-
+            exportAll()
            true
        }

        R.id.ping_all -> {
-            toast(R.string.connection_test_testing)
+            toast(getString(R.string.connection_test_testing_count, mainViewModel.serversCache.count()))
            mainViewModel.testAllTcping()
            true
        }

        R.id.real_ping_all -> {
-            toast(R.string.connection_test_testing)
+            toast(getString(R.string.connection_test_testing_count, mainViewModel.serversCache.count()))
            mainViewModel.testAllRealPing()
            true
        }
@@ -375,75 +414,31 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        }

        R.id.del_all_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    binding.pbWaiting.show()
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeAllServer()
-                        launch(Dispatchers.Main) {
-                            mainViewModel.reloadServerList()
-                            binding.pbWaiting.hide()
-                        }
-                    }
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
-                }
-                .show()
+            delAllConfig()
            true
        }

        R.id.del_duplicate_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    binding.pbWaiting.show()
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        val ret = mainViewModel.removeDuplicateServer()
-                        launch(Dispatchers.Main) {
-                            mainViewModel.reloadServerList()
-                            toast(getString(R.string.title_del_duplicate_config_count, ret))
-                            binding.pbWaiting.hide()
-                        }
-                    }
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
-                }
-                .show()
+            delDuplicateConfig()
            true
        }

        R.id.del_invalid_config -> {
-            AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    binding.pbWaiting.show()
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeInvalidServer()
-                        launch(Dispatchers.Main) {
-                            mainViewModel.reloadServerList()
-                            binding.pbWaiting.hide()
-                        }
-                    }
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
-                }
-                .show()
+            delInvalidConfig()
            true
        }

        R.id.sort_by_test_results -> {
-            binding.pbWaiting.show()
-            lifecycleScope.launch(Dispatchers.IO) {
-                mainViewModel.sortByTestResults()
-                launch(Dispatchers.Main) {
-                    mainViewModel.reloadServerList()
-                    binding.pbWaiting.hide()
-                }
-            }
+            sortByTestResults()
            true
        }

+        R.id.sub_update -> {
+            importConfigViaSub()
+            true
+        }
+
+
        else -> super.onOptionsItemSelected(item)
    }

@@ -460,38 +455,20 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     * import config from qrcode
     */
    private fun importQRcode(forConfig: Boolean): Boolean {
-//        try {
-//            startActivityForResult(Intent("com.google.zxing.client.android.SCAN")
-//                    .addCategory(Intent.CATEGORY_DEFAULT)
-//                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), requestCode)
-//        } catch (e: Exception) {
-        RxPermissions(this)
-            .request(Manifest.permission.CAMERA)
-            .subscribe {
-                if (it)
-                    if (forConfig)
-                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-                    else
-                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
-                else
-                    toast(R.string.toast_permission_denied)
+        val permission = Manifest.permission.CAMERA
+        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            if (forConfig) {
+                scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+            } else {
+                //scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
            }
-//        }
+        } else {
+            pendingAction = Action.IMPORT_QR_CODE_CONFIG//if (forConfig) Action.IMPORT_QR_CODE_CONFIG else Action.IMPORT_QR_CODE_URL
+            requestPermissionLauncher.launch(permission)
+        }
        return true
    }

-    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
-    private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
    /**
     * import config from clipboard
     */
@@ -517,7 +494,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                withContext(Dispatchers.Main) {
                    when {
                        count > 0 -> {
-                            toast(R.string.toast_success)
+                            toast(getString(R.string.title_import_config_count, count))
                            mainViewModel.reloadServerList()
                        }

@@ -536,27 +513,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        }
    }

-
-    private fun importConfigCustomClipboard()
-            : Boolean {
-        try {
-            val configText = Utils.getClipboard(this)
-            if (TextUtils.isEmpty(configText)) {
-                toast(R.string.toast_none_data_clipboard)
-                return false
-            }
-            importCustomizeConfig(configText)
-            return true
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-    }
-
-    /**
-     * import config from local config file
-     */
-    private fun importConfigCustomLocal(): Boolean {
+    private fun importConfigLocal(): Boolean {
        try {
            showFileChooser()
        } catch (e: Exception) {
@@ -566,56 +523,82 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        return true
    }

-    private fun importConfigCustomUrlClipboard()
-            : Boolean {
-        try {
-            val url = Utils.getClipboard(this)
-            if (TextUtils.isEmpty(url)) {
-                toast(R.string.toast_none_data_clipboard)
-                return false
-            }
-            return importConfigCustomUrl(url)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-    }
+
+//    private fun importConfigCustomClipboard()
+//            : Boolean {
+//        try {
+//            val configText = Utils.getClipboard(this)
+//            if (TextUtils.isEmpty(configText)) {
+//                toast(R.string.toast_none_data_clipboard)
+//                return false
+//            }
+//            importCustomizeConfig(configText)
+//            return true
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            return false
+//        }
+//    }
+
+    /**
+     * import config from local config file
+     */
+//    private fun importConfigCustomLocal(): Boolean {
+//        try {
+//            showFileChooser()
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            return false
+//        }
+//        return true
+//    }
+//
+//    private fun importConfigCustomUrlClipboard()
+//            : Boolean {
+//        try {
+//            val url = Utils.getClipboard(this)
+//            if (TextUtils.isEmpty(url)) {
+//                toast(R.string.toast_none_data_clipboard)
+//                return false
+//            }
+//            return importConfigCustomUrl(url)
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            return false
+//        }
+//    }

    /**
     * import config from url
     */
-    private fun importConfigCustomUrl(url: String?): Boolean {
-        try {
-            if (!Utils.isValidUrl(url)) {
-                toast(R.string.toast_invalid_url)
-                return false
-            }
-            lifecycleScope.launch(Dispatchers.IO) {
-                val configText = try {
-                    Utils.getUrlContentWithCustomUserAgent(url)
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                    ""
-                }
-                launch(Dispatchers.Main) {
-                    importCustomizeConfig(configText)
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            return false
-        }
-        return true
-    }
+//    private fun importConfigCustomUrl(url: String?): Boolean {
+//        try {
+//            if (!Utils.isValidUrl(url)) {
+//                toast(R.string.toast_invalid_url)
+//                return false
+//            }
+//            lifecycleScope.launch(Dispatchers.IO) {
+//                val configText = try {
+//                    HttpUtil.getUrlContentWithUserAgent(url)
+//                } catch (e: Exception) {
+//                    e.printStackTrace()
+//                    ""
+//                }
+//                launch(Dispatchers.Main) {
+//                    importCustomizeConfig(configText)
+//                }
+//            }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            return false
+//        }
+//        return true
+//    }

    /**
     * import config from sub
     */
    private fun importConfigViaSub(): Boolean {
-//        val dialog = AlertDialog.Builder(this)
-//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-//            .setCancelable(false)
-//            .show()
        binding.pbWaiting.show()

        lifecycleScope.launch(Dispatchers.IO) {
@@ -623,18 +606,99 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
            delay(500L)
            launch(Dispatchers.Main) {
                if (count > 0) {
-                    toast(R.string.toast_success)
+                    toast(getString(R.string.title_update_config_count, count))
                    mainViewModel.reloadServerList()
                } else {
                    toast(R.string.toast_failure)
                }
-                //dialog.dismiss()
                binding.pbWaiting.hide()
            }
        }
        return true
    }

+    private fun exportAll() {
+        binding.pbWaiting.show()
+        lifecycleScope.launch(Dispatchers.IO) {
+            val ret = mainViewModel.exportAllServer()
+            launch(Dispatchers.Main) {
+                if (ret > 0)
+                    toast(getString(R.string.title_export_config_count, ret))
+                else
+                    toast(R.string.toast_failure)
+                binding.pbWaiting.hide()
+            }
+        }
+    }
+
+    private fun delAllConfig() {
+        AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                binding.pbWaiting.show()
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val ret = mainViewModel.removeAllServer()
+                    launch(Dispatchers.Main) {
+                        mainViewModel.reloadServerList()
+                        toast(getString(R.string.title_del_config_count, ret))
+                        binding.pbWaiting.hide()
+                    }
+                }
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                //do noting
+            }
+            .show()
+    }
+
+    private fun delDuplicateConfig() {
+        AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                binding.pbWaiting.show()
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val ret = mainViewModel.removeDuplicateServer()
+                    launch(Dispatchers.Main) {
+                        mainViewModel.reloadServerList()
+                        toast(getString(R.string.title_del_duplicate_config_count, ret))
+                        binding.pbWaiting.hide()
+                    }
+                }
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                //do noting
+            }
+            .show()
+    }
+
+    private fun delInvalidConfig() {
+        AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                binding.pbWaiting.show()
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val ret = mainViewModel.removeInvalidServer()
+                    launch(Dispatchers.Main) {
+                        mainViewModel.reloadServerList()
+                        toast(getString(R.string.title_del_config_count, ret))
+                        binding.pbWaiting.hide()
+                    }
+                }
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                //do noting
+            }
+            .show()
+    }
+
+    private fun sortByTestResults() {
+        binding.pbWaiting.show()
+        lifecycleScope.launch(Dispatchers.IO) {
+            mainViewModel.sortByTestResults()
+            launch(Dispatchers.Main) {
+                mainViewModel.reloadServerList()
+                binding.pbWaiting.hide()
+            }
+        }
+    }
+
    /**
     * show file chooser
     */
@@ -643,17 +707,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        intent.type = "*/*"
        intent.addCategory(Intent.CATEGORY_OPENABLE)

-        try {
-            chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } catch (ex: ActivityNotFoundException) {
-            toast(R.string.toast_require_file_manager)
+        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.READ_MEDIA_IMAGES
+        } else {
+            Manifest.permission.READ_EXTERNAL_STORAGE
        }
-    }

-    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            readContentFromUri(uri)
+        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            pendingAction = Action.READ_CONTENT_FROM_URI
+            chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
+        } else {
+            requestPermissionLauncher.launch(permission)
        }
    }

@@ -666,45 +730,43 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
        } else {
            Manifest.permission.READ_EXTERNAL_STORAGE
        }
-        RxPermissions(this)
-            .request(permission)
-            .subscribe {
-                if (it) {
-                    try {
-                        contentResolver.openInputStream(uri).use { input ->
-                            importCustomizeConfig(input?.bufferedReader()?.readText())
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-                } else
-                    toast(R.string.toast_permission_denied)
-            }
-    }

-    /**
-     * import customize config
-     */
-    private fun importCustomizeConfig(server: String?) {
-        try {
-            if (server == null || TextUtils.isEmpty(server)) {
-                toast(R.string.toast_none_data)
-                return
+        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            try {
+                contentResolver.openInputStream(uri).use { input ->
+                    importBatchConfig(input?.bufferedReader()?.readText())
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
            }
-            if (mainViewModel.appendCustomConfigServer(server)) {
-                mainViewModel.reloadServerList()
-                toast(R.string.toast_success)
-            } else {
-                toast(R.string.toast_failure)
-            }
-            //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
-        } catch (e: Exception) {
-            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
-            e.printStackTrace()
-            return
+        } else {
+            requestPermissionLauncher.launch(permission)
        }
    }

+//    /**
+//     * import customize config
+//     */
+//    private fun importCustomizeConfig(server: String?) {
+//        try {
+//            if (server == null || TextUtils.isEmpty(server)) {
+//                toast(R.string.toast_none_data)
+//                return
+//            }
+//            if (mainViewModel.appendCustomConfigServer(server)) {
+//                mainViewModel.reloadServerList()
+//                toast(R.string.toast_success)
+//            } else {
+//                toast(R.string.toast_failure)
+//            }
+//            //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
+//        } catch (e: Exception) {
+//            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
+//            e.printStackTrace()
+//            return
+//        }
+//    }
+
    private fun setTestState(content: String?) {
        binding.tvTestState.text = content
    }
@@ -730,35 +792,20 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
    override fun onNavigationItemSelected(item: MenuItem): Boolean {
        // Handle navigation view item clicks here.
        when (item.itemId) {
-            R.id.sub_setting -> {
-                requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
-            }
+            R.id.sub_setting -> requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
+            R.id.settings -> startActivity(
+                Intent(this, SettingsActivity::class.java)
+                    .putExtra("isRunning", mainViewModel.isRunning.value == true)
+            )

-            R.id.settings -> {
-                startActivity(
-                    Intent(this, SettingsActivity::class.java)
-                        .putExtra("isRunning", mainViewModel.isRunning.value == true)
-                )
-            }
-
-            R.id.routing_setting -> {
-                requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
-            }
-
-
-            R.id.promotion -> {
-                Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
-            }
-
-            R.id.logcat -> {
-                startActivity(Intent(this, LogcatActivity::class.java))
-            }
-
-            R.id.about -> {
-                startActivity(Intent(this, AboutActivity::class.java))
-            }
+            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
+            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
+            R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
+            R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
+            R.id.about -> startActivity(Intent(this, AboutActivity::class.java))
        }
+
        binding.drawerLayout.closeDrawer(GravityCompat.START)
        return true
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.AngApplication.Companion.application
 import com.v2ray.ang.AppConfig
@@ -23,9 +24,8 @@ import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.Utils
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch

 class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
    companion object {
@@ -69,7 +69,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
            } else {
                holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
            }
-            holder.itemMainBinding.tvSubscription.text = MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks ?: ""
+            holder.itemMainBinding.tvSubscription.text =
+                if (mActivity.mainViewModel.subscriptionId.isEmpty())
+                    MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks.orEmpty()
+                else
+                    ""

            var shareOptions = share_method.asList()
            when (profile.configType) {
@@ -83,7 +87,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                }
            }

-            // 隐藏主页服务器地址为xxx:xxx:***/xxx.xxx.xxx.***
+            // Hide xxx:xxx:***/xxx.xxx.xxx.***
            val strState = "${
                profile.server?.let {
                    if (it.contains(":"))
@@ -143,7 +147,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                            .setPositiveButton(android.R.string.ok) { _, _ ->
                                removeServer(guid, position)
                            }
-                            .setNegativeButton(android.R.string.no) { _, _ ->
+                            .setNegativeButton(android.R.string.cancel) { _, _ ->
                                //do noting
                            }
                            .show()
@@ -164,18 +168,20 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
                    }
                    notifyItemChanged(mActivity.mainViewModel.getPosition(guid))
                    if (isRunning) {
-                        Utils.stopVService(mActivity)
-                        Observable.timer(500, TimeUnit.MILLISECONDS)
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe {
-                                V2RayServiceManager.startV2Ray(mActivity)
+                        V2RayServiceManager.stopVService(mActivity)
+                        mActivity.lifecycleScope.launch {
+                            try {
+                                delay(500)
+                                V2RayServiceManager.startVService(mActivity)
+                            } catch (e: Exception) {
+                                e.printStackTrace()
                            }
+                        }
                    }
                }
            }
        }
        if (holder is FooterViewHolder) {
-            //if (activity?.defaultDPreference?.getPrefBoolean(AppConfig.PREF_INAPP_BUY_IS_PREMIUM, false)) {
            if (true) {
                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
            } else {
@@ -246,4 +252,4 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai

    override fun onItemDismiss(position: Int) {
    }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyActivity.kt
@@ -5,11 +5,8 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
@@ -18,12 +15,13 @@ import com.v2ray.ang.dto.AppInfo
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.AppManagerUtil
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.text.Collator

 class PerAppProxyActivity : BaseActivity() {
@@ -38,98 +36,43 @@ class PerAppProxyActivity : BaseActivity() {
        super.onCreate(savedInstanceState)
        setContentView(binding.root)

-        val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
-        binding.recyclerView.addItemDecoration(dividerItemDecoration)
+        title = getString(R.string.per_app_proxy_settings)

-        val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)

-        AppManagerUtil.rxLoadNetworkAppList(this)
-            .subscribeOn(Schedulers.io())
-            .map {
-                if (blacklist != null) {
-                    it.forEach { one ->
-                        if (blacklist.contains(one.packageName)) {
-                            one.isSelected = 1
-                        } else {
-                            one.isSelected = 0
+        lifecycleScope.launch {
+            try {
+                binding.pbWaiting.show()
+                val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+                val apps = withContext(Dispatchers.IO) {
+                    val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity)
+
+                    if (blacklist != null) {
+                        appsList.forEach { app ->
+                            app.isSelected = if (blacklist.contains(app.packageName)) 1 else 0
                        }
-                    }
-                    val comparator = Comparator<AppInfo> { p1, p2 ->
-                        when {
-                            p1.isSelected > p2.isSelected -> -1
-                            p1.isSelected == p2.isSelected -> 0
-                            else -> 1
-                        }
-                    }
-                    it.sortedWith(comparator)
-                } else {
-                    val comparator = object : Comparator<AppInfo> {
+                        appsList.sortedWith(Comparator { p1, p2 ->
+                            when {
+                                p1.isSelected > p2.isSelected -> -1
+                                p1.isSelected == p2.isSelected -> 0
+                                else -> 1
+                            }
+                        })
+                    } else {
                        val collator = Collator.getInstance()
-                        override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
+                        appsList.sortedWith(compareBy(collator) { it.appName })
                    }
-                    it.sortedWith(comparator)
                }
-            }
-//                .map {
-//                    val comparator = object : Comparator<AppInfo> {
-//                        val collator = Collator.getInstance()
-//                        override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
-//                    }
-//                    it.sortedWith(comparator)
-//                }
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe {
-                appsAll = it
-                adapter = PerAppProxyAdapter(this, it, blacklist)
+
+                appsAll = apps
+                adapter = PerAppProxyAdapter(this@PerAppProxyActivity, apps, blacklist)
                binding.recyclerView.adapter = adapter
-                binding.pbWaiting.visibility = View.GONE
+                binding.pbWaiting.hide()
+            } catch (e: Exception) {
+                binding.pbWaiting.hide()
+                Log.e(ANG_PACKAGE, "Error loading apps", e)
            }
-        /***
-        recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-        var dst = 0
-        val threshold = resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 2
-        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-        dst += dy
-        if (dst > threshold) {
-        header_view.hide()
-        dst = 0
-        } else if (dst < -20) {
-        header_view.show()
-        dst = 0
        }
-        }
-
-        var hiding = false
-        fun View.hide() {
-        val target = -height.toFloat()
-        if (hiding || translationY == target) return
-        animate()
-        .translationY(target)
-        .setInterpolator(AccelerateInterpolator(2F))
-        .setListener(object : AnimatorListenerAdapter() {
-        override fun onAnimationEnd(animation: Animator?) {
-        hiding = false
-        }
-        })
-        hiding = true
-        }
-
-        var showing = false
-        fun View.show() {
-        val target = 0f
-        if (showing || translationY == target) return
-        animate()
-        .translationY(target)
-        .setInterpolator(DecelerateInterpolator(2F))
-        .setListener(object : AnimatorListenerAdapter() {
-        override fun onAnimationEnd(animation: Animator?) {
-        showing = false
-        }
-        })
-        showing = true
-        }
-        })
-         ***/

        binding.switchPerAppProxy.setOnCheckedChangeListener { _, isChecked ->
            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY, isChecked)
@@ -140,36 +83,6 @@ class PerAppProxyActivity : BaseActivity() {
            MmkvManager.encodeSettings(AppConfig.PREF_BYPASS_APPS, isChecked)
        }
        binding.switchBypassApps.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS, false)
-
-        /***
-        et_search.setOnEditorActionListener { v, actionId, event ->
-        if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-        //hide
-        var imm: InputMethodManager = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.toggleSoftInput(0, InputMethodManager.HIDE_NOT_ALWAYS)
-
-        val key = v.text.toString().toUpperCase()
-        val apps = ArrayList<AppInfo>()
-        if (TextUtils.isEmpty(key)) {
-        appsAll?.forEach {
-        apps.add(it)
-        }
-        } else {
-        appsAll?.forEach {
-        if (it.appName.toUpperCase().indexOf(key) >= 0) {
-        apps.add(it)
-        }
-        }
-        }
-        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
-        recycler_view.adapter = adapter
-        adapter?.notifyDataSetChanged()
-        true
-        } else {
-        false
-        }
-        }
-         ***/
    }

    override fun onPause() {
@@ -237,13 +150,20 @@ class PerAppProxyActivity : BaseActivity() {

    private fun selectProxyApp() {
        toast(R.string.msg_downloading_content)
+        binding.pbWaiting.show()
+
        val url = AppConfig.androidpackagenamelistUrl
        lifecycleScope.launch(Dispatchers.IO) {
-            val content = Utils.getUrlContext(url, 5000)
+            var content = HttpUtil.getUrlContent(url, 5000)
+            if (content.isNullOrEmpty()) {
+                val httpPort = SettingsManager.getHttpPort()
+                content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: ""
+            }
            launch(Dispatchers.Main) {
                Log.d(ANG_PACKAGE, content)
                selectProxyApp(content, true)
                toast(R.string.toast_success)
+                binding.pbWaiting.hide()
            }
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemRecyclerBypassListBinding
 import com.v2ray.ang.dto.AppInfo

@@ -35,7 +34,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
                val view = View(ctx)
                view.layoutParams = ViewGroup.LayoutParams(
                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ctx.resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 0
+                    0
                )
                BaseViewHolder(view)
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt
@@ -37,7 +37,7 @@ class RoutingEditActivity : BaseActivity() {

    private fun bindingServer(rulesetItem: RulesetItem): Boolean {
        binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
-        binding.chkLocked.isChecked = rulesetItem.looked == true
+        binding.chkLocked.isChecked = rulesetItem.locked == true
        binding.etDomain.text = Utils.getEditable(rulesetItem.domain?.joinToString(","))
        binding.etIp.text = Utils.getEditable(rulesetItem.ip?.joinToString(","))
        binding.etPort.text = Utils.getEditable(rulesetItem.port)
@@ -60,7 +60,7 @@ class RoutingEditActivity : BaseActivity() {

        rulesetItem.apply {
            remarks = binding.etRemarks.text.toString()
-            looked = binding.chkLocked.isChecked
+            locked = binding.chkLocked.isChecked
            domain = binding.etDomain.text.toString().takeIf { it.isNotEmpty() }
                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
            ip = binding.etIp.text.toString().takeIf { it.isNotEmpty() }
@@ -95,7 +95,7 @@ class RoutingEditActivity : BaseActivity() {
                        }
                    }
                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                    // do nothing
                }
                .show()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
@@ -40,6 +39,16 @@ class RoutingSettingActivity : BaseActivity() {
        resources.getStringArray(R.array.preset_rulesets)
    }

+    private val requestCameraPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
+        } else {
+            toast(R.string.toast_permission_denied)
+        }
+    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(binding.root)
@@ -48,6 +57,7 @@ class RoutingSettingActivity : BaseActivity() {

        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
        binding.recyclerView.adapter = adapter

        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
@@ -75,97 +85,75 @@ class RoutingSettingActivity : BaseActivity() {
        return super.onCreateOptionsMenu(menu)
    }

-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.add_rule -> {
-            startActivity(Intent(this, RoutingEditActivity::class.java))
-            true
-        }
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
+        R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java)).let { true }
+        R.id.import_predefined_rulesets -> importPredefined().let { true }
+        R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
+        R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true }
+        R.id.export_rulesets_to_clipboard -> export2Clipboard().let { true }
+        else -> super.onOptionsItemSelected(item)
+    }

-        R.id.user_asset_setting -> {
-            startActivity(Intent(this, UserAssetActivity::class.java))
-            true
-        }
-
-        R.id.import_predefined_rulesets -> {
+    private fun importPredefined() {
+        AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
-                        try {
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
-                                launch(Dispatchers.Main) {
-                                    refreshData()
-                                    toast(R.string.toast_success)
-                                }
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }.show()
-
-
-                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
-                }
-                .show()
-            true
-        }
-
-        R.id.import_rulesets_from_clipboard -> {
-            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    val clipboard = try {
-                        Utils.getClipboard(this)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                        toast(R.string.toast_failure)
-                        return@setPositiveButton
-                    }
-                    lifecycleScope.launch(Dispatchers.IO) {
-                        val result = SettingsManager.resetRoutingRulesets(clipboard)
-                        withContext(Dispatchers.Main) {
-                            if (result) {
+                    try {
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
+                            launch(Dispatchers.Main) {
                                refreshData()
                                toast(R.string.toast_success)
-                            } else {
-                                toast(R.string.toast_failure)
                            }
                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
                    }
                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                    //do nothing
                }
                .show()
-            true
-        }
+        }.show()
+    }

-        R.id.import_rulesets_from_qrcode -> {
-            RxPermissions(this)
-                .request(Manifest.permission.CAMERA)
-                .subscribe {
-                    if (it)
-                        scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-                    else
-                        toast(R.string.toast_permission_denied)
+    private fun importFromClipboard() {
+        AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                val clipboard = try {
+                    Utils.getClipboard(this)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    toast(R.string.toast_failure)
+                    return@setPositiveButton
+                }
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val result = SettingsManager.resetRoutingRulesets(clipboard)
+                    withContext(Dispatchers.Main) {
+                        if (result) {
+                            refreshData()
+                            toast(R.string.toast_success)
+                        } else {
+                            toast(R.string.toast_failure)
+                        }
+                    }
                }
-            true
-        }
-
-
-        R.id.export_rulesets_to_clipboard -> {
-            val rulesetList = MmkvManager.decodeRoutingRulesets()
-            if (rulesetList.isNullOrEmpty()) {
-                toast(R.string.toast_failure)
-            } else {
-                Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
-                toast(R.string.toast_success)
            }
-            true
-        }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                //do nothing
+            }
+            .show()
+    }

-        else -> super.onOptionsItemSelected(item)
+    private fun export2Clipboard() {
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
+        if (rulesetList.isNullOrEmpty()) {
+            toast(R.string.toast_failure)
+        } else {
+            Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
+            toast(R.string.toast_success)
+        }
    }

    private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -189,7 +177,7 @@ class RoutingSettingActivity : BaseActivity() {
                    }
                }
            }
-            .setNegativeButton(android.R.string.no) { _, _ ->
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
                //do nothing
            }
            .show()
@@ -201,5 +189,4 @@ class RoutingSettingActivity : BaseActivity() {
        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
        adapter.notifyDataSetChanged()
    }
-
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingRecyclerAdapter.kt
@@ -25,7 +25,7 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy
        holder.itemRoutingSettingBinding.domainIp.text = (ruleset.domain ?: ruleset.ip ?: ruleset.port)?.toString()
        holder.itemRoutingSettingBinding.outboundTag.text = ruleset.outboundTag
        holder.itemRoutingSettingBinding.chkEnable.isChecked = ruleset.enabled
-        holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.looked == true
+        holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.locked == true
        holder.itemView.setBackgroundColor(Color.TRANSPARENT)

        holder.itemRoutingSettingBinding.layoutEdit.setOnClickListener {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt
@@ -4,13 +4,23 @@ import android.Manifest
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
-import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.AngConfigManager

 class ScScannerActivity : BaseActivity() {

+    private val requestCameraPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            scanQRCode.launch(Intent(this, ScannerActivity::class.java))
+        } else {
+            toast(R.string.toast_permission_denied)
+            finish()
+        }
+    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_none)
@@ -18,19 +28,10 @@ class ScScannerActivity : BaseActivity() {
    }

    fun importQRcode(): Boolean {
-        RxPermissions(this)
-            .request(Manifest.permission.CAMERA)
-            .subscribe { granted ->
-                if (granted) {
-                    scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-                } else {
-                    toast(R.string.toast_permission_denied)
-                }
-            }
+        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
        return true
    }

-
    private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        if (it.resultCode == RESULT_OK) {
            val scanResult = it.data?.getStringExtra("SCAN_RESULT").orEmpty()
@@ -46,5 +47,4 @@ class ScScannerActivity : BaseActivity() {
        }
        finish()
    }
-
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt
@@ -3,7 +3,6 @@ package com.v2ray.ang.ui
 import android.os.Bundle
 import com.v2ray.ang.R
 import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.Utils

 class ScSwitchActivity : BaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
@@ -12,10 +11,10 @@ class ScSwitchActivity : BaseActivity() {

        setContentView(R.layout.activity_none)

-        if (V2RayServiceManager.v2rayPoint.isRunning) {
-            Utils.stopVService(this)
+        if (V2RayServiceManager.isRunning()) {
+            V2RayServiceManager.stopVService(this)
        } else {
-            Utils.startVServiceFromToggle(this)
+            V2RayServiceManager.startVServiceFromToggle(this)
        }
        finish()
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt
@@ -2,13 +2,14 @@ package com.v2ray.ang.ui

 import android.Manifest
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
-import com.tbruyelle.rxpermissions3.RxPermissions
+import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
@@ -21,6 +22,37 @@ import io.github.g00fy2.quickie.config.ScannerConfig
 class ScannerActivity : BaseActivity() {

    private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
+    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val uri = it.data?.data
+        if (it.resultCode == RESULT_OK && uri != null) {
+            try {
+                val inputStream = contentResolver.openInputStream(uri)
+                val bitmap = BitmapFactory.decodeStream(inputStream)
+                inputStream?.close()
+
+                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
+                if (text.isNullOrEmpty()) {
+                    toast(R.string.toast_decoding_failed)
+                } else {
+                    finished(text)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                toast(R.string.toast_decoding_failed)
+            }
+        }
+    }
+
+    private val requestPermissionLauncher =
+        registerForActivityResult(
+            ActivityResultContracts.RequestPermission()
+        ) { isGranted: Boolean ->
+            if (isGranted) {
+                showFileChooser()
+            } else {
+                toast(R.string.toast_permission_denied)
+            }
+        }

    public override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -72,15 +104,12 @@ class ScannerActivity : BaseActivity() {
            } else {
                Manifest.permission.READ_EXTERNAL_STORAGE
            }
-            RxPermissions(this)
-                .request(permission)
-                .subscribe { granted ->
-                    if (granted) {
-                        showFileChooser()
-                    } else {
-                        toast(R.string.toast_permission_denied)
-                    }
-                }
+
+            if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+                showFileChooser()
+            } else {
+                requestPermissionLauncher.launch(permission)
+            }
            true
        }

@@ -100,26 +129,4 @@ class ScannerActivity : BaseActivity() {
            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 inputStream = contentResolver.openInputStream(uri)
-                val bitmap = BitmapFactory.decodeStream(inputStream)
-                inputStream?.close()
-
-                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                if (text.isNullOrEmpty()) {
-                    toast(R.string.toast_decoding_failed)
-                } else {
-                    finished(text)
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-                toast(R.string.toast_decoding_failed)
-            }
-        }
-    }
-
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt
@@ -126,6 +126,8 @@ class ServerActivity : BaseActivity() {
    private val et_port_hop: EditText? by lazy { findViewById(R.id.et_port_hop) }
    private val et_port_hop_interval: EditText? by lazy { findViewById(R.id.et_port_hop_interval) }
    private val et_pinsha256: EditText? by lazy { findViewById(R.id.et_pinsha256) }
+    private val et_bandwidth_down: EditText? by lazy { findViewById(R.id.et_bandwidth_down) }
+    private val et_bandwidth_up: EditText? by lazy { findViewById(R.id.et_bandwidth_up) }
    private val et_extra: EditText? by lazy { findViewById(R.id.et_extra) }
    private val layout_extra: LinearLayout? by lazy { findViewById(R.id.layout_extra) }

@@ -162,7 +164,7 @@ class ServerActivity : BaseActivity() {
                sp_header_type_title?.text =
                    when (networks[position]) {
                        NetworkType.GRPC.type -> getString(R.string.server_lab_mode_type)
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> getString(R.string.server_lab_xhttp_mode)
+                        NetworkType.XHTTP.type -> getString(R.string.server_lab_xhttp_mode)
                        else -> getString(R.string.server_lab_head_type)
                    }.orEmpty()
                sp_header_type?.setSelection(
@@ -170,7 +172,7 @@ class ServerActivity : BaseActivity() {
                        types,
                        when (networks[position]) {
                            NetworkType.GRPC.type -> config?.mode
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> config?.xhttpMode
+                            NetworkType.XHTTP.type -> config?.xhttpMode
                            else -> config?.headerType
                        }.orEmpty()
                    )
@@ -198,7 +200,7 @@ class ServerActivity : BaseActivity() {
                            NetworkType.TCP.type -> R.string.server_lab_request_host_http
                            NetworkType.WS.type -> R.string.server_lab_request_host_ws
                            NetworkType.HTTP_UPGRADE.type -> R.string.server_lab_request_host_httpupgrade
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> R.string.server_lab_request_host_xhttp
+                            NetworkType.XHTTP.type -> R.string.server_lab_request_host_xhttp
                            NetworkType.H2.type -> R.string.server_lab_request_host_h2
                            //"quic" -> R.string.server_lab_request_host_quic
                            NetworkType.GRPC.type -> R.string.server_lab_request_host_grpc
@@ -213,7 +215,7 @@ class ServerActivity : BaseActivity() {
                            NetworkType.KCP.type -> R.string.server_lab_path_kcp
                            NetworkType.WS.type -> R.string.server_lab_path_ws
                            NetworkType.HTTP_UPGRADE.type -> R.string.server_lab_path_httpupgrade
-                            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> R.string.server_lab_path_xhttp
+                            NetworkType.XHTTP.type -> R.string.server_lab_path_xhttp
                            NetworkType.H2.type -> R.string.server_lab_path_h2
                            //"quic" -> R.string.server_lab_path_quic
                            NetworkType.GRPC.type -> R.string.server_lab_path_grpc
@@ -223,14 +225,14 @@ class ServerActivity : BaseActivity() {
                )
                et_extra?.text = Utils.getEditable(
                    when (networks[position]) {
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> config?.xhttpExtra
+                        NetworkType.XHTTP.type -> config?.xhttpExtra
                        else -> null
                    }.orEmpty()
                )

                layout_extra?.visibility =
                    when (networks[position]) {
-                        NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> View.VISIBLE
+                        NetworkType.XHTTP.type -> View.VISIBLE
                        else -> View.GONE
                    }
            }
@@ -334,6 +336,8 @@ class ServerActivity : BaseActivity() {
            et_port_hop?.text = Utils.getEditable(config.portHopping)
            et_port_hop_interval?.text = Utils.getEditable(config.portHoppingInterval)
            et_pinsha256?.text = Utils.getEditable(config.pinSHA256)
+            et_bandwidth_down?.text = Utils.getEditable(config.bandwidthDown)
+            et_bandwidth_up?.text = Utils.getEditable(config.bandwidthUp)
        }
        val securityEncryptions =
            if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
@@ -352,11 +356,11 @@ class ServerActivity : BaseActivity() {
            et_sni?.text = Utils.getEditable(config.sni)
            config.fingerPrint?.let {
                val utlsIndex = Utils.arrayFind(uTlsItems, it)
-                sp_stream_fingerprint?.setSelection(utlsIndex)
+                utlsIndex.let { sp_stream_fingerprint?.setSelection(if (it >= 0) it else 0) }
            }
            config.alpn?.let {
                val alpnIndex = Utils.arrayFind(alpns, it)
-                sp_stream_alpn?.setSelection(alpnIndex)
+                alpnIndex.let { sp_stream_alpn?.setSelection(if (it >= 0) it else 0) }
            }
            if (config.security == TLS) {
                container_allow_insecure?.visibility = View.VISIBLE
@@ -513,6 +517,8 @@ class ServerActivity : BaseActivity() {
            config.portHopping = et_port_hop?.text?.toString()
            config.portHoppingInterval = et_port_hop_interval?.text?.toString()
            config.pinSHA256 = et_pinsha256?.text?.toString()
+            config.bandwidthDown = et_bandwidth_down?.text?.toString()
+            config.bandwidthUp = et_bandwidth_up?.text?.toString()
        }
    }

@@ -578,7 +584,7 @@ class ServerActivity : BaseActivity() {
                grpcModes
            }

-            NetworkType.SPLIT_HTTP.type, NetworkType.XHTTP.type -> {
+            NetworkType.XHTTP.type -> {
                xhttpMode
            }

@@ -600,7 +606,7 @@ class ServerActivity : BaseActivity() {
                            MmkvManager.removeServer(editGuid)
                            finish()
                        }
-                        .setNegativeButton(android.R.string.no) { _, _ ->
+                        .setNegativeButton(android.R.string.cancel) { _, _ ->
                            // do nothing
                        }
                        .show()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
@@ -106,7 +106,7 @@ class ServerCustomConfigActivity : BaseActivity() {
                    MmkvManager.removeServer(editGuid)
                    finish()
                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                    // do nothing
                }
                .show()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
@@ -40,8 +40,10 @@ class SettingsActivity : BaseActivity() {
        private val perAppProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_PER_APP_PROXY) }
        private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) }
        private val fakeDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_FAKE_DNS_ENABLED) }
+        private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
        private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
        private val vpnDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_DNS) }
+        private val vpnBypassLan by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_BYPASS_LAN) }

        private val mux by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_MUX_ENABLED) }
        private val muxConcurrency by lazy { findPreference<EditTextPreference>(AppConfig.PREF_MUX_CONCURRENCY) }
@@ -57,9 +59,9 @@ class SettingsActivity : BaseActivity() {
        private val autoUpdateInterval by lazy { findPreference<EditTextPreference>(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL) }

        private val socksPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_SOCKS_PORT) }
-        private val httpPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_HTTP_PORT) }
        private val remoteDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_REMOTE_DNS) }
        private val domesticDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DOMESTIC_DNS) }
+        private val dnsHosts by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DNS_HOSTS) }
        private val delayTestUrl by lazy { findPreference<EditTextPreference>(AppConfig.PREF_DELAY_TEST_URL) }
        private val mode by lazy { findPreference<ListPreference>(AppConfig.PREF_MODE) }

@@ -141,11 +143,7 @@ class SettingsActivity : BaseActivity() {
                socksPort?.summary = if (TextUtils.isEmpty(nval)) AppConfig.PORT_SOCKS else nval
                true
            }
-            httpPort?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                httpPort?.summary = if (TextUtils.isEmpty(nval)) AppConfig.PORT_HTTP else nval
-                true
-            }
+
            remoteDns?.setOnPreferenceChangeListener { _, any ->
                val nval = any as String
                remoteDns?.summary = if (nval == "") AppConfig.DNS_PROXY else nval
@@ -156,6 +154,11 @@ class SettingsActivity : BaseActivity() {
                domesticDns?.summary = if (nval == "") AppConfig.DNS_DIRECT else nval
                true
            }
+            dnsHosts?.setOnPreferenceChangeListener { _, any ->
+                val nval = any as String
+                dnsHosts?.summary = nval
+                true
+            }
            delayTestUrl?.setOnPreferenceChangeListener { _, any ->
                val nval = any as String
                delayTestUrl?.summary = if (nval == "") AppConfig.DelayTestUrl else nval
@@ -175,6 +178,7 @@ class SettingsActivity : BaseActivity() {
            updateMode(MmkvManager.decodeSettingsString(AppConfig.PREF_MODE, VPN))
            localDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
            fakeDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED, false)
+            appendHttpProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY, false)
            localDnsPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
            vpnDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)

@@ -195,9 +199,9 @@ class SettingsActivity : BaseActivity() {
            autoUpdateInterval?.isEnabled = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)

            socksPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
-            httpPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_HTTP_PORT, AppConfig.PORT_HTTP)
            remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
            domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
+            dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl)

            initSharedPreference()
@@ -213,7 +217,6 @@ class SettingsActivity : BaseActivity() {
                fragmentInterval,
                autoUpdateInterval,
                socksPort,
-                httpPort,
                remoteDns,
                domesticDns,
                delayTestUrl
@@ -244,6 +247,7 @@ class SettingsActivity : BaseActivity() {
            }

            listOf(
+                AppConfig.PREF_VPN_BYPASS_LAN,
                AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
                AppConfig.PREF_MUX_XUDP_QUIC,
                AppConfig.PREF_FRAGMENT_PACKETS,
@@ -264,8 +268,11 @@ class SettingsActivity : BaseActivity() {
            perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false)
            localDns?.isEnabled = vpn
            fakeDns?.isEnabled = vpn
+            appendHttpProxy?.isEnabled = vpn
            localDnsPort?.isEnabled = vpn
            vpnDns?.isEnabled = vpn
+            vpnBypassLan?.isEnabled = vpn
+            vpn
            if (vpn) {
                updateLocalDns(
                    MmkvManager.decodeSettingsBool(
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt
@@ -113,7 +113,7 @@ class SubEditActivity : BaseActivity() {
                        }
                    }
                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                    // do nothing
                }
                .show()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
@@ -4,13 +4,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
-import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.AngConfigManager
@@ -35,6 +33,7 @@ class SubSettingActivity : BaseActivity() {

        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
        binding.recyclerView.adapter = adapter

        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
@@ -58,10 +57,7 @@ class SubSettingActivity : BaseActivity() {
        }

        R.id.sub_update -> {
-            val dialog = AlertDialog.Builder(this)
-                .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-                .setCancelable(false)
-                .show()
+            binding.pbWaiting.show()

            lifecycleScope.launch(Dispatchers.IO) {
                val count = AngConfigManager.updateConfigViaSubAll()
@@ -72,7 +68,7 @@ class SubSettingActivity : BaseActivity() {
                    } else {
                        toast(R.string.toast_failure)
                    }
-                    dialog.dismiss()
+                    binding.pbWaiting.hide()
                }
            }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt
@@ -4,10 +4,14 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import androidx.lifecycle.lifecycleScope
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.AngConfigManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.net.URLDecoder

 class UrlSchemeActivity : BaseActivity() {
@@ -66,11 +70,15 @@ class UrlSchemeActivity : BaseActivity() {
                decodedUrl += "#${fragment}"
            }
            Log.d("UrlScheme-decodedUrl", decodedUrl)
-            val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
-            if (count + countSub > 0) {
-                toast(R.string.import_subscription_success)
-            } else {
-                toast(R.string.import_subscription_failure)
+            lifecycleScope.launch(Dispatchers.IO) {
+                val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
+                withContext(Dispatchers.Main) {
+                    if (count + countSub > 0) {
+                        toast(R.string.import_subscription_success)
+                    } else {
+                        toast(R.string.import_subscription_failure)
+                    }
+                }
            }
        }
    }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt
@@ -19,18 +19,16 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.ItemRecyclerUserAssetBinding
-import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.toTrafficString
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -38,9 +36,6 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
-import java.net.InetSocketAddress
-import java.net.Proxy
-import java.net.URL
 import java.text.DateFormat
 import java.util.Date

@@ -50,6 +45,38 @@ class UserAssetActivity : BaseActivity() {
    val extDir by lazy { File(Utils.userAssetPath(this)) }
    val builtInGeoFiles = arrayOf("geosite.dat", "geoip.dat")

+    private val requestStoragePermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            val intent = Intent(Intent.ACTION_GET_CONTENT)
+            intent.type = "*/*"
+            intent.addCategory(Intent.CATEGORY_OPENABLE)
+
+            try {
+                chooseFile.launch(
+                    Intent.createChooser(
+                        intent,
+                        getString(R.string.title_file_chooser)
+                    )
+                )
+            } catch (ex: android.content.ActivityNotFoundException) {
+                toast(R.string.toast_require_file_manager)
+            }
+        } else {
+            toast(R.string.toast_permission_denied)
+        }
+    }
+
+    private val requestCameraPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) {
+            scanQRCodeForAssetURL.launch(Intent(this, ScannerActivity::class.java))
+        } else {
+            toast(R.string.toast_permission_denied)
+        }
+    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -58,6 +85,7 @@ class UserAssetActivity : BaseActivity() {

        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = LinearLayoutManager(this)
+        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
        binding.recyclerView.adapter = UserAssetAdapter()
    }

@@ -86,27 +114,7 @@ class UserAssetActivity : BaseActivity() {
        } else {
            Manifest.permission.READ_EXTERNAL_STORAGE
        }
-        RxPermissions(this)
-            .request(permission)
-            .subscribe {
-                if (it) {
-                    val intent = Intent(Intent.ACTION_GET_CONTENT)
-                    intent.type = "*/*"
-                    intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-                    try {
-                        chooseFile.launch(
-                            Intent.createChooser(
-                                intent,
-                                getString(R.string.title_file_chooser)
-                            )
-                        )
-                    } catch (ex: android.content.ActivityNotFoundException) {
-                        toast(R.string.toast_require_file_manager)
-                    }
-                } else
-                    toast(R.string.toast_permission_denied)
-            }
+        requestStoragePermissionLauncher.launch(permission)
    }

    val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -158,14 +166,7 @@ class UserAssetActivity : BaseActivity() {
    }

    private fun importAssetFromQRcode(): Boolean {
-        RxPermissions(this)
-            .request(Manifest.permission.CAMERA)
-            .subscribe {
-                if (it)
-                    scanQRCodeForAssetURL.launch(Intent(this, ScannerActivity::class.java))
-                else
-                    toast(R.string.toast_permission_denied)
-            }
+        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
        return true
    }

@@ -182,8 +183,10 @@ class UserAssetActivity : BaseActivity() {
                return false
            }
            // Send URL to UserAssetUrlActivity for Processing
-            startActivity(Intent(this, UserAssetUrlActivity::class.java)
-                .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url))
+            startActivity(
+                Intent(this, UserAssetUrlActivity::class.java)
+                    .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url)
+            )
        } catch (e: Exception) {
            e.printStackTrace()
            return false
@@ -192,32 +195,31 @@ class UserAssetActivity : BaseActivity() {
    }

    private fun downloadGeoFiles() {
-        val dialog = AlertDialog.Builder(this)
-            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-            .setCancelable(false)
-            .show()
+        binding.pbWaiting.show()
        toast(R.string.msg_downloading_content)

        val httpPort = SettingsManager.getHttpPort()
        var assets = MmkvManager.decodeAssetUrls()
        assets = addBuiltInGeoItems(assets)

-        assets.forEach {
-            //toast(getString(R.string.msg_downloading_content) + it)
-            lifecycleScope.launch(Dispatchers.IO) {
-                var result = downloadGeo(it.second, 60000, httpPort)
+        var resultCount = 0
+        lifecycleScope.launch(Dispatchers.IO) {
+            assets.forEach {
+                var result = downloadGeo(it.second, 15000, httpPort)
                if (!result) {
-                    result = downloadGeo(it.second, 60000, 0)
+                    result = downloadGeo(it.second, 15000, 0)
                }
-                launch(Dispatchers.Main) {
-                    if (result) {
-                        toast(getString(R.string.toast_success) + " " + it.second.remarks)
-                        binding.recyclerView.adapter?.notifyDataSetChanged()
-                    } else {
-                        toast(getString(R.string.toast_failure) + " " + it.second.remarks)
-                    }
-                    dialog.dismiss()
+                if (result)
+                    resultCount++
+            }
+            withContext(Dispatchers.Main) {
+                if (resultCount > 0) {
+                    toast(getString(R.string.title_update_config_count, resultCount))
+                    binding.recyclerView.adapter?.notifyDataSetChanged()
+                } else {
+                    toast(getString(R.string.toast_failure))
                }
+                binding.pbWaiting.hide()
            }
        }
    }
@@ -225,22 +227,10 @@ class UserAssetActivity : BaseActivity() {
    private fun downloadGeo(item: AssetUrlItem, timeout: Int, httpPort: Int): Boolean {
        val targetTemp = File(extDir, item.remarks + "_temp")
        val target = File(extDir, item.remarks)
-        var conn: HttpURLConnection? = null
        //Log.d(AppConfig.ANG_PACKAGE, url)

+        val conn = HttpUtil.createProxyConnection(item.url, httpPort, timeout, timeout, needStream = true) ?: return false
        try {
-            conn = if (httpPort == 0) {
-                URL(item.url).openConnection() as HttpURLConnection
-            } else {
-                URL(item.url).openConnection(
-                    Proxy(
-                        Proxy.Type.HTTP,
-                        InetSocketAddress(LOOPBACK, httpPort)
-                    )
-                ) as HttpURLConnection
-            }
-            conn.connectTimeout = timeout
-            conn.readTimeout = timeout
            val inputStream = conn.inputStream
            val responseCode = conn.responseCode
            if (responseCode == HttpURLConnection.HTTP_OK) {
@@ -333,7 +323,7 @@ class UserAssetActivity : BaseActivity() {
                        MmkvManager.removeAssetUrl(item.first)
                        initAssets()
                    }
-                    .setNegativeButton(android.R.string.no) { _, _ ->
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
                        //do noting
                    }
                    .show()
@@ -349,4 +339,4 @@ class UserAssetActivity : BaseActivity() {

    class UserAssetViewHolder(val itemUserAssetBinding: ItemRecyclerUserAssetBinding) :
        RecyclerView.ViewHolder(itemUserAssetBinding.root)
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt
@@ -116,7 +116,7 @@ class UserAssetUrlActivity : BaseActivity() {
                    MmkvManager.removeAssetUrl(editAssetId)
                    finish()
                }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                    // do nothing
                }
                .show()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt
@@ -4,36 +4,33 @@ import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import com.v2ray.ang.dto.AppInfo
-import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext

 object AppManagerUtil {
-    private fun loadNetworkAppList(ctx: Context): ArrayList<AppInfo> {
-        val packageManager = ctx.packageManager
-        val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)
-        val apps = ArrayList<AppInfo>()
+    /**
+     * Load the list of network applications.
+     *
+     * @param context The context to use.
+     * @return A list of AppInfo objects representing the network applications.
+     */
+    suspend fun loadNetworkAppList(context: Context): ArrayList<AppInfo> =
+        withContext(Dispatchers.IO) {
+            val packageManager = context.packageManager
+            val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)
+            val apps = ArrayList<AppInfo>()

-        for (pkg in packages) {
-            val applicationInfo = pkg.applicationInfo ?: continue
+            for (pkg in packages) {
+                val applicationInfo = pkg.applicationInfo ?: continue

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

-            val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
-            apps.add(appInfo)
+                val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
+                apps.add(appInfo)
+            }
+
+            return@withContext apps
        }
-
-        return apps
-    }
-
-    fun rxLoadNetworkAppList(ctx: Context): Observable<ArrayList<AppInfo>> =
-        Observable.unsafeCreate {
-            it.onNext(loadNetworkAppList(ctx))
-        }
-
-//    val PackageInfo.hasInternetPermission: Boolean
-//        get() {
-//            val permissions = requestedPermissions
-//            return permissions?.any { it == Manifest.permission.INTERNET } ?: false
-//        }
-}
+}
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
@@ -0,0 +1,147 @@
+package com.v2ray.ang.util
+
+import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.util.Utils.encode
+import com.v2ray.ang.util.Utils.urlDecode
+import java.io.IOException
+import java.net.*
+import java.util.*
+
+object HttpUtil {
+
+    /**
+     * Converts a URL string to its ASCII representation.
+     *
+     * @param str The URL string to convert.
+     * @return The ASCII representation of the URL.
+     */
+    fun idnToASCII(str: String): String {
+        val url = URL(str)
+        return URL(url.protocol, IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED), url.port, url.file).toExternalForm()
+    }
+
+    /**
+     * Retrieves the content of a URL as a string.
+     *
+     * @param url The URL to fetch content from.
+     * @param timeout The timeout value in milliseconds.
+     * @param httpPort The HTTP port to use.
+     * @return The content of the URL as a string.
+     */
+    fun getUrlContent(url: String, timeout: Int, httpPort: Int = 0): String? {
+        val conn = createProxyConnection(url, httpPort, timeout, timeout) ?: return null
+        try {
+            return conn.inputStream.bufferedReader().readText()
+        } catch (_: Exception) {
+        } finally {
+            conn.disconnect()
+        }
+        return null
+    }
+
+    /**
+     * Retrieves the content of a URL as a string with a custom User-Agent header.
+     *
+     * @param url The URL to fetch content from.
+     * @param timeout The timeout value in milliseconds.
+     * @param httpPort The HTTP port to use.
+     * @return The content of the URL as a string.
+     * @throws IOException If an I/O error occurs.
+     */
+    @Throws(IOException::class)
+    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 15000, httpPort: Int = 0): String {
+        var currentUrl = url
+        var redirects = 0
+        val maxRedirects = 3
+
+        while (redirects++ < maxRedirects) {
+            if (currentUrl == null) continue
+            val conn = createProxyConnection(currentUrl, httpPort, timeout, timeout) ?: continue
+            conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
+            conn.connect()
+
+            val responseCode = conn.responseCode
+            when (responseCode) {
+                in 300..399 -> {
+                    val location = conn.getHeaderField("Location")
+                    conn.disconnect()
+                    if (location.isNullOrEmpty()) {
+                        throw IOException("Redirect location not found")
+                    }
+                    currentUrl = location
+                    continue
+                }
+
+                else -> try {
+                    return conn.inputStream.use { it.bufferedReader().readText() }
+                } finally {
+                    conn.disconnect()
+                }
+            }
+        }
+        throw IOException("Too many redirects")
+    }
+
+    /**
+     * Creates an HttpURLConnection object connected through a proxy.
+     *
+     * @param urlStr The target URL address.
+     * @param port The port of the proxy server.
+     * @param connectTimeout The connection timeout in milliseconds (default is 15000 ms).
+     * @param readTimeout The read timeout in milliseconds (default is 15000 ms).
+     * @param needStream Whether the connection needs to support streaming.
+     * @return Returns a configured HttpURLConnection object, or null if it fails.
+     */
+    fun createProxyConnection(
+        urlStr: String,
+        port: Int,
+        connectTimeout: Int = 15000,
+        readTimeout: Int = 15000,
+        needStream: Boolean = false
+    ): HttpURLConnection? {
+
+        var conn: HttpURLConnection? = null
+        try {
+            val url = URL(urlStr)
+            // Create a connection
+            conn = if (port == 0) {
+                url.openConnection()
+            } else {
+                url.openConnection(
+                    Proxy(
+                        Proxy.Type.HTTP,
+                        InetSocketAddress(LOOPBACK, port)
+                    )
+                )
+            } as HttpURLConnection
+
+            // Set connection and read timeouts
+            conn.connectTimeout = connectTimeout
+            conn.readTimeout = readTimeout
+            if (!needStream) {
+                // Set request headers
+                conn.setRequestProperty("Connection", "close")
+                // Disable automatic redirects
+                conn.instanceFollowRedirects = false
+                // Disable caching
+                conn.useCaches = false
+            }
+
+            //Add Basic Authorization
+            url.userInfo?.let {
+                conn.setRequestProperty(
+                    "Authorization",
+                    "Basic ${encode(urlDecode(it))}"
+                )
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            // If an exception occurs, close the connection and return null
+            conn?.disconnect()
+            return null
+        }
+        return conn
+    }
+}
+
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt
@@ -13,14 +13,33 @@ import java.lang.reflect.Type
 object JsonUtil {
    private var gson = Gson()

+    /**
+     * Converts an object to its JSON representation.
+     *
+     * @param src The object to convert.
+     * @return The JSON representation of the object.
+     */
    fun toJson(src: Any?): String {
        return gson.toJson(src)
    }

+    /**
+     * Parses a JSON string into an object of the specified class.
+     *
+     * @param src The JSON string to parse.
+     * @param cls The class of the object to parse into.
+     * @return The parsed object.
+     */
    fun <T> fromJson(src: String, cls: Class<T>): T {
        return gson.fromJson(src, cls)
    }

+    /**
+     * Converts an object to its pretty-printed JSON representation.
+     *
+     * @param src The object to convert.
+     * @return The pretty-printed JSON representation of the object, or null if the object is null.
+     */
    fun toJsonPretty(src: Any?): String? {
        if (src == null)
            return null
@@ -39,6 +58,12 @@ object JsonUtil {
        return gsonPre.toJson(src)
    }

+    /**
+     * Parses a JSON string into a JsonObject.
+     *
+     * @param src The JSON string to parse.
+     * @return The parsed JsonObject, or null if parsing fails.
+     */
    fun parseString(src: String?): JsonObject? {
        if (src == null)
            return null
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt
@@ -7,17 +7,37 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.service.V2RayTestService
 import java.io.Serializable

-
 object MessageUtil {

+    /**
+     * Sends a message to the service.
+     *
+     * @param ctx The context.
+     * @param what The message identifier.
+     * @param content The message content.
+     */
    fun sendMsg2Service(ctx: Context, what: Int, content: Serializable) {
        sendMsg(ctx, AppConfig.BROADCAST_ACTION_SERVICE, what, content)
    }

+    /**
+     * Sends a message to the UI.
+     *
+     * @param ctx The context.
+     * @param what The message identifier.
+     * @param content The message content.
+     */
    fun sendMsg2UI(ctx: Context, what: Int, content: Serializable) {
        sendMsg(ctx, AppConfig.BROADCAST_ACTION_ACTIVITY, what, content)
    }

+    /**
+     * Sends a message to the test service.
+     *
+     * @param ctx The context.
+     * @param what The message identifier.
+     * @param content The message content.
+     */
    fun sendMsg2TestService(ctx: Context, what: Int, content: Serializable) {
        try {
            val intent = Intent()
@@ -30,6 +50,14 @@ object MessageUtil {
        }
    }

+    /**
+     * Sends a message with the specified action.
+     *
+     * @param ctx The context.
+     * @param action The action string.
+     * @param what The message identifier.
+     * @param content The message content.
+     */
    private fun sendMsg(ctx: Context, action: String, what: Int, content: Serializable) {
        try {
            val intent = Intent()
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt
@@ -11,12 +11,18 @@ import java.util.Locale

 open class MyContextWrapper(base: Context?) : ContextWrapper(base) {
    companion object {
+        /**
+         * Wraps the context with a new locale.
+         *
+         * @param context The original context.
+         * @param newLocale The new locale to set.
+         * @return A ContextWrapper with the new locale.
+         */
        @RequiresApi(Build.VERSION_CODES.N)
        fun wrap(context: Context, newLocale: Locale?): ContextWrapper {
            var mContext = context
            val res: Resources = mContext.resources
            val configuration: Configuration = res.configuration
-            //注意 Android 7.0 前后的不同处理方法
            mContext = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                configuration.setLocale(newLocale)
                val localeList = LocaleList(newLocale)
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt
@@ -7,21 +7,24 @@ import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.fmt.Hysteria2Fmt
+import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.service.ProcessService
 import java.io.File

 object PluginUtil {
-    //private const val HYSTERIA2 = "hysteria2-plugin"
    private const val HYSTERIA2 = "libhysteria2.so"
    private const val TAG = ANG_PACKAGE
    private val procService: ProcessService by lazy {
        ProcessService()
    }

-//    fun initPlugin(name: String): PluginManager.InitResult {
-//        return PluginManager.init(name)!!
-//    }
-
+    /**
+     * Run the plugin based on the provided configuration.
+     *
+     * @param context The context to use.
+     * @param config The profile configuration.
+     * @param domainPort The domain and port information.
+     */
    fun runPlugin(context: Context, config: ProfileItem?, domainPort: String?) {
        Log.d(TAG, "runPlugin")

@@ -33,10 +36,20 @@ object PluginUtil {
        }
    }

+    /**
+     * Stop the running plugin.
+     */
    fun stopPlugin() {
        stopHy2()
    }

+    /**
+     * Perform a real ping using Hysteria2.
+     *
+     * @param context The context to use.
+     * @param config The profile configuration.
+     * @return The ping delay in milliseconds, or -1 if it fails.
+     */
    fun realPingHy2(context: Context, config: ProfileItem?): Long {
        Log.d(TAG, "realPingHy2")
        val retFailure = -1L
@@ -49,7 +62,7 @@ object PluginUtil {
            val proc = ProcessService()
            proc.runProcess(context, cmd)
            Thread.sleep(1000L)
-            val delay = SpeedtestUtil.testConnection(context, socksPort)
+            val delay = SpeedtestManager.testConnection(context, socksPort)
            proc.stopProcess()

            return delay.first
@@ -57,6 +70,14 @@ object PluginUtil {
        return retFailure
    }

+    /**
+     * Generate the configuration file for Hysteria2.
+     *
+     * @param context The context to use.
+     * @param config The profile configuration.
+     * @param domainPort The domain and port information.
+     * @return The generated configuration file.
+     */
    private fun genConfigHy2(context: Context, config: ProfileItem, domainPort: String?): File? {
        Log.d(TAG, "runPlugin $HYSTERIA2")

@@ -74,10 +95,16 @@ object PluginUtil {
        return configFile
    }

+    /**
+     * Generate the command to run Hysteria2.
+     *
+     * @param context The context to use.
+     * @param configFile The configuration file.
+     * @return The command to run Hysteria2.
+     */
    private fun genCmdHy2(context: Context, configFile: File): MutableList<String> {
        return mutableListOf(
            File(context.applicationInfo.nativeLibraryDir, HYSTERIA2).absolutePath,
-            //initPlugin(HYSTERIA2).path,
            "--disable-update-check",
            "--config",
            configFile.absolutePath,
@@ -87,6 +114,9 @@ object PluginUtil {
        )
    }

+    /**
+     * Stop the Hysteria2 process.
+     */
    private fun stopHy2() {
        try {
            Log.d(TAG, "$HYSTERIA2 destroy")
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt
@@ -14,13 +14,17 @@ import com.google.zxing.qrcode.QRCodeWriter
 import java.util.EnumMap

 /**
- * 描述:解析二维码图片
+ * QR code decoder utility.
 */
 object QRCodeDecoder {
    val HINTS: MutableMap<DecodeHintType, Any?> = EnumMap(DecodeHintType::class.java)

    /**
-     * create qrcode using zxing
+     * Creates a QR code bitmap from the given text.
+     *
+     * @param text The text to encode in the QR code.
+     * @param size The size of the QR code bitmap.
+     * @return The generated QR code bitmap, or null if an error occurs.
     */
    fun createQRCode(text: String, size: Int = 800): Bitmap? {
        return runCatching {
@@ -35,22 +39,21 @@ object QRCodeDecoder {
        }.getOrNull()
    }

-
    /**
-     * 同步解析本地图片二维码。该方法是耗时操作，请在子线程中调用。
+     * Decodes a QR code from a local image file. This method is time-consuming and should be called in a background thread.
     *
-     * @param picturePath 要解析的二维码图片本地路径
-     * @return 返回二维码图片里的内容 或 null
+     * @param picturePath The local path of the image file to decode.
+     * @return The content of the QR code, or null if decoding fails.
     */
    fun syncDecodeQRCode(picturePath: String): String? {
        return syncDecodeQRCode(getDecodeAbleBitmap(picturePath))
    }

    /**
-     * 同步解析bitmap二维码。该方法是耗时操作，请在子线程中调用。
+     * Decodes a QR code from a bitmap. This method is time-consuming and should be called in a background thread.
     *
-     * @param bitmap 要解析的二维码图片
-     * @return 返回二维码图片里的内容 或 null
+     * @param bitmap The bitmap to decode.
+     * @return The content of the QR code, or null if decoding fails.
     */
    fun syncDecodeQRCode(bitmap: Bitmap?): String? {
        return bitmap?.let {
@@ -70,12 +73,11 @@ object QRCodeDecoder {
        }
    }

-
    /**
-     * 将本地图片文件转换成可解码二维码的 Bitmap。为了避免图片太大，这里对图片进行了压缩。感谢 https://github.com/devilsen 提的 PR
+     * Converts a local image file to a bitmap that can be decoded as a QR code. The image is compressed to avoid being too large.
     *
-     * @param picturePath 本地图片文件路径
-     * @return
+     * @param picturePath The local path of the image file.
+     * @return The decoded bitmap, or null if an error occurs.
     */
    private fun getDecodeAbleBitmap(picturePath: String): Bitmap? {
        return try {
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt
@@ -4,10 +4,8 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.content.res.Configuration.UI_MODE_NIGHT_MASK
 import android.content.res.Configuration.UI_MODE_NIGHT_NO
-import android.net.Uri
 import android.os.Build
 import android.os.LocaleList
 import android.provider.Settings
@@ -16,35 +14,36 @@ import android.util.Base64
 import android.util.Log
 import android.util.Patterns
 import android.webkit.URLUtil
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
-import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.dto.Language
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.service.V2RayServiceManager
 import java.io.IOException
-import java.net.*
-import java.util.*
+import java.net.ServerSocket
+import java.net.URLDecoder
+import java.net.URLEncoder
+import java.util.Locale
+import java.util.UUID

 object Utils {

    /**
-     * convert string to editalbe for kotlin
+     * Convert string to editable for Kotlin.
     *
-     * @param text
-     * @return
+     * @param text The string to convert.
+     * @return An Editable instance containing the text.
     */
    fun getEditable(text: String?): Editable {
        return Editable.Factory.getInstance().newEditable(text.orEmpty())
    }

    /**
-     * find value in array position
+     * Find the position of a value in an array.
+     *
+     * @param array The array to search.
+     * @param value The value to find.
+     * @return The index of the value in the array, or -1 if not found.
     */
    fun arrayFind(array: Array<out String>, value: String): Int {
        for (i in array.indices) {
@@ -56,19 +55,31 @@ object Utils {
    }

    /**
-     * parseInt
+     * Parse a string to an integer.
+     *
+     * @param str The string to parse.
+     * @return The parsed integer, or 0 if parsing fails.
     */
    fun parseInt(str: String): Int {
        return parseInt(str, 0)
    }

+    /**
+     * Parse a string to an integer with a default value.
+     *
+     * @param str The string to parse.
+     * @param default The default value if parsing fails.
+     * @return The parsed integer, or the default value if parsing fails.
+     */
    fun parseInt(str: String?, default: Int): Int {
        return str?.toIntOrNull() ?: default
    }

-
    /**
-     * get text from clipboard
+     * Get text from the clipboard.
+     *
+     * @param context The context to use.
+     * @return The text from the clipboard, or an empty string if an error occurs.
     */
    fun getClipboard(context: Context): String {
        return try {
@@ -81,7 +92,10 @@ object Utils {
    }

    /**
-     * set text to clipboard
+     * Set text to the clipboard.
+     *
+     * @param context The context to use.
+     * @param content The text to set to the clipboard.
     */
    fun setClipboard(context: Context, content: String) {
        try {
@@ -94,13 +108,21 @@ object Utils {
    }

    /**
-     * base64 decode
+     * Decode a base64 encoded string.
+     *
+     * @param text The base64 encoded string.
+     * @return The decoded string, or an empty string if decoding fails.
     */
    fun decode(text: String?): String {
        return tryDecodeBase64(text) ?: text?.trimEnd('=')?.let { tryDecodeBase64(it) }.orEmpty()
    }

-
+    /**
+     * Try to decode a base64 encoded string.
+     *
+     * @param text The base64 encoded string.
+     * @return The decoded string, or null if decoding fails.
+     */
    fun tryDecodeBase64(text: String?): String? {
        try {
            return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8)
@@ -116,7 +138,10 @@ object Utils {
    }

    /**
-     * base64 encode
+     * Encode a string to base64.
+     *
+     * @param text The string to encode.
+     * @return The base64 encoded string, or an empty string if encoding fails.
     */
    fun encode(text: String): String {
        return try {
@@ -128,39 +153,10 @@ object Utils {
    }

    /**
-     * get remote dns servers from preference
-     */
-    fun getRemoteDnsServers(): List<String> {
-        val remoteDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS) ?: AppConfig.DNS_PROXY
-        val ret = remoteDns.split(",").filter { isPureIpAddress(it) || isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_PROXY)
-        }
-        return ret
-    }
-
-    fun getVpnDnsServers(): List<String> {
-        val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
-        return vpnDns.split(",").filter { isPureIpAddress(it) }
-        // allow empty, in that case dns will use system default
-    }
-
-    /**
-     * get remote dns servers from preference
-     */
-    fun getDomesticDnsServers(): List<String> {
-        val domesticDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS) ?: AppConfig.DNS_DIRECT
-        val ret = domesticDns.split(",").filter { isPureIpAddress(it) || isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_DIRECT)
-        }
-        return ret
-    }
-
-    /**
-     * is ip address
+     * Check if a string is a valid IP address.
+     *
+     * @param value The string to check.
+     * @return True if the string is a valid IP address, false otherwise.
     */
    fun isIpAddress(value: String?): Boolean {
        try {
@@ -204,17 +200,35 @@ object Utils {
        }
    }

+    /**
+     * Check if a string is a pure IP address (IPv4 or IPv6).
+     *
+     * @param value The string to check.
+     * @return True if the string is a pure IP address, false otherwise.
+     */
    fun isPureIpAddress(value: String): Boolean {
        return isIpv4Address(value) || isIpv6Address(value)
    }

-    fun isIpv4Address(value: String): Boolean {
+    /**
+     * Check if a string is a valid IPv4 address.
+     *
+     * @param value The string to check.
+     * @return True if the string is a valid IPv4 address, false otherwise.
+     */
+    private fun isIpv4Address(value: String): Boolean {
        val regV4 =
            Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
        return regV4.matches(value)
    }

-    fun isIpv6Address(value: String): Boolean {
+    /**
+     * Check if a string is a valid IPv6 address.
+     *
+     * @param value The string to check.
+     * @return True if the string is a valid IPv6 address, false otherwise.
+     */
+    private fun isIpv6Address(value: String): Boolean {
        var addr = value
        if (addr.indexOf("[") == 0 && addr.lastIndexOf("]") > 0) {
            addr = addr.drop(1)
@@ -225,12 +239,24 @@ object Utils {
        return regV6.matches(addr)
    }

-    private fun isCoreDNSAddress(s: String): Boolean {
-        return s.startsWith("https") || s.startsWith("tcp") || s.startsWith("quic") || s == "localhost"
+    /**
+     * Check if a string is a CoreDNS address.
+     *
+     * @param s The string to check.
+     * @return True if the string is a CoreDNS address, false otherwise.
+     */
+    fun isCoreDNSAddress(s: String): Boolean {
+        return s.startsWith("https")
+                || s.startsWith("tcp")
+                || s.startsWith("quic")
+                || s == "localhost"
    }

    /**
-     * is valid url
+     * Check if a string is a valid URL.
+     *
+     * @param value The string to check.
+     * @return True if the string is a valid URL, false otherwise.
     */
    fun isValidUrl(value: String?): Boolean {
        try {
@@ -250,30 +276,21 @@ object Utils {
        return false
    }

-    fun startVServiceFromToggle(context: Context): Boolean {
-        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
-            context.toast(R.string.app_tile_first_use)
-            return false
-        }
-        V2RayServiceManager.startV2Ray(context)
-        return true
-    }
-
    /**
-     * stopVService
+     * Open a URI in a browser.
+     *
+     * @param context The context to use.
+     * @param uriString The URI string to open.
     */
-    fun stopVService(context: Context) {
-        context.toast(R.string.toast_services_stop)
-        MessageUtil.sendMsg2Service(context, AppConfig.MSG_STATE_STOP, "")
-    }
-
    fun openUri(context: Context, uriString: String) {
-        val uri = Uri.parse(uriString)
+        val uri = uriString.toUri()
        context.startActivity(Intent(Intent.ACTION_VIEW, uri))
    }

    /**
-     * uuid
+     * Generate a UUID.
+     *
+     * @return A UUID string without dashes.
     */
    fun getUuid(): String {
        return try {
@@ -284,6 +301,12 @@ object Utils {
        }
    }

+    /**
+     * Decode a URL-encoded string.
+     *
+     * @param url The URL-encoded string.
+     * @return The decoded string, or the original string if decoding fails.
+     */
    fun urlDecode(url: String): String {
        return try {
            URLDecoder.decode(url, Charsets.UTF_8.toString())
@@ -293,6 +316,12 @@ object Utils {
        }
    }

+    /**
+     * Encode a string to URL-encoded format.
+     *
+     * @param url The string to encode.
+     * @return The URL-encoded string, or the original string if encoding fails.
+     */
    fun urlEncode(url: String): String {
        return try {
            URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20")
@@ -302,9 +331,12 @@ object Utils {
        }
    }

-
    /**
-     * readTextFromAssets
+     * Read text from an asset file.
+     *
+     * @param context The context to use.
+     * @param fileName The name of the asset file.
+     * @return The content of the asset file as a string.
     */
    fun readTextFromAssets(context: Context?, fileName: String): String {
        if (context == null) {
@@ -316,6 +348,12 @@ object Utils {
        return content
    }

+    /**
+     * Get the path to the user asset directory.
+     *
+     * @param context The context to use.
+     * @return The path to the user asset directory.
+     */
    fun userAssetPath(context: Context?): String {
        if (context == null)
            return ""
@@ -324,6 +362,12 @@ object Utils {
        return extDir.absolutePath
    }

+    /**
+     * Get the path to the backup directory.
+     *
+     * @param context The context to use.
+     * @return The path to the backup directory.
+     */
    fun backupPath(context: Context?): String {
        if (context == null)
            return ""
@@ -332,78 +376,32 @@ object Utils {
        return extDir.absolutePath
    }

+    /**
+     * Get the device ID for XUDP base key.
+     *
+     * @return The device ID for XUDP base key.
+     */
    fun getDeviceIdForXUDPBaseKey(): String {
        val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
        return Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
    }

-    fun getUrlContext(url: String, timeout: Int): String {
-        var result: String
-        var conn: HttpURLConnection? = null
-
-        try {
-            conn = URL(url).openConnection() as HttpURLConnection
-            conn.connectTimeout = timeout
-            conn.readTimeout = timeout
-            conn.setRequestProperty("Connection", "close")
-            conn.instanceFollowRedirects = false
-            conn.useCaches = false
-            //val code = conn.responseCode
-            result = conn.inputStream.bufferedReader().readText()
-        } catch (e: Exception) {
-            result = ""
-        } finally {
-            conn?.disconnect()
-        }
-        return result
-    }
-
-    @Throws(IOException::class)
-    fun getUrlContentWithCustomUserAgent(
-        urlStr: String?,
-        timeout: Int = 30000,
-        httpPort: Int = 0
-    ): String {
-        val url = URL(urlStr)
-        val conn = if (httpPort == 0) {
-            url.openConnection()
-        } else {
-            url.openConnection(
-                Proxy(
-                    Proxy.Type.HTTP,
-                    InetSocketAddress(LOOPBACK, httpPort)
-                )
-            )
-        }
-        conn.connectTimeout = timeout
-        conn.readTimeout = timeout
-        conn.setRequestProperty("Connection", "close")
-        conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
-        url.userInfo?.let {
-            conn.setRequestProperty(
-                "Authorization",
-                "Basic ${encode(urlDecode(it))}"
-            )
-        }
-        conn.useCaches = false
-        return conn.inputStream.use {
-            it.bufferedReader().readText()
-        }
-    }
-
+    /**
+     * Get the dark mode status.
+     *
+     * @param context The context to use.
+     * @return True if dark mode is enabled, false otherwise.
+     */
    fun getDarkModeStatus(context: Context): Boolean {
        return context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK != UI_MODE_NIGHT_NO
    }

-
-    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)
-        }
-    }
-
+    /**
+     * Get the IPv6 address in a formatted string.
+     *
+     * @param address The IPv6 address.
+     * @return The formatted IPv6 address, or the original address if not valid.
+     */
    fun getIpv6Address(address: String?): String {
        if (address == null) {
            return ""
@@ -415,59 +413,36 @@ object Utils {
        }
    }

-    fun getLocale(): Locale {
-        val langCode =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_LANGUAGE) ?: Language.AUTO.code
-        val language = Language.fromCode(langCode)
-
-        return when (language) {
-            Language.AUTO -> getSysLocale()
-            Language.ENGLISH -> Locale.ENGLISH
-            Language.CHINA -> Locale.CHINA
-            Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
-            Language.VIETNAMESE -> Locale("vi")
-            Language.RUSSIAN -> Locale("ru")
-            Language.PERSIAN -> Locale("fa")
-            Language.BANGLA -> Locale("bn")
-            Language.BAKHTIARI -> Locale("bqi", "IR")
-        }
-    }
-
-
-    private fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    /**
+     * Get the system locale.
+     *
+     * @return The system locale.
+     */
+    fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
        LocaleList.getDefault()[0]
    } else {
        Locale.getDefault()
    }

+    /**
+     * Fix illegal characters in a URL.
+     *
+     * @param str The URL string.
+     * @return The URL string with illegal characters replaced.
+     */
    fun fixIllegalUrl(str: String): String {
        return str
            .replace(" ", "%20")
            .replace("|", "%7C")
    }

-    fun removeWhiteSpace(str: String?): String? {
-        return str?.replace(" ", "")
-    }
-
-    fun idnToASCII(str: String): String {
-        val url = URL(str)
-        return URL(url.protocol, IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED), url.port, url.file)
-            .toExternalForm()
-    }
-
-    fun isTv(context: Context): Boolean =
-        context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-
-    fun getDelayTestUrl(second: Boolean = false): String {
-        return if (second) {
-            AppConfig.DelayTestUrl2
-        } else {
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
-                ?: AppConfig.DelayTestUrl
-        }
-    }
-
+    /**
+     * Find a free port from a list of ports.
+     *
+     * @param ports The list of ports to check.
+     * @return The first free port found.
+     * @throws IOException If no free port is found.
+     */
    fun findFreePort(ports: List<Int>): Int {
        for (port in ports) {
            try {
@@ -481,6 +456,12 @@ object Utils {
        throw IOException("no free port found")
    }

+    /**
+     * Check if a string is a valid subscription URL.
+     *
+     * @param value The string to check.
+     * @return True if the string is a valid subscription URL, false otherwise.
+     */
    fun isValidSubUrl(value: String?): Boolean {
        try {
            if (value.isNullOrEmpty()) return false
@@ -492,11 +473,23 @@ object Utils {
        return false
    }

+    /**
+     * Get the receiver flags based on the Android version.
+     *
+     * @return The receiver flags.
+     */
    fun receiverFlags(): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
        ContextCompat.RECEIVER_EXPORTED
    } else {
        ContextCompat.RECEIVER_NOT_EXPORTED
    }

+    /**
+     * Check if the package is Xray.
+     *
+     * @return True if the package is Xray, false otherwise.
+     */
+    fun isXray(): Boolean = (ANG_PACKAGE.startsWith("com.v2ray.ang"))
+
 }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt
@@ -13,6 +13,14 @@ import java.util.zip.ZipOutputStream
 object ZipUtil {
    private const val BUFFER_SIZE = 4096

+    /**
+     * Zip the contents of a folder.
+     *
+     * @param folderPath The path to the folder to zip.
+     * @param outputZipFilePath The path to the output zip file.
+     * @return True if the operation is successful, false otherwise.
+     * @throws IOException If an I/O error occurs.
+     */
    @Throws(IOException::class)
    fun zipFromFolder(folderPath: String, outputZipFilePath: String): Boolean {
        val buffer = ByteArray(BUFFER_SIZE)
@@ -59,6 +67,14 @@ object ZipUtil {
        return true
    }

+    /**
+     * Unzip the contents of a zip file to a folder.
+     *
+     * @param zipFile The zip file to unzip.
+     * @param destDirectory The destination directory.
+     * @return True if the operation is successful, false otherwise.
+     * @throws IOException If an I/O error occurs.
+     */
    @Throws(IOException::class)
    fun unzipToFolder(zipFile: File, destDirectory: String): Boolean {
        File(destDirectory).run {
@@ -72,10 +88,8 @@ object ZipUtil {
                    zip.getInputStream(entry).use { input ->
                        val filePath = destDirectory + File.separator + entry.name
                        if (!entry.isDirectory) {
-                            // if the entry is a file, extracts it
                            extractFile(input, filePath)
                        } else {
-                            // if the entry is a directory, make the directory
                            val dir = File(filePath)
                            dir.mkdir()
                        }
@@ -89,6 +103,13 @@ object ZipUtil {
        return true
    }

+    /**
+     * Extract a file from an input stream.
+     *
+     * @param inputStream The input stream to read from.
+     * @param destFilePath The destination file path.
+     * @throws IOException If an I/O error occurs.
+     */
    @Throws(IOException::class)
    private fun extractFile(inputStream: InputStream, destFilePath: String) {
        val bos = BufferedOutputStream(FileOutputStream(destFilePath))
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.res.AssetManager
-import android.os.Build
 import android.util.Log
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
@@ -20,12 +19,11 @@ import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -50,7 +48,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     * 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 startListenBroadcast() {
        isRunning.value = false
        val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
@@ -58,20 +55,30 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        MessageUtil.sendMsg2Service(getApplication(), AppConfig.MSG_REGISTER_CLIENT, "")
    }

+    /**
+     * Called when the ViewModel is cleared.
+     */
    override fun onCleared() {
        getApplication<AngApplication>().unregisterReceiver(mMsgReceiver)
        tcpingTestScope.coroutineContext[Job]?.cancelChildren()
-        SpeedtestUtil.closeAllTcpSockets()
+        SpeedtestManager.closeAllTcpSockets()
        Log.i(ANG_PACKAGE, "Main ViewModel is cleared")
        super.onCleared()
    }

+    /**
+     * Reloads the server list.
+     */
    fun reloadServerList() {
        serverList = MmkvManager.decodeServerList()
        updateCache()
        updateListAction.value = -1
    }

+    /**
+     * Removes a server by its GUID.
+     * @param guid The GUID of the server to remove.
+     */
    fun removeServer(guid: String) {
        serverList.remove(guid)
        MmkvManager.removeServer(guid)
@@ -81,33 +88,43 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

-    fun appendCustomConfigServer(server: String): Boolean {
-        if (server.contains("inbounds")
-            && server.contains("outbounds")
-            && server.contains("routing")
-        ) {
-            try {
-                val config = CustomFmt.parse(server) ?: return false
-                config.subscriptionId = subscriptionId
-                val key = MmkvManager.encodeServerConfig("", config)
-                MmkvManager.encodeServerRaw(key, server)
-                serverList.add(0, key)
-//                val profile = ProfileLiteItem(
-//                    configType = config.configType,
-//                    subscriptionId = config.subscriptionId,
-//                    remarks = config.remarks,
-//                    server = config.getProxyOutbound()?.getServerAddress(),
-//                    serverPort = config.getProxyOutbound()?.getServerPort(),
-//                )
-                serversCache.add(0, ServersCache(key, config))
-                return true
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-        return false
-    }
+//    /**
+//     * Appends a custom configuration server.
+//     * @param server The server configuration to append.
+//     * @return True if the server was successfully appended, false otherwise.
+//     */
+//    fun appendCustomConfigServer(server: String): Boolean {
+//        if (server.contains("inbounds")
+//            && server.contains("outbounds")
+//            && server.contains("routing")
+//        ) {
+//            try {
+//                val config = CustomFmt.parse(server) ?: return false
+//                config.subscriptionId = subscriptionId
+//                val key = MmkvManager.encodeServerConfig("", config)
+//                MmkvManager.encodeServerRaw(key, server)
+//                serverList.add(0, key)
+////                val profile = ProfileLiteItem(
+////                    configType = config.configType,
+////                    subscriptionId = config.subscriptionId,
+////                    remarks = config.remarks,
+////                    server = config.getProxyOutbound()?.getServerAddress(),
+////                    serverPort = config.getProxyOutbound()?.getServerPort(),
+////                )
+//                serversCache.add(0, ServersCache(key, config))
+//                return true
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//            }
+//        }
+//        return false
+//    }

+    /**
+     * Swaps the positions of two servers.
+     * @param fromPosition The initial position of the server.
+     * @param toPosition The target position of the server.
+     */
    fun swapServer(fromPosition: Int, toPosition: Int) {
        if (subscriptionId.isEmpty()) {
            Collections.swap(serverList, fromPosition, toPosition)
@@ -120,6 +137,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        MmkvManager.encodeServerList(serverList)
    }

+    /**
+     * Updates the cache of servers.
+     */
    @Synchronized
    fun updateCache() {
        serversCache.clear()
@@ -148,6 +168,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

+    /**
+     * Updates the configuration via subscription for all servers.
+     * @return The number of updated configurations.
+     */
    fun updateConfigViaSubAll(): Int {
        if (subscriptionId.isEmpty()) {
            return AngConfigManager.updateConfigViaSubAll()
@@ -157,6 +181,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

+    /**
+     * Exports all servers.
+     * @return The number of exported servers.
+     */
    fun exportAllServer(): Int {
        val serverListCopy =
            if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) {
@@ -172,21 +200,22 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        return ret
    }

-
+    /**
+     * Tests the TCP ping for all servers.
+     */
    fun testAllTcping() {
        tcpingTestScope.coroutineContext[Job]?.cancelChildren()
-        SpeedtestUtil.closeAllTcpSockets()
+        SpeedtestManager.closeAllTcpSockets()
        MmkvManager.clearAllTestDelayResults(serversCache.map { it.guid }.toList())
-        //updateListAction.value = -1 // update all

-        val serversCopy = serversCache.toList() // Create a copy of the list
+        val serversCopy = serversCache.toList()
        for (item in serversCopy) {
            item.profile.let { outbound ->
                val serverAddress = outbound.server
                val serverPort = outbound.serverPort
                if (serverAddress != null && serverPort != null) {
                    tcpingTestScope.launch {
-                        val testResult = SpeedtestUtil.tcping(serverAddress, serverPort.toInt())
+                        val testResult = SpeedtestManager.tcping(serverAddress, serverPort.toInt())
                        launch(Dispatchers.Main) {
                            MmkvManager.encodeServerTestDelayMillis(item.guid, testResult)
                            updateListAction.value = getPosition(item.guid)
@@ -197,23 +226,33 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

+    /**
+     * Tests the real ping for all servers.
+     */
    fun testAllRealPing() {
        MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG_CANCEL, "")
        MmkvManager.clearAllTestDelayResults(serversCache.map { it.guid }.toList())
-        updateListAction.value = -1 // update all
+        updateListAction.value = -1

-        val serversCopy = serversCache.toList() // Create a copy of the list
-        viewModelScope.launch(Dispatchers.Default) { // without Dispatchers.Default viewModelScope will launch in main thread
+        val serversCopy = serversCache.toList()
+        viewModelScope.launch(Dispatchers.Default) {
            for (item in serversCopy) {
                MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid)
            }
        }
    }

+    /**
+     * Tests the real ping for the current server.
+     */
    fun testCurrentServerRealPing() {
        MessageUtil.sendMsg2Service(getApplication(), AppConfig.MSG_MEASURE_DELAY, "")
    }

+    /**
+     * Changes the subscription ID.
+     * @param id The new subscription ID.
+     */
    fun subscriptionIdChanged(id: String) {
        if (subscriptionId != id) {
            subscriptionId = id
@@ -222,6 +261,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        }
    }

+    /**
+     * Gets the subscriptions.
+     * @param context The context.
+     * @return A pair of lists containing the subscription IDs and remarks.
+     */
    fun getSubscriptions(context: Context): Pair<MutableList<String>?, MutableList<String>?> {
        val subscriptions = MmkvManager.decodeSubscriptions()
        if (subscriptionId.isNotEmpty()
@@ -240,6 +284,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        return listId to listRemarks
    }

+    /**
+     * Gets the position of a server by its GUID.
+     * @param guid The GUID of the server.
+     * @return The position of the server.
+     */
    fun getPosition(guid: String): Int {
        serversCache.forEachIndexed { index, it ->
            if (it.guid == guid)
@@ -248,6 +297,10 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        return -1
    }

+    /**
+     * Removes duplicate servers.
+     * @return The number of removed servers.
+     */
    fun removeDuplicateServer(): Int {
        val serversCacheCopy = mutableListOf<Pair<String, ProfileItem>>()
        for (it in serversCache) {
@@ -274,28 +327,44 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        return deleteServer.count()
    }

-    fun removeAllServer() {
+    /**
+     * Removes all servers.
+     * @return The number of removed servers.
+     */
+    fun removeAllServer(): Int {
+        val count =
+            if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) {
+                MmkvManager.removeAllServer()
+            } else {
+                val serversCopy = serversCache.toList()
+                for (item in serversCopy) {
+                    MmkvManager.removeServer(item.guid)
+                }
+                serversCache.toList().count()
+            }
+        return count
+    }
+
+    /**
+     * Removes invalid servers.
+     * @return The number of removed servers.
+     */
+    fun removeInvalidServer(): Int {
+        var count = 0
        if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) {
-            MmkvManager.removeAllServer()
+            count += MmkvManager.removeInvalidServer("")
        } else {
            val serversCopy = serversCache.toList()
            for (item in serversCopy) {
-                MmkvManager.removeServer(item.guid)
-            }
-        }
-    }
-
-    fun removeInvalidServer() {
-        if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) {
-            MmkvManager.removeInvalidServer("")
-        } else {
-            val serversCopy = serversCache.toList()
-            for (item in serversCopy) {
-                MmkvManager.removeInvalidServer(item.guid)
+                count += MmkvManager.removeInvalidServer(item.guid)
            }
        }
+        return count
    }

+    /**
+     * Sorts servers by their test results.
+     */
    fun sortByTestResults() {
        data class ServerDelay(var guid: String, var testDelayMillis: Long)

@@ -315,12 +384,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
        MmkvManager.encodeServerList(serverList)
    }

+    /**
+     * Initializes assets.
+     * @param assets The asset manager.
+     */
    fun initAssets(assets: AssetManager) {
        viewModelScope.launch(Dispatchers.Default) {
            SettingsManager.initAssets(getApplication<AngApplication>(), assets)
        }
    }

+    /**
+     * Filters the configuration by a keyword.
+     * @param keyword The keyword to filter by.
+     */
    fun filterConfig(keyword: String) {
        if (keyword == keywordFilter) {
            return
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
@@ -7,16 +7,22 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.preference.PreferenceManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.Utils
+import com.v2ray.ang.handler.SettingsManager

 class SettingsViewModel(application: Application) : AndroidViewModel(application),
    SharedPreferences.OnSharedPreferenceChangeListener {

+    /**
+     * Starts listening for preference changes.
+     */
    fun startListenPreferenceChange() {
        PreferenceManager.getDefaultSharedPreferences(getApplication())
            .registerOnSharedPreferenceChangeListener(this)
    }

+    /**
+     * Called when the ViewModel is cleared.
+     */
    override fun onCleared() {
        PreferenceManager.getDefaultSharedPreferences(getApplication())
            .unregisterOnSharedPreferenceChangeListener(this)
@@ -24,17 +30,23 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
        super.onCleared()
    }

+    /**
+     * Called when a shared preference is changed.
+     * @param sharedPreferences The shared preferences.
+     * @param key The key of the changed preference.
+     */
    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
        Log.d(AppConfig.ANG_PACKAGE, "Observe settings changed: $key")
        when (key) {
            AppConfig.PREF_MODE,
            AppConfig.PREF_VPN_DNS,
+            AppConfig.PREF_VPN_BYPASS_LAN,
            AppConfig.PREF_REMOTE_DNS,
            AppConfig.PREF_DOMESTIC_DNS,
+            AppConfig.PREF_DNS_HOSTS,
            AppConfig.PREF_DELAY_TEST_URL,
            AppConfig.PREF_LOCAL_DNS_PORT,
            AppConfig.PREF_SOCKS_PORT,
-            AppConfig.PREF_HTTP_PORT,
            AppConfig.PREF_LOGLEVEL,
            AppConfig.PREF_LANGUAGE,
            AppConfig.PREF_UI_MODE_NIGHT,
@@ -54,6 +66,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.PREF_PROXY_SHARING,
            AppConfig.PREF_LOCAL_DNS_ENABLED,
            AppConfig.PREF_FAKE_DNS_ENABLED,
+            AppConfig.PREF_APPEND_HTTP_PROXY,
            AppConfig.PREF_ALLOW_INSECURE,
            AppConfig.PREF_PREFER_IPV6,
            AppConfig.PREF_PER_APP_PROXY,
@@ -75,13 +88,9 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
            AppConfig.PREF_MUX_XUDP_CONCURRENCY -> {
                MmkvManager.encodeSettings(key, sharedPreferences.getString(key, "8"))
            }
-
-//            AppConfig.PREF_PER_APP_PROXY_SET -> {
-//                MmkvManager.encodeSettings(key, sharedPreferences.getStringSet(key, setOf()))
-//            }
        }
        if (key == AppConfig.PREF_UI_MODE_NIGHT) {
-            Utils.setNightMode()
+            SettingsManager.setNightMode()
        }
    }
 }
--- a/V2rayNG/app/src/main/res/drawable-night/ic_per_apps_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable-night/ic_per_apps_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+
+</vector>
--- a/V2rayNG/app/src/main/res/drawable/custom_divider.xml
+++ b/V2rayNG/app/src/main/res/drawable/custom_divider.xml
@@ -0,0 +1,13 @@
+<!-- res/drawable/custom_divider.xml -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="0dp"
+        android:left="16dp"
+        android:right="16dp"
+        android:top="0dp">
+        <shape>
+            <size android:height="1dp" />
+            <solid android:color="@color/divider_color_light" />
+        </shape>
+    </item>
+</layer-list>
--- a/V2rayNG/app/src/main/res/drawable/ic_per_apps_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_per_apps_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
+
+</vector>
--- a/V2rayNG/app/src/main/res/drawable/license_24px.xml
+++ b/V2rayNG/app/src/main/res/drawable/license_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,520Q430,520 395,485Q360,450 360,400Q360,350 395,315Q430,280 480,280Q530,280 565,315Q600,350 600,400Q600,450 565,485Q530,520 480,520ZM240,920L240,611Q202,569 181,515Q160,461 160,400Q160,266 253,173Q346,80 480,80Q614,80 707,173Q800,266 800,400Q800,461 779,515Q758,569 720,611L720,920L480,840L240,920ZM480,640Q580,640 650,570Q720,500 720,400Q720,300 650,230Q580,160 480,160Q380,160 310,230Q240,300 240,400Q240,500 310,570Q380,640 480,640ZM320,801L480,760L640,801L640,677Q605,697 564.5,708.5Q524,720 480,720Q436,720 395.5,708.5Q355,697 320,677L320,801ZM480,739L480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739Q480,739 480,739L480,739L480,739Z"/>
+</vector>
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -24,18 +24,18 @@
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <LinearLayout
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
-                    android:paddingStart="@dimen/padding_start">
+                    android:paddingStart="@dimen/padding_spacing_dp16">

                    <TextView
                        android:layout_width="wrap_content"
@@ -47,7 +47,7 @@
                        android:id="@+id/tv_backup_summary"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/layout_margin_top_height"
+                        android:layout_marginTop="@dimen/padding_spacing_dp16"
                        android:maxLines="4"
                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />

@@ -58,23 +58,23 @@
            <LinearLayout
                android:id="@+id/layout_share"
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:background="?attr/selectableItemBackground"
                android:clickable="true"
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_configuration_share"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>
@@ -82,23 +82,23 @@
            <LinearLayout
                android:id="@+id/layout_restore"
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:background="?attr/selectableItemBackground"
                android:clickable="true"
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_configuration_restore"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>
@@ -109,52 +109,76 @@
            android:layout_height="match_parent"
            android:gravity="top"
            android:orientation="vertical"
-            android:paddingTop="@dimen/padding_start">
+            android:paddingTop="@dimen/padding_spacing_dp16">

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

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_source_code"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>

+            <LinearLayout
+                android:id="@+id/layout_oss_licenses"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center|start"
+                android:orientation="horizontal"
+                android:padding="@dimen/padding_spacing_dp16">
+
+                <ImageView
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
+                    app:srcCompat="@drawable/license_24px" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
+                    android:text="@string/title_oss_license"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </LinearLayout>
+
            <LinearLayout
                android:id="@+id/layout_feedback"
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:background="?attr/selectableItemBackground"
                android:clickable="true"
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_pref_feedback"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>
@@ -163,23 +187,23 @@
            <LinearLayout
                android:id="@+id/layout_tg_channel"
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:background="?attr/selectableItemBackground"
                android:clickable="true"
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_tg_channel"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>
@@ -187,33 +211,33 @@
            <LinearLayout
                android:id="@+id/layout_privacy_policy"
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:background="?attr/selectableItemBackground"
                android:clickable="true"
                android:focusable="true"
                android:gravity="center|start"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

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

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                    android:text="@string/title_privacy_policy"
                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="wrap_content"
                android:gravity="center"
                android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">

                <TextView
                    android:id="@+id/tv_version"
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -7,13 +7,20 @@
    android:fitsSystemWindows="true"
    android:orientation="vertical">

+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/pb_waiting"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="invisible"
+        app:indicatorColor="@color/color_fab_active" />
+
    <LinearLayout
        android:id="@+id/header_view"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
-        android:paddingStart="@dimen/padding_start"
-        android:paddingEnd="@dimen/padding_end">
+        android:padding="@dimen/padding_spacing_dp16">

        <LinearLayout
            android:layout_width="match_parent"
@@ -22,7 +29,7 @@

            <LinearLayout
                android:layout_width="match_parent"
-                android:layout_height="@dimen/bypass_list_header_height"
+                android:layout_height="wrap_content"
                android:orientation="horizontal">

                <LinearLayout
@@ -39,8 +46,9 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:maxLines="2"
-                        android:text="@string/title_pref_per_app_proxy"
+                        android:text="@string/per_app_proxy_settings_enable"
                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textColor="@color/colorAccent"
                        app:theme="@style/BrandedSwitch" />

                </LinearLayout>
@@ -60,6 +68,7 @@
                        android:layout_height="wrap_content"
                        android:text="@string/switch_bypass_apps_mode"
                        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                        android:textColor="@color/colorAccent"
                        app:theme="@style/BrandedSwitch" />

                </LinearLayout>
@@ -69,16 +78,11 @@
        </LinearLayout>
    </LinearLayout>

-    <ProgressBar
-        android:id="@+id/pb_waiting"
-        style="@android:style/Widget.DeviceDefault.ProgressBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/recycler_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
+        android:scrollbars="vertical"
        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
        tools:context=".ui.PerAppProxyActivity" />

--- a/Show More
+++ b/Show More