up 1.9.28

https://github.com/2dust/v2rayNG/issues/4196
https://github.com/2dust/v2rayNG/issues/4199

.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:
@@ -17,47 +18,124 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Prepare build dir
+      run: |
+        mkdir ${{ github.workspace }}/build
+
+    - name: Fetch AndroidLibV2rayLite
+      run: |
+        cd ${{ github.workspace }}/build
+        git clone --depth=1 -b master https://github.com/2dust/AndroidLibV2rayLite.git
+        cd AndroidLibV2rayLite
+        git submodule update --init
+
+    - name: Restore cached libtun2socks
+      id: cache-libtun2socks-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs
+        key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }}
+
+    - name: Setup Android NDK
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      # Same version as https://gitlab.com/fdroid/fdroiddata/metadata/com.v2ray.ang.yml
+      with:
+        ndk-version: r27
+        add-to-path: true
+        link-to-sdk: true
+        local-cache: true
+
+    - name: Restore Android Symlinks
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      run: |
+        directory="${{ steps.setup-ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin"
+        find "$directory" -type l | while read link; do
+            current_target=$(readlink "$link")
+            new_target="$directory/$(basename "$current_target")"
+            ln -sf "$new_target" "$link"
+            echo "Changed $(basename "$link") from $current_target to $new_target"
+        done
+
+    - name: Build libtun2socks
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      run: |
+        cd ${{ github.workspace }}/build/AndroidLibV2rayLite
+        bash compile-tun2socks.sh
+        tar -xvzf libtun2socks.so.tgz
+        cp -r libs/* ${{ github.workspace }}/V2rayNG/app/libs/
+      env:
+        NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
+
+    - name: Save libtun2socks
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs
+        key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }}
+
+    - name: Copy libtun2socks
+      run: |
+        cp -r ${{ github.workspace }}/build/AndroidLibV2rayLite/libs/* ${{ github.workspace }}/V2rayNG/app/libs/
+
+    - name: Download libv2ray
+      uses: robinraju/release-downloader@v1
+      with:
+        repository: '2dust/AndroidLibXrayLite'
+        latest: true
+        fileName: 'libv2ray.aar'
+        out-file-path: V2rayNG/app/libs/
+
     - name: Setup Java
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
-
-    - name: Setup Golang
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.22.2'
-
-    - name: Install gomobile
-      run: |
-        go install golang.org/x/mobile/cmd/gomobile@latest
-        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-
+        java-version: '21'
 
     - name: Setup Android environment
       uses: android-actions/setup-android@v3
 
-
-    - name: Build dependencies
-      run: |
-        mkdir ${{ github.workspace }}/build
-        cd ${{ github.workspace }}/build
-        git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git
-        cd AndroidLibXrayLite
-        go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true
-        gomobile init
-        go mod tidy -v
-        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
-        cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/
+    - name: Decode Keystore
+      uses: timheuer/base64-to-file@v1
+      id: android_keystore
+      with:
+        fileName: "android_keystore.jks"
+        encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }}
 
     - name: Build APK
       run: |
         cd ${{ github.workspace }}/V2rayNG
         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 APK
+    - name: Upload arm64-v8a APK
       uses: actions/upload-artifact@v4
+      if: ${{  success() }}
       with:
-        name: apk
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/
+        name: arm64-v8a
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
+
+    - name: Upload armeabi-v7a APK
+      uses: actions/upload-artifact@v4
+      if: ${{  success() }}
+      with:
+        name: armeabi-v7a
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
+
+    - name: Upload x86 APK
+      uses: actions/upload-artifact@v4
+      if: ${{  success() }}
+      with:
+        name: x86-apk
+        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:
+        file: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*playstore*/release/*.apk
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.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

.gitignore

@@ -3,3 +3,5 @@
 V2rayNG/app/release/output.json
 .idea/
 .gradle/
+libtun2socks.so
+libhysteria2.so

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-1.9.23-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.1.0-blue.svg)](https://kotlinlang.org)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayNG)](https://github.com/2dust/v2rayNG/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayng/badge)](https://www.codefactor.io/repository/github/2dust/v2rayng)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayNG/latest/total?logo=github)](https://github.com/2dust/v2rayNG/releases)

V2rayNG/app/build.gradle.kts

@@ -1,46 +1,63 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    id("com.jaredsburrows.license")
 }
 
 android {
     namespace = "com.v2ray.ang"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.v2ray.ang"
         minSdk = 21
-        targetSdk = 34
-        versionCode = 602
-        versionName = "1.9.8"
+        targetSdk = 35
+        versionCode = 624
+        versionName = "1.9.28"
         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()
             }
         }
 
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
     buildTypes {
         release {
             isMinifyEnabled = false
-
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
-        debug {
-            isMinifyEnabled = false
+    }
 
+    flavorDimensions.add("distribution")
+    productFlavors {
+        create("fdroid") {
+            dimension = "distribution"
+            applicationIdSuffix = ".fdroid"
+            buildConfigField("String", "DISTRIBUTION", "\"F-Droid\"")
+        }
+        create("playstore") {
+            dimension = "distribution"
+            buildConfigField("String", "DISTRIBUTION", "\"Play Store\"")
         }
     }
 
@@ -50,30 +67,57 @@ android {
         }
     }
 
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.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 {
@@ -86,47 +130,61 @@ android {
             useLegacyPackaging = true
         }
     }
+
 }
 
 dependencies {
+    // Core Libraries
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar", "*.jar"))))
-    testImplementation(libs.junit)
 
-    implementation(libs.flexbox)
-    // Androidx
-    implementation(libs.constraintlayout)
-    implementation(libs.legacy.support.v4)
-    implementation(libs.appcompat)
-    implementation(libs.material)
-    implementation(libs.cardview)
+    // AndroidX Core Libraries
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.constraintlayout)
     implementation(libs.preference.ktx)
     implementation(libs.recyclerview)
-    implementation(libs.fragment.ktx)
-    implementation(libs.multidex)
-    implementation(libs.viewpager2)
 
-    // Androidx ktx
-    implementation(libs.activity.ktx)
+    // UI Libraries
+    implementation(libs.material)
+    implementation(libs.toastcompat)
+    implementation(libs.editorkit)
+    implementation(libs.flexbox)
+
+    // Data and Storage Libraries
+    implementation(libs.mmkv.static)
+    implementation(libs.gson)
+
+    // Reactive and Utility Libraries
+    implementation(libs.rxjava)
+    implementation(libs.rxandroid)
+    implementation(libs.rxpermissions)
+
+    // Language and Processing Libraries
+    implementation(libs.language.base)
+    implementation(libs.language.json)
+
+    // Intent and Utility Libraries
+    implementation(libs.quickie.foss)
+    implementation(libs.core)
+
+    // AndroidX Lifecycle and Architecture Components
     implementation(libs.lifecycle.viewmodel.ktx)
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.runtime.ktx)
 
-    //kotlin
-    implementation(libs.kotlin.reflect)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlinx.coroutines.android)
-
-    implementation(libs.mmkv.static)
-    implementation(libs.gson)
-    implementation(libs.rxjava)
-    implementation(libs.rxandroid)
-    implementation(libs.rxpermissions)
-    implementation(libs.toastcompat)
-    implementation(libs.editorkit)
-    implementation(libs.language.base)
-    implementation(libs.language.json)
-    implementation(libs.quickie.bundled)
-    implementation(libs.core)
+    // Background Task Libraries
     implementation(libs.work.runtime.ktx)
     implementation(libs.work.multiprocess)
-}
+
+    // Multidex Support
+    implementation(libs.multidex)
+
+    // Testing Libraries
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    testImplementation(libs.org.mockito.mockito.inline)
+    testImplementation(libs.mockito.kotlin)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+}

V2rayNG/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

V2rayNG/app/src/main/AndroidManifest.xml

@@ -224,8 +224,7 @@
         <activity
             android:name=".ui.TaskerActivity"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name">
+            android:icon="@mipmap/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
@@ -234,7 +233,8 @@
         <receiver
             android:name=".receiver.TaskerReceiver"
             android:exported="true"
-            android:process=":RunSoLibV2RayDaemon">
+            android:process=":RunSoLibV2RayDaemon"
+            tools:ignore="ExportedReceiver">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>

V2rayNG/app/src/main/assets/custom_routing_black

@@ -42,21 +42,89 @@
     ]
   },
   {
-    "remarks": "代理GFW",
+    "remarks": "代理海外公共DNSIP",
     "outboundTag": "proxy",
-    "domain": [
-      "geosite:gfw",
-      "geosite:greatfire"
+    "ip": [
+      "1.1.1.1",
+      "1.0.0.1",
+      "2606:4700:4700::1111",
+      "2606:4700:4700::1001",
+      "1.1.1.2",
+      "1.0.0.2",
+      "2606:4700:4700::1112",
+      "2606:4700:4700::1002",
+      "1.1.1.3",
+      "1.0.0.3",
+      "2606:4700:4700::1113",
+      "2606:4700:4700::1003",
+      "8.8.8.8",
+      "8.8.4.4",
+      "2001:4860:4860::8888",
+      "2001:4860:4860::8844",
+      "94.140.14.14",
+      "94.140.15.15",
+      "2a10:50c0::ad1:ff",
+      "2a10:50c0::ad2:ff",
+      "94.140.14.15",
+      "94.140.15.16",
+      "2a10:50c0::bad1:ff",
+      "2a10:50c0::bad2:ff",
+      "94.140.14.140",
+      "94.140.14.141",
+      "2a10:50c0::1:ff",
+      "2a10:50c0::2:ff",
+      "208.67.222.222",
+      "208.67.220.220",
+      "2620:119:35::35",
+      "2620:119:53::53",
+      "208.67.222.123",
+      "208.67.220.123",
+      "2620:119:35::123",
+      "2620:119:53::123",
+      "9.9.9.9",
+      "149.112.112.112",
+      "2620:fe::9",
+      "2620:fe::fe",
+      "9.9.9.11",
+      "149.112.112.11",
+      "2620:fe::11",
+      "2620:fe::fe:11",
+      "9.9.9.10",
+      "149.112.112.10",
+      "2620:fe::10",
+      "2620:fe::fe:10",
+      "77.88.8.8",
+      "77.88.8.1",
+      "2a02:6b8::feed:0ff",
+      "2a02:6b8:0:1::feed:0ff",
+      "77.88.8.88",
+      "77.88.8.2",
+      "2a02:6b8::feed:bad",
+      "2a02:6b8:0:1::feed:bad",
+      "77.88.8.7",
+      "77.88.8.3",
+      "2a02:6b8::feed:a11",
+      "2a02:6b8:0:1::feed:a11"
     ]
   },
   {
-    "remarks": "代理Google等",
+    "remarks": "代理海外公共DNS域名",
+    "outboundTag": "proxy",
+    "domain": [
+      "domain:cloudflare-dns.com",
+      "domain:one.one.one.one",
+      "domain:dns.google",
+      "domain:adguard-dns.com",
+      "domain:opendns.com",
+      "domain:umbrella.com",
+      "domain:quad9.net",
+      "domain:yandex.net"
+    ]
+  },
+  {
+    "remarks": "代理IP",
     "outboundTag": "proxy",
     "ip": [
-      "1.0.0.1",
-      "1.1.1.1",
-      "8.8.8.8",
-      "8.8.4.4",
       "geoip:facebook",
       "geoip:fastly",
       "geoip:google",
@@ -65,6 +133,14 @@
       "geoip:twitter"
     ]
   },
+  {
+    "remarks": "代理GFW",
+    "outboundTag": "proxy",
+    "domain": [
+      "geosite:gfw",
+      "geosite:greatfire"
+    ]
+  },
   {
     "remarks": "最终直连",
     "port": "0-65535",

V2rayNG/app/src/main/assets/custom_routing_white

@@ -1,4 +1,12 @@
 [
+  {
+    "remarks": "Google cn",
+    "outboundTag": "proxy",
+    "domain": [
+      "domain:googleapis.cn",
+      "domain:gstatic.com"
+    ]
+  },
   {
     "remarks": "阻断udp443",
     "outboundTag": "block",
@@ -26,6 +34,58 @@
       "geosite:private"
     ]
   },
+  {
+    "remarks": "绕过中国公共DNSIP",
+    "outboundTag": "direct",
+    "ip": [
+      "223.5.5.5",
+      "223.6.6.6",
+      "2400:3200::1",
+      "2400:3200:baba::1",
+      "119.29.29.29",
+      "1.12.12.12",
+      "120.53.53.53",
+      "2402:4e00::",
+      "2402:4e00:1::",
+      "180.76.76.76",
+      "2400:da00::6666",
+      "114.114.114.114",
+      "114.114.115.115",
+      "114.114.114.119",
+      "114.114.115.119",
+      "114.114.114.110",
+      "114.114.115.110",
+      "180.184.1.1",
+      "180.184.2.2",
+      "101.226.4.6",
+      "218.30.118.6",
+      "123.125.81.6",
+      "140.207.198.6",
+      "1.2.4.8",
+      "210.2.4.8",
+      "52.80.66.66",
+      "117.50.22.22",
+      "2400:7fc0:849e:200::4",
+      "2404:c2c0:85d8:901::4",
+      "117.50.10.10",
+      "52.80.52.52",
+      "2400:7fc0:849e:200::8",
+      "2404:c2c0:85d8:901::8",
+      "117.50.60.30",
+      "52.80.60.30"
+    ]
+  },
+  {
+    "remarks": "绕过中国公共DNS域名",
+    "outboundTag": "direct",
+    "domain": [
+      "domain:alidns.com",
+      "domain:doh.pub",
+      "domain:dot.pub",
+      "domain:360.cn",
+      "domain:onedns.net"
+    ]
+  },
   {
     "remarks": "绕过中国IP",
     "outboundTag": "direct",
@@ -37,16 +97,7 @@
     "remarks": "绕过中国域名",
     "outboundTag": "direct",
     "domain": [
-      "geosite:cn",
-      "geosite:geolocation-cn"
-    ]
-  },
-  {
-    "remarks": "Google CN",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
+      "geosite:cn"
     ]
   },
   {
@@ -54,4 +105,4 @@
     "port": "0-65535",
     "outboundTag": "proxy"
   }
-]
+]

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

@@ -7,7 +7,8 @@ import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import com.tencent.mmkv.MMKV
-import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.Utils
 
 class AngApplication : MultiDexApplication() {
@@ -22,7 +23,7 @@ class AngApplication : MultiDexApplication() {
     }
 
     private val workManagerConfiguration: Configuration = Configuration.Builder()
-        .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
+        .setDefaultProcessName("${ANG_PACKAGE}:bg")
         .build()
 
     override fun onCreate() {
@@ -37,16 +38,11 @@ class AngApplication : MultiDexApplication() {
 
         MMKV.initialize(this)
 
-        Utils.setNightMode(application)
+        Utils.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
-    )!!
-
 }

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

@@ -22,6 +22,7 @@ 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_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
@@ -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"
@@ -60,8 +61,6 @@ object AppConfig {
     const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"
 
     /** Protocol identifiers. */
-    const val PROTOCOL_HTTP: String = "http://"
-    const val PROTOCOL_HTTPS: String = "https://"
     const val PROTOCOL_FREEDOM: String = "freedom"
 
     /** Broadcast actions. */
@@ -113,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"
@@ -158,4 +156,32 @@ object AppConfig {
     /** Give a good name to this, IDK*/
     const val VPN = "VPN"
 
+    // Google API rule constants
+    const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
+    const val GOOGLEAPIS_COM_DOMAIN = "googleapis.com"
+
+    // Android Private DNS constants
+    const val DNS_DNSPOD_DOMAIN = "dot.pub"
+    const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
+    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
+    const val DNS_GOOGLE_DOMAIN = "dns.google"
+    const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
+    const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
+
+    
+    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
+    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
+    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
+    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
+
+    const val DEFAULT_PORT = 443
+    const val DEFAULT_SECURITY = "auto"
+    const val DEFAULT_LEVEL = 8
+    const val DEFAULT_NETWORK = "tcp"
+    const val TLS = "tls"
+    const val REALITY = "reality"
+    const val HEADER_TYPE_HTTP = "http"
+
 }

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

@@ -1,6 +1,6 @@
 package com.v2ray.ang.dto
 
-data class ConfigResult (
+data class ConfigResult(
     var status: Boolean,
     var guid: String? = null,
     var content: String = "",

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

@@ -16,6 +16,6 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
     HTTP(10, AppConfig.HTTP);
 
     companion object {
-        fun fromInt(value: Int) = values().firstOrNull { it.value == value }
+        fun fromInt(value: Int) = entries.firstOrNull { it.value == value }
     }
 }

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

@@ -8,6 +8,7 @@ data class Hysteria2Bean(
     val socks5: Socks5Bean? = null,
     val http: Socks5Bean? = null,
     val tls: TlsBean? = null,
+    val transport: TransportBean? = null,
 ) {
     data class ObfsBean(
         val type: String?,
@@ -25,5 +26,15 @@ data class Hysteria2Bean(
     data class TlsBean(
         val sni: String?,
         val insecure: Boolean?,
+        val pinSHA256: String?,
     )
+
+    data class TransportBean(
+        val type: String?,
+        val udp: TransportUdpBean?
+    ) {
+        data class TransportUdpBean(
+            val hopInterval: String?,
+        )
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.v2ray.ang.dto
+
+enum class Language(val code: String) {
+    AUTO("auto"),
+    ENGLISH("en"),
+    CHINA("zh-rCN"),
+    TRADITIONAL_CHINESE("zh-rTW"),
+    VIETNAMESE("vi"),
+    RUSSIAN("ru"),
+    PERSIAN("fa"),
+    BANGLA("bn"),
+    BAKHTIARI("bqi-rIR");
+
+    companion object {
+        fun fromCode(code: String): Language {
+            return entries.find { it.code == code } ?: AUTO
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.v2ray.ang.dto
+
+enum class NetworkType(val type: String) {
+    TCP("tcp"),
+    KCP("kcp"),
+    WS("ws"),
+    HTTP_UPGRADE("httpupgrade"),
+    XHTTP("xhttp"),
+    HTTP("http"),
+    H2("h2"),
+    //QUIC("quic"),
+    GRPC("grpc");
+
+    companion object {
+        fun fromString(type: String?) = entries.find { it.type == type } ?: TCP
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.v2ray.ang.dto
+
+import com.v2ray.ang.AppConfig.TAG_BLOCKED
+import com.v2ray.ang.AppConfig.TAG_DIRECT
+import com.v2ray.ang.AppConfig.TAG_PROXY
+import com.v2ray.ang.util.Utils
+
+data class ProfileItem(
+    val configVersion: Int = 4,
+    val configType: EConfigType,
+    var subscriptionId: String = "",
+    var addedTime: Long = System.currentTimeMillis(),
+
+    var remarks: String = "",
+    var server: String? = null,
+    var serverPort: String? = null,
+
+    var password: String? = null,
+    var method: String? = null,
+    var flow: String? = null,
+    var username: String? = null,
+
+    var network: String? = null,
+    var headerType: String? = null,
+    var host: String? = null,
+    var path: String? = null,
+    var seed: String? = null,
+    var quicSecurity: String? = null,
+    var quicKey: String? = null,
+    var mode: String? = null,
+    var serviceName: String? = null,
+    var authority: String? = null,
+    var xhttpMode: String? = null,
+    var xhttpExtra: String? = null,
+
+    var security: String? = null,
+    var sni: String? = null,
+    var alpn: String? = null,
+    var fingerPrint: String? = null,
+    var insecure: Boolean? = null,
+
+    var publicKey: String? = null,
+    var shortId: String? = null,
+    var spiderX: String? = null,
+
+    var secretKey: String? = null,
+    var preSharedKey: String? = null,
+    var localAddress: String? = null,
+    var reserved: String? = null,
+    var mtu: Int? = null,
+
+    var obfsPassword: String? = null,
+    var portHopping: String? = null,
+    var portHoppingInterval: String? = null,
+    var pinSHA256: String? = null,
+
+    ) {
+    companion object {
+        fun create(configType: EConfigType): ProfileItem {
+            return ProfileItem(configType = configType)
+        }
+    }
+
+    fun getAllOutboundTags(): MutableList<String> {
+        return mutableListOf(TAG_PROXY, TAG_DIRECT, TAG_BLOCKED)
+    }
+
+    fun getServerAddressAndPort(): String {
+        return Utils.getIpv6Address(server) + ":" + serverPort
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other == null) return false
+        val obj = other as ProfileItem
+
+        return (this.server == obj.server
+                && this.serverPort == obj.serverPort
+                && this.password == obj.password
+                && this.method == obj.method
+                && this.flow == obj.flow
+                && this.username == obj.username
+
+                && this.network == obj.network
+                && this.headerType == obj.headerType
+                && this.host == obj.host
+                && this.path == obj.path
+                && this.seed == obj.seed
+                && this.quicSecurity == obj.quicSecurity
+                && this.quicKey == obj.quicKey
+                && this.mode == obj.mode
+                && this.serviceName == obj.serviceName
+                && this.authority == obj.authority
+                && this.xhttpMode == obj.xhttpMode
+
+                && this.security == obj.security
+                && this.sni == obj.sni
+                && this.alpn == obj.alpn
+                && this.fingerPrint == obj.fingerPrint
+                && this.publicKey == obj.publicKey
+                && this.shortId == obj.shortId
+
+                && this.secretKey == obj.secretKey
+                && this.localAddress == obj.localAddress
+                && this.reserved == obj.reserved
+                && this.mtu == obj.mtu
+
+                && this.obfsPassword == obj.obfsPassword
+                && this.portHopping == obj.portHopping
+                && this.portHoppingInterval == obj.portHoppingInterval
+                && this.pinSHA256 == obj.pinSHA256
+                )
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.v2ray.ang.dto
 
-data class ProfileItem(
+data class ProfileLiteItem(
     val configType: EConfigType,
     var subscriptionId: String = "",
     var remarks: String = "",

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

@@ -0,0 +1,20 @@
+package com.v2ray.ang.dto
+
+enum class RoutingType(val fileName: String) {
+    WHITE("custom_routing_white"),
+    BLACK("custom_routing_black"),
+    GLOBAL("custom_routing_global"),
+    WHITE_IRAN("custom_routing_white_iran");
+
+    companion object {
+        fun fromIndex(index: Int): RoutingType {
+            return when (index) {
+                0 -> WHITE
+                1 -> BLACK
+                2 -> GLOBAL
+                3 -> WHITE_IRAN
+                else -> WHITE
+            }
+        }
+    }
+}

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

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

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

@@ -7,6 +7,9 @@ import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.*
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.*
 import com.v2ray.ang.util.Utils
 import java.lang.reflect.Type
 
@@ -27,16 +30,6 @@ data class V2rayConfig(
     var observatory: Any? = null,
     var burstObservatory: Any? = null
 ) {
-    companion object {
-        const val DEFAULT_PORT = 443
-        const val DEFAULT_SECURITY = "auto"
-        const val DEFAULT_LEVEL = 8
-        const val DEFAULT_NETWORK = "tcp"
-
-        const val TLS = "tls"
-        const val REALITY = "reality"
-        const val HTTP = "http"
-    }
 
     data class LogBean(
         val access: String,
@@ -82,6 +75,49 @@ data class V2rayConfig(
         val sendThrough: String? = null,
         var mux: MuxBean? = MuxBean(false)
     ) {
+        companion object {
+            fun create(configType: EConfigType): OutboundBean? {
+                return when (configType) {
+                    EConfigType.VMESS,
+                    EConfigType.VLESS ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                vnext = listOf(
+                                    VnextBean(
+                                        users = listOf(UsersBean())
+                                    )
+                                )
+                            ),
+                            streamSettings = StreamSettingsBean()
+                        )
+
+                    EConfigType.SHADOWSOCKS,
+                    EConfigType.SOCKS,
+                    EConfigType.HTTP,
+                    EConfigType.TROJAN,
+                    EConfigType.HYSTERIA2 ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                servers = listOf(ServersBean())
+                            ),
+                            streamSettings = StreamSettingsBean()
+                        )
+
+                    EConfigType.WIREGUARD ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                secretKey = "",
+                                peers = listOf(WireGuardBean())
+                            )
+                        )
+
+                    EConfigType.CUSTOM -> null
+                }
+            }
+        }
 
         data class OutSettingsBean(
             var vnext: List<VnextBean>? = null,
@@ -110,17 +146,17 @@ data class V2rayConfig(
 
             data class VnextBean(
                 var address: String = "",
-                var port: Int = DEFAULT_PORT,
+                var port: Int = AppConfig.DEFAULT_PORT,
                 var users: List<UsersBean>
             ) {
 
                 data class UsersBean(
                     var id: String = "",
                     var alterId: Int? = null,
-                    var security: String = DEFAULT_SECURITY,
-                    var level: Int = DEFAULT_LEVEL,
-                    var encryption: String = "",
-                    var flow: String = ""
+                    var security: String? = null,
+                    var level: Int = AppConfig.DEFAULT_LEVEL,
+                    var encryption: String? = null,
+                    var flow: String? = null
                 )
             }
 
@@ -141,8 +177,8 @@ data class V2rayConfig(
                 var method: String? = null,
                 var ota: Boolean = false,
                 var password: String? = null,
-                var port: Int = DEFAULT_PORT,
-                var level: Int = DEFAULT_LEVEL,
+                var port: Int = AppConfig.DEFAULT_PORT,
+                var level: Int = AppConfig.DEFAULT_LEVEL,
                 val email: String? = null,
                 var flow: String? = null,
                 val ivCheck: Boolean? = null,
@@ -151,7 +187,7 @@ data class V2rayConfig(
                 data class SocksUsersBean(
                     var user: String = "",
                     var pass: String = "",
-                    var level: Int = DEFAULT_LEVEL
+                    var level: Int = AppConfig.DEFAULT_LEVEL
                 )
             }
 
@@ -159,18 +195,19 @@ data class V2rayConfig(
 
             data class WireGuardBean(
                 var publicKey: String = "",
+                var preSharedKey: String = "",
                 var endpoint: String = ""
             )
         }
 
         data class StreamSettingsBean(
-            var network: String = DEFAULT_NETWORK,
-            var security: String = "",
+            var network: String = AppConfig.DEFAULT_NETWORK,
+            var security: String? = null,
             var tcpSettings: TcpSettingsBean? = null,
             var kcpSettings: KcpSettingsBean? = null,
             var wsSettings: WsSettingsBean? = null,
             var httpupgradeSettings: HttpupgradeSettingsBean? = null,
-            var splithttpSettings: SplithttpSettingsBean? = null,
+            var xhttpSettings: XhttpSettingsBean? = null,
             var httpSettings: HttpSettingsBean? = null,
             var tlsSettings: TlsSettingsBean? = null,
             var quicSettings: QuicSettingBean? = null,
@@ -224,7 +261,7 @@ data class V2rayConfig(
             }
 
             data class WsSettingsBean(
-                var path: String = "",
+                var path: String? = null,
                 var headers: HeadersBean = HeadersBean(),
                 val maxEarlyData: Int? = null,
                 val useBrowserForwarding: Boolean? = null,
@@ -234,21 +271,21 @@ data class V2rayConfig(
             }
 
             data class HttpupgradeSettingsBean(
-                var path: String = "",
-                var host: String = "",
+                var path: String? = null,
+                var host: String? = null,
                 val acceptProxyProtocol: Boolean? = null
             )
 
-            data class SplithttpSettingsBean(
-                var path: String = "",
-                var host: String = "",
-                val maxUploadSize: Int? = null,
-                val maxConcurrentUploads: Int? = null
+            data class XhttpSettingsBean(
+                var path: String? = null,
+                var host: String? = null,
+                var mode: String? = null,
+                var extra: Any? = null,
             )
 
             data class HttpSettingsBean(
                 var host: List<String> = ArrayList(),
-                var path: String = ""
+                var path: String? = null
             )
 
             data class SockoptBean(
@@ -262,7 +299,7 @@ data class V2rayConfig(
 
             data class TlsSettingsBean(
                 var allowInsecure: Boolean = false,
-                var serverName: String = "",
+                var serverName: String? = null,
                 val alpn: List<String>? = null,
                 val minVersion: String? = null,
                 val maxVersion: String? = null,
@@ -308,32 +345,39 @@ data class V2rayConfig(
             }
 
             fun populateTransportSettings(
-                transport: String, headerType: String?, host: String?, path: String?, seed: String?,
-                quicSecurity: String?, key: String?, mode: String?, serviceName: String?,
+                transport: String,
+                headerType: String?,
+                host: String?,
+                path: String?,
+                seed: String?,
+                quicSecurity: String?,
+                key: String?,
+                mode: String?,
+                serviceName: String?,
                 authority: String?
-            ): String {
-                var sni = ""
-                network = transport
+            ): String? {
+                var sni: String? = null
+                network = if (transport.isEmpty()) NetworkType.TCP.type else transport
                 when (network) {
-                    "tcp" -> {
+                    NetworkType.TCP.type -> {
                         val tcpSetting = TcpSettingsBean()
-                        if (headerType == HTTP) {
-                            tcpSetting.header.type = HTTP
+                        if (headerType == AppConfig.HEADER_TYPE_HTTP) {
+                            tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP
                             if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
                                 val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
-                                requestObj.headers.Host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                                requestObj.path = (path.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                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
                     }
 
-                    "kcp" -> {
+                    NetworkType.KCP.type -> {
                         val kcpsetting = KcpSettingsBean()
                         kcpsetting.header.type = headerType ?: "none"
                         if (seed.isNullOrEmpty()) {
@@ -344,55 +388,55 @@ data class V2rayConfig(
                         kcpSettings = kcpsetting
                     }
 
-                    "ws" -> {
+                    NetworkType.WS.type -> {
                         val wssetting = WsSettingsBean()
                         wssetting.headers.Host = host.orEmpty()
-                        sni = wssetting.headers.Host
+                        sni = host
                         wssetting.path = path ?: "/"
                         wsSettings = wssetting
                     }
 
-                    "httpupgrade" -> {
+                    NetworkType.HTTP_UPGRADE.type -> {
                         val httpupgradeSetting = HttpupgradeSettingsBean()
                         httpupgradeSetting.host = host.orEmpty()
-                        sni = httpupgradeSetting.host
+                        sni = host
                         httpupgradeSetting.path = path ?: "/"
                         httpupgradeSettings = httpupgradeSetting
                     }
 
-                    "splithttp" -> {
-                        val splithttpSetting = SplithttpSettingsBean()
-                        splithttpSetting.host = host.orEmpty()
-                        sni = splithttpSetting.host
-                        splithttpSetting.path = path ?: "/"
-                        splithttpSettings = splithttpSetting
+                    NetworkType.XHTTP.type -> {
+                        val xhttpSetting = XhttpSettingsBean()
+                        xhttpSetting.host = host.orEmpty()
+                        sni = host
+                        xhttpSetting.path = path ?: "/"
+                        xhttpSettings = xhttpSetting
                     }
 
-                    "h2", "http" -> {
-                        network = "h2"
+                    NetworkType.H2.type, NetworkType.HTTP.type -> {
+                        network = NetworkType.H2.type
                         val h2Setting = HttpSettingsBean()
-                        h2Setting.host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
-                        sni = h2Setting.host.getOrNull(0) ?: sni
+                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                        sni = h2Setting.host.getOrNull(0)
                         h2Setting.path = path ?: "/"
                         httpSettings = h2Setting
                     }
 
-                    "quic" -> {
-                        val quicsetting = QuicSettingBean()
-                        quicsetting.security = quicSecurity ?: "none"
-                        quicsetting.key = key.orEmpty()
-                        quicsetting.header.type = headerType ?: "none"
-                        quicSettings = quicsetting
-                    }
+//                    "quic" -> {
+//                        val quicsetting = QuicSettingBean()
+//                        quicsetting.security = quicSecurity ?: "none"
+//                        quicsetting.key = key.orEmpty()
+//                        quicsetting.header.type = headerType ?: "none"
+//                        quicSettings = quicsetting
+//                    }
 
-                    "grpc" -> {
+                    NetworkType.GRPC.type -> {
                         val grpcSetting = GrpcSettingsBean()
                         grpcSetting.multiMode = mode == "multi"
                         grpcSetting.serviceName = serviceName.orEmpty()
                         grpcSetting.authority = authority.orEmpty()
                         grpcSetting.idle_timeout = 60
                         grpcSetting.health_check_timeout = 20
-                        sni = authority.orEmpty()
+                        sni = authority
                         grpcSettings = grpcSetting
                     }
                 }
@@ -400,23 +444,30 @@ data class V2rayConfig(
             }
 
             fun populateTlsSettings(
-                streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?,
-                publicKey: String?, shortId: String?, spiderX: String?
+                streamSecurity: String,
+                allowInsecure: Boolean,
+                sni: String?,
+                fingerprint: String?,
+                alpns: String?,
+                publicKey: String?,
+                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 == TLS) {
+                if (security == AppConfig.TLS) {
                     tlsSettings = tlsSetting
                     realitySettings = null
-                } else if (security == REALITY) {
+                } else if (security == AppConfig.REALITY) {
                     tlsSettings = null
                     realitySettings = tlsSetting
                 }
@@ -434,16 +485,16 @@ data class V2rayConfig(
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.get(0)?.address
+                return settings?.vnext?.first()?.address
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
-                return settings?.servers?.get(0)?.address
+                return settings?.servers?.first()?.address
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.get(0)?.endpoint?.substringBeforeLast(":")
+                return settings?.peers?.first()?.endpoint?.substringBeforeLast(":")
             }
             return null
         }
@@ -452,16 +503,16 @@ data class V2rayConfig(
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.get(0)?.port
+                return settings?.vnext?.first()?.port
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
-                return settings?.servers?.get(0)?.port
+                return settings?.servers?.first()?.port
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.get(0)?.endpoint?.substringAfterLast(":")?.toInt()
+                return settings?.peers?.first()?.endpoint?.substringAfterLast(":")?.toInt()
             }
             return null
         }
@@ -476,16 +527,16 @@ data class V2rayConfig(
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.get(0)?.users?.get(0)?.id
+                return settings?.vnext?.first()?.users?.first()?.id
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
-                return settings?.servers?.get(0)?.password
+                return settings?.servers?.first()?.password
             } else if (protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
             ) {
-                return settings?.servers?.get(0)?.users?.get(0)?.pass
+                return settings?.servers?.first()?.users?.first()?.pass
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.secretKey
             }
@@ -494,14 +545,14 @@ data class V2rayConfig(
 
         fun getSecurityEncryption(): String? {
             return when {
-                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.security
-                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.encryption
-                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.get(0)?.method
+                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.first()?.users?.first()?.security
+                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.first()?.users?.first()?.encryption
+                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.first()?.method
                 else -> null
             }
         }
 
-        fun getTransportSettingDetails(): List<String>? {
+        fun getTransportSettingDetails(): List<String?>? {
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
@@ -509,7 +560,7 @@ data class V2rayConfig(
             ) {
                 val transport = streamSettings?.network ?: return null
                 return when (transport) {
-                    "tcp" -> {
+                    NetworkType.TCP.type -> {
                         val tcpSetting = streamSettings?.tcpSettings ?: return null
                         listOf(
                             tcpSetting.header.type,
@@ -518,7 +569,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    "kcp" -> {
+                    NetworkType.KCP.type -> {
                         val kcpSetting = streamSettings?.kcpSettings ?: return null
                         listOf(
                             kcpSetting.header.type,
@@ -527,7 +578,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    "ws" -> {
+                    NetworkType.WS.type -> {
                         val wsSetting = streamSettings?.wsSettings ?: return null
                         listOf(
                             "",
@@ -536,7 +587,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    "httpupgrade" -> {
+                    NetworkType.HTTP_UPGRADE.type -> {
                         val httpupgradeSetting = streamSettings?.httpupgradeSettings ?: return null
                         listOf(
                             "",
@@ -545,16 +596,16 @@ data class V2rayConfig(
                         )
                     }
 
-                    "splithttp" -> {
-                        val splithttpSetting = streamSettings?.splithttpSettings ?: return null
+                    NetworkType.XHTTP.type -> {
+                        val xhttpSettings = streamSettings?.xhttpSettings ?: return null
                         listOf(
                             "",
-                            splithttpSetting.host,
-                            splithttpSetting.path
+                            xhttpSettings.host,
+                            xhttpSettings.path
                         )
                     }
 
-                    "h2" -> {
+                    NetworkType.H2.type -> {
                         val h2Setting = streamSettings?.httpSettings ?: return null
                         listOf(
                             "",
@@ -563,16 +614,16 @@ data class V2rayConfig(
                         )
                     }
 
-                    "quic" -> {
-                        val quicSetting = streamSettings?.quicSettings ?: return null
-                        listOf(
-                            quicSetting.header.type,
-                            quicSetting.security,
-                            quicSetting.key
-                        )
-                    }
+//                    "quic" -> {
+//                        val quicSetting = streamSettings?.quicSettings ?: return null
+//                        listOf(
+//                            quicSetting.header.type,
+//                            quicSetting.security,
+//                            quicSetting.key
+//                        )
+//                    }
 
-                    "grpc" -> {
+                    NetworkType.GRPC.type -> {
                         val grpcSetting = streamSettings?.grpcSettings ?: return null
                         listOf(
                             if (grpcSetting.multiMode == true) "multi" else "gun",
@@ -601,7 +652,8 @@ data class V2rayConfig(
             var port: Int? = null,
             var domains: List<String>? = null,
             var expectIPs: List<String>? = null,
-            val clientIp: String? = null
+            val clientIp: String? = null,
+            val skipFallback: Boolean? = null,
         )
     }
 

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

@@ -93,4 +93,6 @@ inline fun <reified T : Serializable> Bundle.serializable(key: String): T? = whe
 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
-}
+}
+
+fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty())

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

@@ -0,0 +1,21 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.util.JsonUtil
+
+object CustomFmt : FmtBase() {
+    fun parse(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.CUSTOM)
+
+        val fullConfig = JsonUtil.fromJson(str, V2rayConfig::class.java)
+        val outbound = fullConfig.getProxyOutbound()
+
+        config.remarks = fullConfig?.remarks ?: System.currentTimeMillis().toString()
+        config.server = outbound?.getServerAddress()
+        config.serverPort = outbound?.getServerPort().toString()
+
+        return config
+    }
+}

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

@@ -0,0 +1,125 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.util.Utils
+import java.net.URI
+
+open class FmtBase {
+    fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, String>?): String {
+        val query = if (dicQuery != null)
+            ("?" + dicQuery.toList().joinToString(
+                separator = "&",
+                transform = { it.first + "=" + Utils.urlEncode(it.second) }))
+        else ""
+
+        val url = String.format(
+            "%s@%s:%s",
+            Utils.urlEncode(userInfo ?: ""),
+            Utils.getIpv6Address(config.server),
+            config.serverPort
+        )
+
+        return "${url}${query}#${Utils.urlEncode(config.remarks)}"
+    }
+
+    fun getQueryParam(uri: URI): Map<String, String> {
+        return uri.rawQuery.split("&")
+            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
+    }
+
+    fun getItemFormQuery(config: ProfileItem, queryParam: Map<String, String>, allowInsecure: Boolean) {
+        config.network = queryParam["type"] ?: NetworkType.TCP.type
+        config.headerType = queryParam["headerType"]
+        config.host = queryParam["host"]
+        config.path = queryParam["path"]
+
+        config.seed = queryParam["seed"]
+        config.quicSecurity = queryParam["quicSecurity"]
+        config.quicKey = queryParam["key"]
+        config.mode = queryParam["mode"]
+        config.serviceName = queryParam["serviceName"]
+        config.authority = queryParam["authority"]
+        config.xhttpMode = queryParam["mode"]
+        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 {
+            queryParam["allowInsecure"].orEmpty() == "1"
+        }
+        config.sni = queryParam["sni"]
+        config.fingerPrint = queryParam["fp"]
+        config.alpn = queryParam["alpn"]
+        config.publicKey = queryParam["pbk"]
+        config.shortId = queryParam["sid"]
+        config.spiderX = queryParam["spx"]
+        config.flow = queryParam["flow"]
+    }
+
+    fun getQueryDic(config: ProfileItem): HashMap<String, String> {
+        val dicQuery = HashMap<String, String>()
+        dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
+        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.fingerPrint.let { if (it.isNotNullEmpty()) dicQuery["fp"] = it.orEmpty() }
+        config.publicKey.let { if (it.isNotNullEmpty()) dicQuery["pbk"] = it.orEmpty() }
+        config.shortId.let { if (it.isNotNullEmpty()) dicQuery["sid"] = it.orEmpty() }
+        config.spiderX.let { if (it.isNotNullEmpty()) dicQuery["spx"] = it.orEmpty() }
+        config.flow.let { if (it.isNotNullEmpty()) dicQuery["flow"] = it.orEmpty() }
+
+        val networkType = NetworkType.fromString(config.network)
+        dicQuery["type"] = networkType.type
+
+        when (networkType) {
+            NetworkType.TCP -> {
+                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
+                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+            }
+
+            NetworkType.KCP -> {
+                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
+                config.seed.let { if (it.isNotNullEmpty()) dicQuery["seed"] = it.orEmpty() }
+            }
+
+            NetworkType.WS, NetworkType.HTTP_UPGRADE -> {
+                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+            }
+
+             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() }
+                config.xhttpExtra.let { if (it.isNotNullEmpty()) dicQuery["extra"] = it.orEmpty() }
+            }
+
+            NetworkType.HTTP, NetworkType.H2 -> {
+                dicQuery["type"] = "http"
+                config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
+                config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
+            }
+
+//            NetworkType.QUIC -> {
+//                dicQuery["headerType"] = config.headerType?.ifEmpty { "none" }.orEmpty()
+//                config.quicSecurity.let { if (it.isNotNullEmpty()) dicQuery["quicSecurity"] = it.orEmpty() }
+//                config.quicKey.let { if (it.isNotNullEmpty()) dicQuery["key"] = it.orEmpty() }
+//            }
+
+            NetworkType.GRPC -> {
+                config.mode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
+                config.authority.let { if (it.isNotNullEmpty()) dicQuery["authority"] = it.orEmpty() }
+                config.serviceName.let { if (it.isNotNullEmpty()) dicQuery["serviceName"] = it.orEmpty() }
+            }
+        }
+
+        return dicQuery
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.extension.isNotNullEmpty
+import kotlin.text.orEmpty
+
+object HttpFmt : FmtBase() {
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.HTTP)
+
+        outboundBean?.settings?.servers?.first()?.let { server ->
+            server.address = profileItem.server.orEmpty()
+            server.port = profileItem.serverPort.orEmpty().toInt()
+            if (profileItem.username.isNotNullEmpty()) {
+                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
+                socksUsersBean.user = profileItem.username.orEmpty()
+                socksUsersBean.pass = profileItem.password.orEmpty()
+                server.users = listOf(socksUsersBean)
+            }
+        }
+
+        return outboundBean
+    }
+
+
+}

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

@@ -0,0 +1,120 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.Hysteria2Bean
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.Utils
+import java.net.URI
+
+object Hysteria2Fmt : FmtBase() {
+    fun parse(str: String): ProfileItem? {
+        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val config = ProfileItem.create(EConfigType.HYSTERIA2)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+        config.password = uri.userInfo
+        config.security = AppConfig.TLS
+
+        if (!uri.rawQuery.isNullOrEmpty()) {
+            val queryParam = getQueryParam(uri)
+
+            config.security = queryParam["security"] ?: AppConfig.TLS
+            config.insecure = if (queryParam["insecure"].isNullOrEmpty()) {
+                allowInsecure
+            } else {
+                queryParam["insecure"].orEmpty() == "1"
+            }
+            config.sni = queryParam["sni"]
+            config.alpn = queryParam["alpn"]
+
+            config.obfsPassword = queryParam["obfs-password"]
+            config.portHopping = queryParam["mport"]
+            config.pinSHA256 = queryParam["pinSHA256"]
+
+        }
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val dicQuery = HashMap<String, String>()
+
+        config.security.let { if (it != null) dicQuery["security"] = it }
+        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
+        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
+        config.insecure.let { dicQuery["insecure"] = if (it == true) "1" else "0" }
+
+        if (config.obfsPassword.isNotNullEmpty()) {
+            dicQuery["obfs"] = "salamander"
+            dicQuery["obfs-password"] = config.obfsPassword.orEmpty()
+        }
+        if (config.portHopping.isNotNullEmpty()) {
+            dicQuery["mport"] = config.portHopping.orEmpty()
+        }
+        if (config.pinSHA256.isNotNullEmpty()) {
+            dicQuery["pinSHA256"] = config.pinSHA256.orEmpty()
+        }
+
+        return toUri(config, config.password, dicQuery)
+    }
+
+    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
+
+        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
+            Hysteria2Bean.ObfsBean(
+                type = "salamander",
+                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
+                    password = config.obfsPassword
+                )
+            )
+
+        val transport = if (config.portHopping.isNullOrEmpty()) null else
+            Hysteria2Bean.TransportBean(
+                type = "udp",
+                udp = Hysteria2Bean.TransportBean.TransportUdpBean(
+                    hopInterval = (config.portHoppingInterval ?: "30") + "s"
+                )
+            )
+
+        val server =
+            if (config.portHopping.isNullOrEmpty())
+                config.getServerAddressAndPort()
+            else
+                Utils.getIpv6Address(config.server) + ":" + config.portHopping
+
+        val bean = Hysteria2Bean(
+            server = server,
+            auth = config.password,
+            obfs = obfs,
+            transport = transport,
+            socks5 = Hysteria2Bean.Socks5Bean(
+                listen = "$LOOPBACK:${socksPort}",
+            ),
+            http = Hysteria2Bean.Socks5Bean(
+                listen = "$LOOPBACK:${socksPort}",
+            ),
+            tls = Hysteria2Bean.TlsBean(
+                sni = config.sni ?: config.server,
+                insecure = config.insecure,
+                pinSHA256 = if (config.pinSHA256.isNullOrEmpty()) null else config.pinSHA256
+            )
+        )
+        return bean
+    }
+
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.HYSTERIA2)
+        return outboundBean
+    }
+
+}

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

@@ -0,0 +1,139 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.util.Utils
+import java.net.URI
+
+object ShadowsocksFmt : FmtBase() {
+    fun parse(str: String): ProfileItem? {
+        return parseSip002(str) ?: parseLegacy(str)
+    }
+
+    fun parseSip002(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        if (uri.idnHost.isEmpty()) return null
+        if (uri.port <= 0) return null
+        if (uri.userInfo.isNullOrEmpty()) return null
+
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+
+        val result = if (uri.userInfo.contains(":")) {
+            uri.userInfo.split(":", limit = 2)
+        } else {
+            Utils.decode(uri.userInfo).split(":", limit = 2)
+        }
+        if (result.count() == 2) {
+            config.method = result.first()
+            config.password = result.last()
+        }
+
+        if (!uri.rawQuery.isNullOrEmpty()) {
+            val queryParam = getQueryParam(uri)
+            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 = queryPairs["obfs-host"]
+                config.path = queryPairs["path"]
+            }
+        }
+
+        return config
+    }
+
+    fun parseLegacy(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
+        var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
+        val indexSplit = result.indexOf("#")
+        if (indexSplit > 0) {
+            try {
+                config.remarks =
+                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+
+            result = result.substring(0, indexSplit)
+        }
+
+        //part decode
+        val indexS = result.indexOf("@")
+        result = if (indexS > 0) {
+            Utils.decode(result.substring(0, indexS)) + result.substring(
+                indexS,
+                result.length
+            )
+        } else {
+            Utils.decode(result)
+        }
+
+        val legacyPattern = "^(.+?):(.*)@(.+?):(\\d+?)/?$".toRegex()
+        val match = legacyPattern.matchEntire(result) ?: return null
+
+        config.server = match.groupValues[3].removeSurrounding("[", "]")
+        config.serverPort = match.groupValues[4]
+        config.password = match.groupValues[2]
+        config.method = match.groupValues[1].lowercase()
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val pw = "${config.method}:${config.password}"
+
+        return toUri(config, Utils.encode(pw), null)
+    }
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
+
+        outboundBean?.settings?.servers?.first()?.let { server ->
+            server.address = profileItem.server.orEmpty()
+            server.port = profileItem.serverPort.orEmpty().toInt()
+            server.password = profileItem.password
+            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
+    }
+
+
+}

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

@@ -0,0 +1,62 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.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() {
+    fun parse(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.SOCKS)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        if (uri.idnHost.isEmpty()) return null
+        if (uri.port <= 0) return null
+
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+
+        if (uri.userInfo?.isEmpty() == false) {
+            val result = Utils.decode(uri.userInfo).split(":", limit = 2)
+            if (result.count() == 2) {
+                config.username = result.first()
+                config.password = result.last()
+            }
+        }
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val pw =
+            if (config.username.isNotNullEmpty())
+                "${config.username}:${config.password}"
+            else
+                ":"
+
+        return toUri(config, Utils.encode(pw), null)
+    }
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.SOCKS)
+
+        outboundBean?.settings?.servers?.first()?.let { server ->
+            server.address = profileItem.server.orEmpty()
+            server.port = profileItem.serverPort.orEmpty().toInt()
+            if (profileItem.username.isNotNullEmpty()) {
+                val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
+                socksUsersBean.user = profileItem.username.orEmpty()
+                socksUsersBean.pass = profileItem.password.orEmpty()
+                server.users = listOf(socksUsersBean)
+            }
+        }
+
+        return outboundBean
+    }
+
+}

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

@@ -0,0 +1,81 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.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() {
+    fun parse(str: String): ProfileItem? {
+        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val config = ProfileItem.create(EConfigType.TROJAN)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+        config.password = uri.userInfo
+
+        if (uri.rawQuery.isNullOrEmpty()) {
+            config.network = NetworkType.TCP.type
+            config.security = AppConfig.TLS
+            config.insecure = allowInsecure
+        } else {
+            val queryParam = getQueryParam(uri)
+
+            getItemFormQuery(config, queryParam, allowInsecure)
+            config.security = queryParam["security"] ?: AppConfig.TLS
+        }
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val dicQuery = getQueryDic(config)
+
+        return toUri(config, config.password, dicQuery)
+    }
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.TROJAN)
+
+        outboundBean?.settings?.servers?.first()?.let { server ->
+            server.address = profileItem.server.orEmpty()
+            server.port = profileItem.serverPort.orEmpty().toInt()
+            server.password = profileItem.password
+            server.flow = profileItem.flow
+        }
+
+        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
+    }
+}

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

@@ -0,0 +1,83 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.Utils
+import java.net.URI
+
+object VlessFmt : FmtBase() {
+
+    fun parse(str: String): ProfileItem? {
+        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val config = ProfileItem.create(EConfigType.VLESS)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        if (uri.rawQuery.isNullOrEmpty()) return null
+        val queryParam = getQueryParam(uri)
+
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+        config.password = uri.userInfo
+        config.method = queryParam["encryption"] ?: "none"
+
+        getItemFormQuery(config, queryParam, allowInsecure)
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val dicQuery = getQueryDic(config)
+        dicQuery["encryption"] = config.method ?: "none"
+
+        return toUri(config, config.password, dicQuery)
+    }
+
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.VLESS)
+
+        outboundBean?.settings?.vnext?.first()?.let { vnext ->
+            vnext.address = profileItem.server.orEmpty()
+            vnext.port = profileItem.serverPort.orEmpty().toInt()
+            vnext.users[0].id = profileItem.password.orEmpty()
+            vnext.users[0].encryption = profileItem.method
+            vnext.users[0].flow = profileItem.flow
+        }
+
+        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?.xhttpSettings?.mode = profileItem.xhttpMode
+        outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra)
+
+        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
+    }
+
+
+}

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

@@ -0,0 +1,183 @@
+package com.v2ray.ang.fmt
+
+import android.text.TextUtils
+import android.util.Log
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.dto.VmessQRCode
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.extension.isNotNullEmpty
+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() {
+    fun parse(str: String): ProfileItem? {
+        if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
+            return parseVmessStd(str)
+        }
+
+        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val config = ProfileItem.create(EConfigType.VMESS)
+
+        var result = str.replace(EConfigType.VMESS.protocolScheme, "")
+        result = Utils.decode(result)
+        if (TextUtils.isEmpty(result)) {
+            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_decoding_failed")
+            return null
+        }
+        val vmessQRCode = JsonUtil.fromJson(result, VmessQRCode::class.java)
+        // Although VmessQRCode fields are non null, looks like Gson may still create null fields
+        if (TextUtils.isEmpty(vmessQRCode.add)
+            || TextUtils.isEmpty(vmessQRCode.port)
+            || TextUtils.isEmpty(vmessQRCode.id)
+            || TextUtils.isEmpty(vmessQRCode.net)
+        ) {
+            Log.d(AppConfig.ANG_PACKAGE, "R.string.toast_incorrect_protocol")
+            return null
+        }
+
+        config.remarks = vmessQRCode.ps
+        config.server = vmessQRCode.add
+        config.serverPort = vmessQRCode.port
+        config.password = vmessQRCode.id
+        config.method = if (TextUtils.isEmpty(vmessQRCode.scy)) AppConfig.DEFAULT_SECURITY else vmessQRCode.scy
+
+        config.network = vmessQRCode.net ?: NetworkType.TCP.type
+        config.headerType = vmessQRCode.type
+        config.host = vmessQRCode.host
+        config.path = vmessQRCode.path
+
+        when (NetworkType.fromString(config.network)) {
+            NetworkType.KCP -> {
+                config.seed = vmessQRCode.path
+            }
+
+//            NetworkType.QUIC -> {
+//                config.quicSecurity = vmessQRCode.host
+//                config.quicKey = vmessQRCode.path
+//            }
+
+            NetworkType.GRPC -> {
+                config.mode = vmessQRCode.type
+                config.serviceName = vmessQRCode.path
+                config.authority = vmessQRCode.host
+            }
+            else -> {}
+        }
+
+        config.security = vmessQRCode.tls
+        config.insecure = allowInsecure
+        config.sni = vmessQRCode.sni
+        config.fingerPrint = vmessQRCode.fp
+        config.alpn = vmessQRCode.alpn
+
+        return config
+    }
+
+    fun toUri(config: ProfileItem): String {
+        val vmessQRCode = VmessQRCode()
+
+        vmessQRCode.v = "2"
+        vmessQRCode.ps = config.remarks
+        vmessQRCode.add = config.server.orEmpty()
+        vmessQRCode.port = config.serverPort.orEmpty()
+        vmessQRCode.id = config.password.orEmpty()
+        vmessQRCode.scy = config.method.orEmpty()
+        vmessQRCode.aid = "0"
+
+        vmessQRCode.net = config.network.orEmpty()
+        vmessQRCode.type = config.headerType.orEmpty()
+        when (NetworkType.fromString(config.network)) {
+            NetworkType.KCP -> {
+                vmessQRCode.path = config.seed.orEmpty()
+            }
+
+//            NetworkType.QUIC -> {
+//                vmessQRCode.host = config.quicSecurity.orEmpty()
+//                vmessQRCode.path = config.quicKey.orEmpty()
+//            }
+
+            NetworkType.GRPC -> {
+                vmessQRCode.type = config.mode.orEmpty()
+                vmessQRCode.path = config.serviceName.orEmpty()
+                vmessQRCode.host = config.authority.orEmpty()
+            }
+            else -> {}
+        }
+
+        config.host.let { if (it.isNotNullEmpty()) vmessQRCode.host = it.orEmpty() }
+        config.path.let { if (it.isNotNullEmpty()) vmessQRCode.path = it.orEmpty() }
+
+        vmessQRCode.tls = config.security.orEmpty()
+        vmessQRCode.sni = config.sni.orEmpty()
+        vmessQRCode.fp = config.fingerPrint.orEmpty()
+        vmessQRCode.alpn = config.alpn.orEmpty()
+
+        val json = JsonUtil.toJson(vmessQRCode)
+        return Utils.encode(json)
+    }
+
+    fun parseVmessStd(str: String): ProfileItem? {
+        val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
+        val config = ProfileItem.create(EConfigType.VMESS)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        if (uri.rawQuery.isNullOrEmpty()) return null
+        val queryParam = getQueryParam(uri)
+
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+        config.password = uri.userInfo
+        config.method = AppConfig.DEFAULT_SECURITY
+
+        getItemFormQuery(config, queryParam, allowInsecure)
+
+        return config
+    }
+
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.VMESS)
+
+        outboundBean?.settings?.vnext?.first()?.let { vnext ->
+            vnext.address = profileItem.server.orEmpty()
+            vnext.port = profileItem.serverPort.orEmpty().toInt()
+            vnext.users[0].id = profileItem.password.orEmpty()
+            vnext.users[0].security = 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,
+            null,
+            null,
+            null
+        )
+
+        return outboundBean
+    }
+
+}

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

@@ -0,0 +1,124 @@
+package com.v2ray.ang.fmt
+
+import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
+import com.v2ray.ang.dto.EConfigType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.extension.idnHost
+import com.v2ray.ang.util.Utils
+import java.net.URI
+import kotlin.text.orEmpty
+
+object WireguardFmt : FmtBase() {
+    fun parse(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.WIREGUARD)
+
+        val uri = URI(Utils.fixIllegalUrl(str))
+        if (uri.rawQuery.isNullOrEmpty()) return null
+        val queryParam = getQueryParam(uri)
+
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
+        config.server = uri.idnHost
+        config.serverPort = uri.port.toString()
+
+        config.secretKey = uri.userInfo.orEmpty()
+        config.localAddress = (queryParam["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4)
+        config.publicKey = queryParam["publickey"].orEmpty()
+        config.preSharedKey = queryParam["presharedkey"].orEmpty()
+        config.mtu = Utils.parseInt(queryParam["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
+        config.reserved = (queryParam["reserved"] ?: "0,0,0")
+
+        return config
+    }
+
+    fun parseWireguardConfFile(str: String): ProfileItem? {
+        val config = ProfileItem.create(EConfigType.WIREGUARD)
+
+        val interfaceParams: MutableMap<String, String> = mutableMapOf()
+        val peerParams: MutableMap<String, String> = mutableMapOf()
+
+        var currentSection: String? = null
+
+        str.lines().forEach { line ->
+            val trimmedLine = line.trim()
+
+            if (trimmedLine.isEmpty() || trimmedLine.startsWith("#")) {
+                return@forEach
+            }
+
+            when {
+                trimmedLine.startsWith("[Interface]", ignoreCase = true) -> currentSection = "Interface"
+                trimmedLine.startsWith("[Peer]", ignoreCase = true) -> currentSection = "Peer"
+                else -> {
+                    if (currentSection != null) {
+                        val parts = trimmedLine.split("=", limit = 2).map { it.trim() }
+                        if (parts.size == 2) {
+                            val key = parts[0].lowercase()
+                            val value = parts[1]
+                            when (currentSection) {
+                                "Interface" -> interfaceParams[key] = value
+                                "Peer" -> peerParams[key] = value
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        config.secretKey = interfaceParams["privatekey"].orEmpty()
+        config.remarks = System.currentTimeMillis().toString()
+        config.localAddress = interfaceParams["address"] ?: WIREGUARD_LOCAL_ADDRESS_V4
+        config.mtu = Utils.parseInt(interfaceParams["mtu"] ?: AppConfig.WIREGUARD_LOCAL_MTU)
+        config.publicKey = peerParams["publickey"].orEmpty()
+        config.preSharedKey = peerParams["presharedkey"].orEmpty()
+        val endpoint = peerParams["endpoint"].orEmpty()
+        val endpointParts = endpoint.split(":", limit = 2)
+        if (endpointParts.size == 2) {
+            config.server = endpointParts[0]
+            config.serverPort = endpointParts[1]
+        } else {
+            config.server = endpoint
+            config.serverPort = ""
+        }
+        config.reserved = peerParams["reserved"] ?: "0,0,0"
+
+        return config
+    }
+
+    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
+        val outboundBean = OutboundBean.create(EConfigType.WIREGUARD)
+
+        outboundBean?.settings?.let { wireguard ->
+            wireguard.secretKey = profileItem.secretKey
+            wireguard.address = (profileItem.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4).split(",")
+            wireguard.peers?.firstOrNull()?.let { peer ->
+                peer.publicKey = profileItem.publicKey.orEmpty()
+                peer.preSharedKey = profileItem.preSharedKey.orEmpty()
+                peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
+            }
+            wireguard.mtu = profileItem.mtu
+            wireguard.reserved = profileItem.reserved?.split(",")?.map { it.toInt() }
+        }
+
+        return outboundBean
+    }
+
+    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["address"] = Utils.removeWhiteSpace(config.localAddress).orEmpty()
+        if (config.mtu != null) {
+            dicQuery["mtu"] = config.mtu.toString()
+        }
+        if (config.preSharedKey != null) {
+            dicQuery["presharedkey"] = Utils.removeWhiteSpace(config.preSharedKey).orEmpty()
+        }
+
+        return toUri(config, config.secretKey, dicQuery)
+    }
+}

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

@@ -1,29 +1,25 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.text.TextUtils
 import android.util.Log
-
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonPrimitive
-import com.google.gson.JsonSerializationContext
-import com.google.gson.JsonSerializer
-import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.*
-import com.v2ray.ang.util.fmt.Hysteria2Fmt
-import com.v2ray.ang.util.fmt.ShadowsocksFmt
-import com.v2ray.ang.util.fmt.SocksFmt
-import com.v2ray.ang.util.fmt.TrojanFmt
-import com.v2ray.ang.util.fmt.VlessFmt
-import com.v2ray.ang.util.fmt.VmessFmt
-import com.v2ray.ang.util.fmt.WireguardFmt
-import java.lang.reflect.Type
+import com.v2ray.ang.fmt.CustomFmt
+import com.v2ray.ang.fmt.Hysteria2Fmt
+import com.v2ray.ang.fmt.ShadowsocksFmt
+import com.v2ray.ang.fmt.SocksFmt
+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.JsonUtil
+import com.v2ray.ang.util.QRCodeDecoder
+import com.v2ray.ang.util.Utils
 import java.net.URI
-import java.util.*
 
 object AngConfigManager {
     /**
@@ -33,7 +29,7 @@ object AngConfigManager {
         str: String?,
         subid: String,
         subItem: SubscriptionItem?,
-        removedSelectedServer: ServerConfig?
+        removedSelectedServer: ProfileItem?
     ): Int {
         try {
             if (str == null || TextUtils.isEmpty(str)) {
@@ -71,12 +67,7 @@ object AngConfigManager {
             config.subscriptionId = subid
             val guid = MmkvManager.encodeServerConfig("", config)
             if (removedSelectedServer != null &&
-                config.getProxyOutbound()
-                    ?.getServerAddress() == removedSelectedServer.getProxyOutbound()
-                    ?.getServerAddress() &&
-                config.getProxyOutbound()
-                    ?.getServerPort() == removedSelectedServer.getProxyOutbound()
-                    ?.getServerPort()
+                config.server == removedSelectedServer.server && config.serverPort == removedSelectedServer.serverPort
             ) {
                 MmkvManager.setSelectServer(guid)
             }
@@ -147,11 +138,11 @@ object AngConfigManager {
             if (sb.count() > 0) {
                 Utils.setClipboard(context, sb.toString())
             }
+            return sb.lines().count()
         } catch (e: Exception) {
             e.printStackTrace()
             return -1
         }
-        return 0
     }
 
     /**
@@ -177,8 +168,15 @@ object AngConfigManager {
     fun shareFullContent2Clipboard(context: Context, guid: String?): Int {
         try {
             if (guid == null) return -1
-            val result = V2rayConfigUtil.getV2rayConfig(context, guid)
+            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
@@ -218,8 +216,9 @@ object AngConfigManager {
 
             var count = 0
             servers.lines()
+                .distinct()
                 .forEach { str ->
-                    if (str.startsWith(AppConfig.PROTOCOL_HTTP) || str.startsWith(AppConfig.PROTOCOL_HTTPS)) {
+                    if (Utils.isValidSubUrl(str)) {
                         count += importUrlAsSubscription(str)
                     }
                 }
@@ -255,6 +254,7 @@ object AngConfigManager {
             val subItem = MmkvManager.decodeSubscription(subid)
             var count = 0
             servers.lines()
+                .distinct()
                 .reversed()
                 .forEach {
                     val resId = parseConfig(it, subid, subItem, removedSelectedServer)
@@ -284,15 +284,10 @@ object AngConfigManager {
                 if (serverList.isNotEmpty()) {
                     var count = 0
                     for (srv in serverList.reversed()) {
-                        val config = ServerConfig.create(EConfigType.CUSTOM)
-                        config.fullConfig =
-                            JsonUtil.fromJson(JsonUtil.toJson(srv), V2rayConfig::class.java)
-                        config.remarks = config.fullConfig?.remarks
-                            ?: ("%04d-".format(count + 1) + System.currentTimeMillis()
-                                .toString())
+                        val config = CustomFmt.parse(JsonUtil.toJson(srv)) ?: continue
                         config.subscriptionId = subid
                         val key = MmkvManager.encodeServerConfig("", config)
-                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv))
+                        MmkvManager.encodeServerRaw(key, JsonUtil.toJsonPretty(srv) ?: "")
                         count += 1
                     }
                     return count
@@ -303,10 +298,8 @@ object AngConfigManager {
 
             try {
                 // For compatibility
-                val config = ServerConfig.create(EConfigType.CUSTOM)
+                val config = CustomFmt.parse(server) ?: return 0
                 config.subscriptionId = subid
-                config.fullConfig = JsonUtil.fromJson(server, V2rayConfig::class.java)
-                config.remarks = config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -316,9 +309,7 @@ object AngConfigManager {
             return 0
         } else if (server.startsWith("[Interface]") && server.contains("[Peer]")) {
             try {
-                val config = WireguardFmt.parseWireguardConfFile(server)
-                    ?: return R.string.toast_incorrect_protocol
-                config.fullConfig?.remarks ?: System.currentTimeMillis().toString()
+                val config = WireguardFmt.parseWireguardConfFile(server) ?: return R.string.toast_incorrect_protocol
                 val key = MmkvManager.encodeServerConfig("", config)
                 MmkvManager.encodeServerRaw(key, server)
                 return 1
@@ -365,7 +356,8 @@ object AngConfigManager {
                 val httpPort = SettingsManager.getHttpPort()
                 Utils.getUrlContentWithCustomUserAgent(url, 30000, httpPort)
             } catch (e: Exception) {
-                e.printStackTrace()
+                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error, try……")
+                //e.printStackTrace()
                 ""
             }
             if (configText.isEmpty()) {

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

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

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

@@ -1,4 +1,4 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler
 
 
 import com.tencent.mmkv.MMKV
@@ -8,16 +8,17 @@ import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.ServerAffiliationInfo
-import com.v2ray.ang.dto.ServerConfig
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.Utils
 
 object MmkvManager {
 
     //region private
 
+    //private const val ID_PROFILE_CONFIG = "PROFILE_CONFIG"
     private const val ID_MAIN = "MAIN"
-    private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
-    private const val ID_PROFILE_CONFIG = "PROFILE_CONFIG"
+    private const val ID_PROFILE_FULL_CONFIG = "PROFILE_FULL_CONFIG"
     private const val ID_SERVER_RAW = "SERVER_RAW"
     private const val ID_SERVER_AFF = "SERVER_AFF"
     private const val ID_SUB = "SUB"
@@ -27,14 +28,14 @@ object MmkvManager {
     private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
     private const val KEY_SUB_IDS = "SUB_IDS"
 
+    //private val profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
     private val mainStorage by lazy { MMKV.mmkvWithID(ID_MAIN, MMKV.MULTI_PROCESS_MODE) }
-    val settingsStorage by lazy { MMKV.mmkvWithID(ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
-    private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
-    private val profileStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_CONFIG, MMKV.MULTI_PROCESS_MODE) }
+    private val profileFullStorage by lazy { MMKV.mmkvWithID(ID_PROFILE_FULL_CONFIG, MMKV.MULTI_PROCESS_MODE) }
+    private val serverRawStorage by lazy { MMKV.mmkvWithID(ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
     private val serverAffStorage by lazy { MMKV.mmkvWithID(ID_SERVER_AFF, MMKV.MULTI_PROCESS_MODE) }
     private val subStorage by lazy { MMKV.mmkvWithID(ID_SUB, MMKV.MULTI_PROCESS_MODE) }
     private val assetStorage by lazy { MMKV.mmkvWithID(ID_ASSET, MMKV.MULTI_PROCESS_MODE) }
-    private val serverRawStorage by lazy { MMKV.mmkvWithID(ID_SERVER_RAW, MMKV.MULTI_PROCESS_MODE) }
+    private val settingsStorage by lazy { MMKV.mmkvWithID(ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
 
     //endregion
 
@@ -61,31 +62,32 @@ object MmkvManager {
         }
     }
 
-    fun decodeServerConfig(guid: String): ServerConfig? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = serverStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ServerConfig::class.java)
-    }
 
-    fun decodeProfileConfig(guid: String): ProfileItem? {
+    fun decodeServerConfig(guid: String): ProfileItem? {
         if (guid.isBlank()) {
             return null
         }
-        val json = profileStorage.decodeString(guid)
+        val json = profileFullStorage.decodeString(guid)
         if (json.isNullOrBlank()) {
             return null
         }
         return JsonUtil.fromJson(json, ProfileItem::class.java)
     }
 
-    fun encodeServerConfig(guid: String, config: ServerConfig): String {
+//    fun decodeProfileConfig(guid: String): ProfileLiteItem? {
+//        if (guid.isBlank()) {
+//            return null
+//        }
+//        val json = profileStorage.decodeString(guid)
+//        if (json.isNullOrBlank()) {
+//            return null
+//        }
+//        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
+//    }
+
+    fun encodeServerConfig(guid: String, config: ProfileItem): String {
         val key = guid.ifBlank { Utils.getUuid() }
-        serverStorage.encode(key, JsonUtil.toJson(config))
+        profileFullStorage.encode(key, JsonUtil.toJson(config))
         val serverList = decodeServerList()
         if (!serverList.contains(key)) {
             serverList.add(0, key)
@@ -94,14 +96,14 @@ object MmkvManager {
                 mainStorage.encode(KEY_SELECTED_SERVER, key)
             }
         }
-        val profile = ProfileItem(
-            configType = config.configType,
-            subscriptionId = config.subscriptionId,
-            remarks = config.remarks,
-            server = config.getProxyOutbound()?.getServerAddress(),
-            serverPort = config.getProxyOutbound()?.getServerPort(),
-        )
-        profileStorage.encode(key, JsonUtil.toJson(profile))
+//        val profile = ProfileLiteItem(
+//            configType = config.configType,
+//            subscriptionId = config.subscriptionId,
+//            remarks = config.remarks,
+//            server = config.getProxyOutbound()?.getServerAddress(),
+//            serverPort = config.getProxyOutbound()?.getServerPort(),
+//        )
+//        profileStorage.encode(key, JsonUtil.toJson(profile))
         return key
     }
 
@@ -115,8 +117,8 @@ object MmkvManager {
         val serverList = decodeServerList()
         serverList.remove(guid)
         encodeServerList(serverList)
-        serverStorage.remove(guid)
-        profileStorage.remove(guid)
+        profileFullStorage.remove(guid)
+        //profileStorage.remove(guid)
         serverAffStorage.remove(guid)
     }
 
@@ -124,7 +126,7 @@ object MmkvManager {
         if (subid.isBlank()) {
             return
         }
-        serverStorage.allKeys()?.forEach { key ->
+        profileFullStorage.allKeys()?.forEach { key ->
             decodeServerConfig(key)?.let { config ->
                 if (config.subscriptionId == subid) {
                     removeServer(key)
@@ -162,18 +164,22 @@ object MmkvManager {
         }
     }
 
-    fun removeAllServer() {
+    fun removeAllServer(): Int {
+        val count = profileFullStorage.allKeys()?.count() ?: 0
         mainStorage.clearAll()
-        serverStorage.clearAll()
-        profileStorage.clearAll()
+        profileFullStorage.clearAll()
+        //profileStorage.clearAll()
         serverAffStorage.clearAll()
+        return count
     }
 
-    fun removeInvalidServer(guid: String) {
+    fun removeInvalidServer(guid: String): Int {
+        var count = 0
         if (guid.isNotEmpty()) {
             decodeServerAffiliationInfo(guid)?.let { aff ->
                 if (aff.testDelayMillis < 0L) {
                     removeServer(guid)
+                    count++
                 }
             }
         } else {
@@ -181,10 +187,12 @@ object MmkvManager {
                 decodeServerAffiliationInfo(key)?.let { aff ->
                     if (aff.testDelayMillis < 0L) {
                         removeServer(key)
+                        count++
                     }
                 }
             }
         }
+        return count
     }
 
     fun encodeServerRaw(guid: String, config: String) {
@@ -192,7 +200,7 @@ object MmkvManager {
     }
 
     fun decodeServerRaw(guid: String): String? {
-        return serverRawStorage.decodeString(guid) ?: return null
+        return serverRawStorage.decodeString(guid)
     }
 
     //endregion
@@ -302,9 +310,51 @@ object MmkvManager {
 
     fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
         if (rulesetList.isNullOrEmpty())
-            settingsStorage.encode(PREF_ROUTING_RULESET, "")
+            encodeSettings(PREF_ROUTING_RULESET, "")
         else
-            settingsStorage.encode(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
+            encodeSettings(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
+    }
+
+    //endregion
+    fun encodeSettings(key: String, value: String?): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
+    fun encodeSettings(key: String, value: Int): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
+    fun encodeSettings(key: String, value: Boolean): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
+    fun encodeSettings(key: String, value: MutableSet<String>): Boolean {
+        return settingsStorage.encode(key, value)
+    }
+
+
+    fun decodeSettingsString(key: String): String? {
+        return settingsStorage.decodeString(key)
+    }
+
+    fun decodeSettingsString(key: String, defaultValue: String?): String? {
+        return settingsStorage.decodeString(key, defaultValue)
+    }
+
+    fun decodeSettingsBool(key: String): Boolean {
+        return settingsStorage.decodeBool(key, false)
+    }
+
+    fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
+        return settingsStorage.decodeBool(key, defaultValue)
+    }
+
+    fun decodeSettingsInt(key: String, defaultValue: Int): Int {
+        return settingsStorage.decodeInt(key, defaultValue)
+    }
+
+    fun decodeSettingsStringSet(key: String): MutableSet<String>? {
+        return settingsStorage.decodeStringSet(key)
     }
 
     //endregion
@@ -312,11 +362,11 @@ object MmkvManager {
     //region Others
 
     fun encodeStartOnBoot(startOnBoot: Boolean) {
-        settingsStorage.encode(PREF_IS_BOOTED, startOnBoot)
+        MmkvManager.encodeSettings(PREF_IS_BOOTED, startOnBoot)
     }
 
     fun decodeStartOnBoot(): Boolean {
-        return settingsStorage.decodeBool(PREF_IS_BOOTED, false)
+        return decodeSettingsBool(PREF_IS_BOOTED, false)
     }
 
     //endregion

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

@@ -1,20 +1,28 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler
 
 import android.content.Context
+import android.content.res.AssetManager
 import android.text.TextUtils
-
+import android.util.Log
 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.ProfileItem
+import com.v2ray.ang.dto.RoutingType
 import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.util.MmkvManager.decodeProfileConfig
-import com.v2ray.ang.util.MmkvManager.decodeServerConfig
-import com.v2ray.ang.util.MmkvManager.decodeServerList
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+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
 
 object SettingsManager {
 
@@ -27,13 +35,7 @@ object SettingsManager {
     }
 
     private fun getPresetRoutingRulesets(context: Context, index: Int = 0): MutableList<RulesetItem>? {
-        val fileName = when (index) {
-            0 -> "custom_routing_white"
-            1 -> "custom_routing_black"
-            2 -> "custom_routing_global"
-            3 -> "custom_routing_white_iran"
-            else -> "custom_routing_white"
-        }
+        val fileName = RoutingType.fromIndex(index).fileName
         val assets = Utils.readTextFromAssets(context, fileName)
         if (TextUtils.isEmpty(assets)) {
             return null
@@ -42,12 +44,13 @@ object SettingsManager {
         return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
     }
 
-    fun resetRoutingRulesets(context: Context, index: Int) {
+
+    fun resetRoutingRulesetsFromPresets(context: Context, index: Int) {
         val rulesetList = getPresetRoutingRulesets(context, index) ?: return
         resetRoutingRulesetsCommon(rulesetList)
     }
 
-    fun resetRoutingRulesetsFromClipboard(content: String?): Boolean {
+    fun resetRoutingRulesets(content: String?): Boolean {
         if (content.isNullOrEmpty()) {
             return false
         }
@@ -69,7 +72,7 @@ object SettingsManager {
     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)
             }
         }
@@ -90,11 +93,13 @@ object SettingsManager {
     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
         }
@@ -112,12 +117,23 @@ object SettingsManager {
     }
 
     fun routingRulesetsBypassLan(): Boolean {
+        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
         }
         return exist == true
-    }
+        }
 
     fun swapRoutingRuleset(fromPosition: Int, toPosition: Int) {
         val rulesetList = MmkvManager.decodeRoutingRulesets()
@@ -135,26 +151,51 @@ object SettingsManager {
         MmkvManager.encodeSubsList(subsList)
     }
 
-    fun getServerViaRemarks(remarks: String?): ServerConfig? {
+    fun getServerViaRemarks(remarks: String?): ProfileItem? {
         if (remarks == null) {
             return null
         }
         val serverList = decodeServerList()
         for (guid in serverList) {
-            val profile = decodeProfileConfig(guid)
+            val profile = decodeServerConfig(guid)
             if (profile != null && profile.remarks == remarks) {
-                return decodeServerConfig(guid)
+                return profile
             }
         }
         return null
     }
 
     fun getSocksPort(): Int {
-        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
+        return parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
     }
 
     fun getHttpPort(): Int {
-        return parseInt(settingsStorage?.decodeString(AppConfig.PREF_HTTP_PORT), AppConfig.PORT_HTTP.toInt())
+        return getSocksPort() + (if (Utils.isXray()) 0 else 1)
     }
 
+    fun initAssets(context: Context, assets: AssetManager) {
+        val extFolder = Utils.userAssetPath(context)
+
+        try {
+            val geo = arrayOf("geosite.dat", "geoip.dat")
+            assets.list("")
+                ?.filter { geo.contains(it) }
+                ?.filter { !File(extFolder, it).exists() }
+                ?.forEach {
+                    val target = File(extFolder, it)
+                    assets.open(it).use { input ->
+                        FileOutputStream(target).use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                    Log.i(
+                        ANG_PACKAGE,
+                        "Copied from apk assets folder to ${target.absolutePath}"
+                    )
+                }
+        } catch (e: Exception) {
+            Log.e(ANG_PACKAGE, "asset copy failed", e)
+        }
+
+    }
 }

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

@@ -1,15 +1,30 @@
-package com.v2ray.ang.util
+package com.v2ray.ang.handler
 
 import android.content.Context
 import android.text.TextUtils
 import android.util.Log
-
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.DEFAULT_NETWORK
+import com.v2ray.ang.AppConfig.DNS_ALIDNS_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_ALIDNS_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_DNSPOD_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_DNSPOD_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_GOOGLE_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_GOOGLE_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_QUAD9_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_QUAD9_DOMAIN
+import com.v2ray.ang.AppConfig.DNS_YANDEX_ADDRESSES
+import com.v2ray.ang.AppConfig.DNS_YANDEX_DOMAIN
 import com.v2ray.ang.AppConfig.GEOIP_CN
 import com.v2ray.ang.AppConfig.GEOSITE_CN
-import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
+import com.v2ray.ang.AppConfig.GOOGLEAPIS_CN_DOMAIN
+import com.v2ray.ang.AppConfig.GOOGLEAPIS_COM_DOMAIN
+import com.v2ray.ang.AppConfig.HEADER_TYPE_HTTP
+import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.AppConfig.PROTOCOL_FREEDOM
 import com.v2ray.ang.AppConfig.TAG_BLOCKED
 import com.v2ray.ang.AppConfig.TAG_DIRECT
@@ -19,28 +34,32 @@ 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.ServerConfig
 import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_NETWORK
-import com.v2ray.ang.dto.V2rayConfig.Companion.HTTP
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.extension.isNotNullEmpty
+import com.v2ray.ang.fmt.HttpFmt
+import com.v2ray.ang.fmt.Hysteria2Fmt
+import com.v2ray.ang.fmt.ShadowsocksFmt
+import com.v2ray.ang.fmt.SocksFmt
+import com.v2ray.ang.fmt.TrojanFmt
+import com.v2ray.ang.fmt.VlessFmt
+import com.v2ray.ang.fmt.VmessFmt
+import com.v2ray.ang.fmt.WireguardFmt
+import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.Utils
 
-object V2rayConfigUtil {
+object V2rayConfigManager {
 
     fun getV2rayConfig(context: Context, guid: String): ConfigResult {
         try {
             val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false)
             if (config.configType == EConfigType.CUSTOM) {
-                val raw = MmkvManager.decodeServerRaw(guid)
-                val customConfig = if (raw.isNullOrBlank()) {
-                    config.fullConfig?.toPrettyPrinting() ?: return ConfigResult(false)
-                } else {
-                    raw
-                }
-                val domainPort = config.getProxyOutbound()?.getServerAddressAndPort()
-                return ConfigResult(true, guid, customConfig, domainPort)
+                val raw = MmkvManager.decodeServerRaw(guid) ?: return ConfigResult(false)
+                val domainPort = config.getServerAddressAndPort()
+                return ConfigResult(true, guid, raw, domainPort)
             }
 
             val result = getV2rayNonCustomConfig(context, config)
@@ -53,11 +72,10 @@ object V2rayConfigUtil {
         }
     }
 
-    private fun getV2rayNonCustomConfig(context: Context, config: ServerConfig): ConfigResult {
+    private fun getV2rayNonCustomConfig(context: Context, config: ProfileItem): ConfigResult {
         val result = ConfigResult(false)
 
-        val outbound = config.getProxyOutbound() ?: return result
-        val address = outbound.getServerAddress() ?: return result
+        val address = config.server ?: return result
         if (!Utils.isIpAddress(address)) {
             if (!Utils.isValidUrl(address)) {
                 Log.d(ANG_PACKAGE, "$address is an invalid ip or domain")
@@ -71,14 +89,14 @@ object V2rayConfigUtil {
             return result
         }
         val v2rayConfig = JsonUtil.fromJson(assets, V2rayConfig::class.java) ?: return result
-        v2rayConfig.log.loglevel = settingsStorage?.decodeString(AppConfig.PREF_LOGLEVEL) ?: "warning"
+        v2rayConfig.log.loglevel =
+            MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning"
         v2rayConfig.remarks = config.remarks
 
         inbounds(v2rayConfig)
 
-        val isPlugin = outbound.protocol.equals(EConfigType.HYSTERIA2.name, true)
-        val retOut = outbounds(v2rayConfig, outbound, isPlugin)
-
+        val isPlugin = config.configType == EConfigType.HYSTERIA2
+        val retOut = outbounds(v2rayConfig, config, isPlugin) ?: return result
         val retMore = moreOutbounds(v2rayConfig, config.subscriptionId, isPlugin)
 
         routing(v2rayConfig)
@@ -87,10 +105,10 @@ object V2rayConfigUtil {
 
         dns(v2rayConfig)
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
             customLocalDns(v2rayConfig)
         }
-        if (settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) != true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) {
             v2rayConfig.stats = null
             v2rayConfig.policy = null
         }
@@ -104,23 +122,20 @@ object V2rayConfigUtil {
     private fun inbounds(v2rayConfig: V2rayConfig): Boolean {
         try {
             val socksPort = SettingsManager.getSocksPort()
-            val httpPort = SettingsManager.getHttpPort()
 
             v2rayConfig.inbounds.forEach { curInbound ->
-                if (settingsStorage?.decodeBool(AppConfig.PREF_PROXY_SHARING) != true) {
+                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) {
                     //bind all inbounds to localhost if the user requests
                     curInbound.listen = LOOPBACK
                 }
             }
             v2rayConfig.inbounds[0].port = socksPort
-            val fakedns = settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED)
-                ?: false
+            val fakedns = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
             val sniffAllTlsAndHttp =
-                settingsStorage?.decodeBool(AppConfig.PREF_SNIFFING_ENABLED, true)
-                    ?: true
+                MmkvManager.decodeSettingsBool(AppConfig.PREF_SNIFFING_ENABLED, true) != false
             v2rayConfig.inbounds[0].sniffing?.enabled = fakedns || sniffAllTlsAndHttp
             v2rayConfig.inbounds[0].sniffing?.routeOnly =
-                settingsStorage?.decodeBool(AppConfig.PREF_ROUTE_ONLY_ENABLED, false)
+                MmkvManager.decodeSettingsBool(AppConfig.PREF_ROUTE_ONLY_ENABLED, false)
             if (!sniffAllTlsAndHttp) {
                 v2rayConfig.inbounds[0].sniffing?.destOverride?.clear()
             }
@@ -128,14 +143,13 @@ object V2rayConfigUtil {
                 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
@@ -143,7 +157,7 @@ object V2rayConfigUtil {
         return true
     }
 
-    private fun outbounds(v2rayConfig: V2rayConfig, outbound: V2rayConfig.OutboundBean, isPlugin: Boolean): Pair<Boolean, String> {
+    private fun outbounds(v2rayConfig: V2rayConfig, config: ProfileItem, isPlugin: Boolean): Pair<Boolean, String>? {
         if (isPlugin) {
             val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0))
             val outboundNew = V2rayConfig.OutboundBean(
@@ -166,8 +180,9 @@ object V2rayConfigUtil {
             return Pair(true, outboundNew.getServerAddressAndPort())
         }
 
+        val outbound = getProxyOutbound(config) ?: return null
         val ret = updateOutboundWithGlobalSettings(outbound)
-        if (!ret) return Pair(false, "")
+        if (!ret) return null
 
         if (v2rayConfig.outbounds.isNotEmpty()) {
             v2rayConfig.outbounds[0] = outbound
@@ -176,12 +191,12 @@ object V2rayConfigUtil {
         }
 
         updateOutboundFragment(v2rayConfig)
-        return Pair(true, outbound.getServerAddressAndPort())
+        return Pair(true, config.getServerAddressAndPort())
     }
 
     private fun fakedns(v2rayConfig: V2rayConfig) {
-        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true
-            && settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true
+            && MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true
         ) {
             v2rayConfig.fakedns = listOf(V2rayConfig.FakednsBean())
         }
@@ -190,7 +205,9 @@ object V2rayConfigUtil {
     private fun routing(v2rayConfig: V2rayConfig): Boolean {
         try {
 
-            v2rayConfig.routing.domainStrategy = settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "IPIfNonMatch"
+            v2rayConfig.routing.domainStrategy =
+                MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY)
+                    ?: "IPIfNonMatch"
 
             val rulesetItems = MmkvManager.decodeRoutingRulesets()
             rulesetItems?.forEach { key ->
@@ -223,7 +240,7 @@ object V2rayConfigUtil {
 
         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:"))
@@ -239,7 +256,7 @@ object V2rayConfigUtil {
 
     private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean {
         try {
-            if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) {
                 val geositeCn = arrayListOf(GEOSITE_CN)
                 val proxyDomain = userRule2Domain(TAG_PROXY)
                 val directDomain = userRule2Domain(TAG_DIRECT)
@@ -263,7 +280,7 @@ object V2rayConfigUtil {
                 )
 
                 val localDnsPort = Utils.parseInt(
-                    settingsStorage?.decodeString(AppConfig.PREF_LOCAL_DNS_PORT),
+                    MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT),
                     AppConfig.PORT_LOCAL_DNS.toInt()
                 )
                 v2rayConfig.inbounds.add(
@@ -293,7 +310,7 @@ object V2rayConfigUtil {
 
             // DNS routing tag
             v2rayConfig.routing.rules.add(
-                0, V2rayConfig.RoutingBean.RulesBean(
+                0, RulesBean(
                     inboundTag = arrayListOf("dns-in"),
                     outboundTag = "dns-out",
                     domain = null
@@ -317,13 +334,11 @@ object V2rayConfigUtil {
             remoteDns.forEach {
                 servers.add(it)
             }
-            if (proxyDomain.size > 0) {
+            if (proxyDomain.isNotEmpty()) {
                 servers.add(
                     V2rayConfig.DnsBean.ServersBean(
-                        remoteDns.first(),
-                        53,
-                        proxyDomain,
-                        null
+                        address = remoteDns.first(),
+                        domains = proxyDomain,
                     )
                 )
             }
@@ -333,20 +348,20 @@ object V2rayConfigUtil {
             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(
-                        domesticDns.first(),
-                        53,
-                        directDomain,
-                        if (isCnRoutingMode) geoipCn else null
+                        address = domesticDns.first(),
+                        domains = directDomain,
+                        expectIPs = if (isCnRoutingMode) geoipCn else null,
+                        skipFallback = true
                     )
                 )
             }
 
             if (Utils.isPureIpAddress(domesticDns.first())) {
                 v2rayConfig.routing.rules.add(
-                    0, V2rayConfig.RoutingBean.RulesBean(
+                    0, RulesBean(
                         outboundTag = TAG_DIRECT,
                         port = "53",
                         ip = arrayListOf(domesticDns.first()),
@@ -355,20 +370,37 @@ object V2rayConfigUtil {
                 )
             }
 
+            //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 })
             }
 
             // hardcode googleapi rule to fix play store problems
-            hosts["domain:googleapis.cn"] = "googleapis.com"
+            hosts[GOOGLEAPIS_CN_DOMAIN] = GOOGLEAPIS_COM_DOMAIN
 
             // hardcode popular Android Private DNS rule to fix localhost DNS problem
-            hosts["dns.pub"] = arrayListOf("1.12.12.12", "120.53.53.53")
-            hosts["dns.alidns.com"] = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-            hosts["one.one.one.one"] = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-            hosts["dns.google"] = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+            hosts[DNS_ALIDNS_DOMAIN] = DNS_ALIDNS_ADDRESSES
+            hosts[DNS_CLOUDFLARE_DOMAIN] = DNS_CLOUDFLARE_ADDRESSES
+            hosts[DNS_DNSPOD_DOMAIN] = DNS_DNSPOD_ADDRESSES
+            hosts[DNS_GOOGLE_DOMAIN] = DNS_GOOGLE_ADDRESSES
+            hosts[DNS_QUAD9_DOMAIN] = DNS_QUAD9_ADDRESSES
+            hosts[DNS_YANDEX_DOMAIN] = DNS_YANDEX_ADDRESSES
+
 
             // DNS dns对象
             v2rayConfig.dns = V2rayConfig.DnsBean(
@@ -379,7 +411,7 @@ object V2rayConfigUtil {
             // DNS routing
             if (Utils.isPureIpAddress(remoteDns.first())) {
                 v2rayConfig.routing.rules.add(
-                    0, V2rayConfig.RoutingBean.RulesBean(
+                    0, RulesBean(
                         outboundTag = TAG_PROXY,
                         port = "53",
                         ip = arrayListOf(remoteDns.first()),
@@ -396,7 +428,7 @@ object V2rayConfigUtil {
 
     private fun updateOutboundWithGlobalSettings(outbound: V2rayConfig.OutboundBean): Boolean {
         try {
-            var muxEnabled = settingsStorage?.decodeBool(AppConfig.PREF_MUX_ENABLED, false)
+            var muxEnabled = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
             val protocol = outbound.protocol
             if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.SOCKS.name, true)
@@ -407,18 +439,20 @@ object V2rayConfigUtil {
             ) {
                 muxEnabled = false
             } else if (protocol.equals(EConfigType.VLESS.name, true)
-                && outbound.settings?.vnext?.get(0)?.users?.get(0)?.flow?.isNotEmpty() == true
+                && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true
             ) {
                 muxEnabled = false
+            } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) {
+                muxEnabled = false
             }
             if (muxEnabled == true) {
                 outbound.mux?.enabled = true
                 outbound.mux?.concurrency =
-                    settingsStorage?.decodeInt(AppConfig.PREF_MUX_CONCURRENCY) ?: 8
+                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_CONCURRENCY, 8)
                 outbound.mux?.xudpConcurrency =
-                    settingsStorage?.decodeInt(AppConfig.PREF_MUX_XUDP_CONCURRENCY) ?: 8
+                    MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_XUDP_CONCURRENCY, 16)
                 outbound.mux?.xudpProxyUDP443 =
-                    settingsStorage?.decodeString(AppConfig.PREF_MUX_XUDP_QUIC) ?: "reject"
+                    MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC) ?: "reject"
             } else {
                 outbound.mux?.enabled = false
                 outbound.mux?.concurrency = -1
@@ -430,20 +464,20 @@ object V2rayConfigUtil {
                 } else {
                     outbound.settings?.address as List<*>
                 }
-                if (settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) != true) {
+                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) != true) {
                     localTunAddr = listOf(localTunAddr.first())
                 }
                 outbound.settings?.address = localTunAddr
             }
 
             if (outbound.streamSettings?.network == DEFAULT_NETWORK
-                && outbound.streamSettings?.tcpSettings?.header?.type == HTTP
+                && outbound.streamSettings?.tcpSettings?.header?.type == HEADER_TYPE_HTTP
             ) {
                 val path = outbound.streamSettings?.tcpSettings?.header?.request?.path
                 val host = outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host
 
                 val requestString: String by lazy {
-                    """{"version":"1.1","method":"GET","headers":{"User-Agent":["Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.143 Safari/537.36","Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/53.0.2785.109 Mobile/14A456 Safari/601.1.46"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}"""
+                    """{"version":"1.1","method":"GET","headers":{"User-Agent":["Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.122 Mobile Safari/537.36"],"Accept-Encoding":["gzip, deflate"],"Connection":["keep-alive"],"Pragma":"no-cache"}}"""
                 }
                 outbound.streamSettings?.tcpSettings?.header?.request = JsonUtil.fromJson(
                     requestString,
@@ -468,11 +502,11 @@ object V2rayConfigUtil {
 
     private fun updateOutboundFragment(v2rayConfig: V2rayConfig): Boolean {
         try {
-            if (settingsStorage?.decodeBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == false) {
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == false) {
                 return true
             }
-            if (v2rayConfig.outbounds[0].streamSettings?.security != V2rayConfig.TLS
-                && v2rayConfig.outbounds[0].streamSettings?.security != V2rayConfig.REALITY
+            if (v2rayConfig.outbounds[0].streamSettings?.security != AppConfig.TLS
+                && v2rayConfig.outbounds[0].streamSettings?.security != AppConfig.REALITY
             ) {
                 return true
             }
@@ -485,12 +519,12 @@ object V2rayConfigUtil {
                 )
 
             var packets =
-                settingsStorage?.decodeString(AppConfig.PREF_FRAGMENT_PACKETS) ?: "tlshello"
-            if (v2rayConfig.outbounds[0].streamSettings?.security == V2rayConfig.REALITY
+                MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS) ?: "tlshello"
+            if (v2rayConfig.outbounds[0].streamSettings?.security == AppConfig.REALITY
                 && packets == "tlshello"
             ) {
                 packets = "1-3"
-            } else if (v2rayConfig.outbounds[0].streamSettings?.security == V2rayConfig.TLS
+            } else if (v2rayConfig.outbounds[0].streamSettings?.security == AppConfig.TLS
                 && packets != "tlshello"
             ) {
                 packets = "tlshello"
@@ -499,16 +533,16 @@ object V2rayConfigUtil {
             fragmentOutbound.settings = V2rayConfig.OutboundBean.OutSettingsBean(
                 fragment = V2rayConfig.OutboundBean.OutSettingsBean.FragmentBean(
                     packets = packets,
-                    length = settingsStorage?.decodeString(AppConfig.PREF_FRAGMENT_LENGTH)
+                    length = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH)
                         ?: "50-100",
-                    interval = settingsStorage?.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL)
+                    interval = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL)
                         ?: "10-20"
                 ),
                 noises = listOf(
                     V2rayConfig.OutboundBean.OutSettingsBean.NoiseBean(
                         type = "rand",
-                        packet = "100-200",
-                        delay = "10-20",
+                        packet = "10-20",
+                        delay = "10-16",
                     )
                 ),
             )
@@ -532,7 +566,11 @@ object V2rayConfigUtil {
         return true
     }
 
-    private fun moreOutbounds(v2rayConfig: V2rayConfig, subscriptionId: String, isPlugin: Boolean): Pair<Boolean, String> {
+    private fun moreOutbounds(
+        v2rayConfig: V2rayConfig,
+        subscriptionId: String,
+        isPlugin: Boolean
+    ): Pair<Boolean, String> {
         val returnPair = Pair(false, "")
         var domainPort: String = ""
 
@@ -540,11 +578,11 @@ object V2rayConfigUtil {
             return returnPair
         }
         //fragment proxy
-        if (settingsStorage?.decodeBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) {
             return returnPair
         }
 
-        if (subscriptionId.isNullOrEmpty()) {
+        if (subscriptionId.isEmpty()) {
             return returnPair
         }
         try {
@@ -556,7 +594,7 @@ object V2rayConfigUtil {
             //Previous proxy
             val prevNode = SettingsManager.getServerViaRemarks(subItem.prevProfile)
             if (prevNode != null) {
-                val prevOutbound = prevNode.getProxyOutbound()
+                val prevOutbound = getProxyOutbound(prevNode)
                 if (prevOutbound != null) {
                     updateOutboundWithGlobalSettings(prevOutbound)
                     prevOutbound.tag = TAG_PROXY + "2"
@@ -565,14 +603,14 @@ object V2rayConfigUtil {
                         V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean(
                             dialerProxy = prevOutbound.tag
                         )
-                    domainPort = prevOutbound.getServerAddressAndPort()
+                    domainPort = prevNode.getServerAddressAndPort()
                 }
             }
 
             //Next proxy
             val nextNode = SettingsManager.getServerViaRemarks(subItem.nextProfile)
             if (nextNode != null) {
-                val nextOutbound = nextNode.getProxyOutbound()
+                val nextOutbound = getProxyOutbound(nextNode)
                 if (nextOutbound != null) {
                     updateOutboundWithGlobalSettings(nextOutbound)
                     nextOutbound.tag = TAG_PROXY
@@ -594,4 +632,20 @@ object V2rayConfigUtil {
         }
         return returnPair
     }
-}
+
+    fun getProxyOutbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? {
+        return when (profileItem.configType) {
+            EConfigType.VMESS -> VmessFmt.toOutbound(profileItem)
+            EConfigType.CUSTOM -> null
+            EConfigType.SHADOWSOCKS -> ShadowsocksFmt.toOutbound(profileItem)
+            EConfigType.SOCKS -> SocksFmt.toOutbound(profileItem)
+            EConfigType.VLESS -> VlessFmt.toOutbound(profileItem)
+            EConfigType.TROJAN -> TrojanFmt.toOutbound(profileItem)
+            EConfigType.WIREGUARD -> WireguardFmt.toOutbound(profileItem)
+            EConfigType.HYSTERIA2 -> Hysteria2Fmt.toOutbound(profileItem)
+            EConfigType.HTTP -> HttpFmt.toOutbound(profileItem)
+        }
+
+    }
+
+}

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

@@ -13,46 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package com.v2ray.ang.helper;
-
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
+package com.v2ray.ang.helper
 
 /**
- * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.
+ * Interface to listen for a move or dismissal event from a [ItemTouchHelper.Callback].
  *
  * @author Paul Burke (ipaulpro)
  */
-public interface ItemTouchHelperAdapter {
-
+interface ItemTouchHelperAdapter {
     /**
      * Called when an item has been dragged far enough to trigger a move. This is called every time
-     * an item is shifted, and <strong>not</strong> at the end of a "drop" event.<br/>
-     * <br/>
-     * Implementations should call {@link RecyclerView.Adapter#notifyItemMoved(int, int)} after
+     * an item is shifted, and **not** at the end of a "drop" event.<br></br>
+     * <br></br>
+     * Implementations should call [RecyclerView.Adapter.notifyItemMoved] after
      * adjusting the underlying data to reflect this move.
      *
      * @param fromPosition The start position of the moved item.
      * @param toPosition   Then resolved position of the moved item.
      * @return True if the item was moved to the new adapter position.
-     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder#getAdapterPosition()
+     * @see RecyclerView.getAdapterPositionFor
+     * @see RecyclerView.ViewHolder.getAdapterPosition
      */
-    boolean onItemMove(int fromPosition, int toPosition);
+    fun onItemMove(fromPosition: Int, toPosition: Int): Boolean
 
 
-    void onItemMoveCompleted();
+    fun onItemMoveCompleted()
 
     /**
-     * Called when an item has been dismissed by a swipe.<br/>
-     * <br/>
-     * Implementations should call {@link RecyclerView.Adapter#notifyItemRemoved(int)} after
+     * Called when an item has been dismissed by a swipe.<br></br>
+     * <br></br>
+     * Implementations should call [RecyclerView.Adapter.notifyItemRemoved] after
      * adjusting the underlying data to reflect this removal.
      *
      * @param position The position of the item dismissed.
-     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder#getAdapterPosition()
+     * @see RecyclerView.getAdapterPositionFor
+     * @see RecyclerView.ViewHolder.getAdapterPosition
      */
-    void onItemDismiss(int position);
+    fun onItemDismiss(position: Int)
 }

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

@@ -13,29 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.v2ray.ang.helper
 
-package com.v2ray.ang.helper;
-
-import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper
 
 /**
- * Interface to notify an item ViewHolder of relevant callbacks from {@link
- * ItemTouchHelper.Callback}.
+ * Interface to notify an item ViewHolder of relevant callbacks from [ ].
  *
  * @author Paul Burke (ipaulpro)
  */
-public interface ItemTouchHelperViewHolder {
-
+interface ItemTouchHelperViewHolder {
     /**
-     * Called when the {@link ItemTouchHelper} first registers an item as being moved or swiped.
+     * Called when the [ItemTouchHelper] first registers an item as being moved or swiped.
      * Implementations should update the item view to indicate it's active state.
      */
-    void onItemSelected();
+    fun onItemSelected()
 
 
     /**
-     * Called when the {@link ItemTouchHelper} has completed the move or swipe, and the active item
+     * Called when the [ItemTouchHelper] has completed the move or swipe, and the active item
      * state should be cleared.
      */
-    void onItemClear();
+    fun onItemClear()
 }

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

@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2015 Paul Burke
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.v2ray.ang.helper;
-
-import android.graphics.Canvas;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An implementation of {@link ItemTouchHelper.Callback} that enables basic drag & drop and
- * swipe-to-dismiss. Drag events are automatically started by an item long-press.<br/>
- * </br/>
- * Expects the <code>RecyclerView.Adapter</code> to listen for {@link
- * ItemTouchHelperAdapter} callbacks and the <code>RecyclerView.ViewHolder</code> to implement
- * {@link ItemTouchHelperViewHolder}.
- *
- * @author Paul Burke (ipaulpro)
- */
-public class SimpleItemTouchHelperCallback extends ItemTouchHelper.Callback {
-
-    public static final float ALPHA_FULL = 1.0f;
-
-    private final ItemTouchHelperAdapter mAdapter;
-
-    public SimpleItemTouchHelperCallback(ItemTouchHelperAdapter adapter) {
-        mAdapter = adapter;
-    }
-
-    @Override
-    public boolean isLongPressDragEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isItemViewSwipeEnabled() {
-        return false;
-    }
-
-    @Override
-    public int getMovementFlags(RecyclerView recyclerView, @NotNull RecyclerView.ViewHolder viewHolder) {
-        // Set movement flags based on the layout manager
-        if (recyclerView.getLayoutManager() instanceof GridLayoutManager) {
-            final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
-            final int swipeFlags = 0;
-            return makeMovementFlags(dragFlags, swipeFlags);
-        } else {
-            final int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-            final int swipeFlags = ItemTouchHelper.START | ItemTouchHelper.END;
-            return makeMovementFlags(dragFlags, swipeFlags);
-        }
-    }
-
-    @Override
-    public boolean onMove(@NotNull RecyclerView recyclerView, RecyclerView.ViewHolder source, RecyclerView.ViewHolder target) {
-        if (source.getItemViewType() != target.getItemViewType()) {
-            return false;
-        }
-
-        // Notify the adapter of the move
-        mAdapter.onItemMove(source.getBindingAdapterPosition(), target.getBindingAdapterPosition());
-        return true;
-    }
-
-    @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int i) {
-        // Notify the adapter of the dismissal
-        mAdapter.onItemDismiss(viewHolder.getBindingAdapterPosition());
-    }
-
-    @Override
-    public void onChildDraw(@NotNull Canvas c, @NotNull RecyclerView recyclerView, @NotNull RecyclerView.ViewHolder viewHolder, float dX,
-                            float dY, int actionState, boolean isCurrentlyActive) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            // Fade out the view as it is swiped out of the parent's bounds
-            final float alpha = ALPHA_FULL - Math.abs(dX) / (float) viewHolder.itemView.getWidth();
-            viewHolder.itemView.setAlpha(alpha);
-            viewHolder.itemView.setTranslationX(dX);
-        } else {
-            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
-        }
-    }
-
-    @Override
-    public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
-        // We only want the active item to change
-        if (actionState != ItemTouchHelper.ACTION_STATE_IDLE) {
-            if (viewHolder instanceof ItemTouchHelperViewHolder) {
-                // Let the view holder know that this item is being moved or dragged
-                ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
-                itemViewHolder.onItemSelected();
-            }
-        }
-
-        super.onSelectedChanged(viewHolder, actionState);
-    }
-
-    @Override
-    public void clearView(@NotNull RecyclerView recyclerView, @NotNull RecyclerView.ViewHolder viewHolder) {
-        super.clearView(recyclerView, viewHolder);
-
-        mAdapter.onItemMoveCompleted();
-
-        viewHolder.itemView.setAlpha(ALPHA_FULL);
-
-        if (viewHolder instanceof ItemTouchHelperViewHolder) {
-            // Tell the view holder it's time to restore the idle state
-            ItemTouchHelperViewHolder itemViewHolder = (ItemTouchHelperViewHolder) viewHolder;
-            itemViewHolder.onItemClear();
-        }
-    }
-}

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

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2015 Paul Burke
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import kotlin.math.abs
+import kotlin.math.min
+import kotlin.math.sign
+
+/**
+ * An implementation of [ItemTouchHelper.Callback] that enables basic drag & drop and
+ * swipe-to-dismiss. Drag events are automatically started by an item long-press.<br></br>
+ *
+ * Expects the `RecyclerView.Adapter` to listen for [ ] callbacks and the `RecyclerView.ViewHolder` to implement
+ * [ItemTouchHelperViewHolder].
+ *
+ * @author Paul Burke (ipaulpro)
+ */
+class SimpleItemTouchHelperCallback(private val mAdapter: ItemTouchHelperAdapter) : ItemTouchHelper.Callback() {
+    private var mReturnAnimator: ValueAnimator? = null
+
+    override fun isLongPressDragEnabled(): Boolean = true
+
+    override fun isItemViewSwipeEnabled(): Boolean = true
+
+    override fun getMovementFlags(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder
+    ): Int {
+        val dragFlags: Int
+        val swipeFlags: Int
+        if (recyclerView.layoutManager is GridLayoutManager) {
+            dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN or ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
+            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
+        } else {
+            dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN
+            swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END
+        }
+        return makeMovementFlags(dragFlags, swipeFlags)
+    }
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        source: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        return if (source.itemViewType != target.itemViewType) {
+            false
+        } else {
+            mAdapter.onItemMove(source.bindingAdapterPosition, target.bindingAdapterPosition)
+            true
+        }
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        // Do not delete; simply return item to original position
+        returnViewToOriginalPosition(viewHolder)
+    }
+
+    override fun onChildDraw(
+        c: Canvas, recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean
+    ) {
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+            val maxSwipeDistance = viewHolder.itemView.width * SWIPE_THRESHOLD
+            val swipeAmount = abs(dX)
+            val direction = sign(dX)
+
+            // Limit maximum swipe distance
+            val translationX = min(swipeAmount, maxSwipeDistance) * direction
+            val alpha = ALPHA_FULL - min(swipeAmount, maxSwipeDistance) / maxSwipeDistance
+
+            viewHolder.itemView.translationX = translationX
+            viewHolder.itemView.alpha = alpha
+
+            if (swipeAmount >= maxSwipeDistance && isCurrentlyActive) {
+                returnViewToOriginalPosition(viewHolder)
+            }
+        } else {
+            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+        }
+    }
+
+    private fun returnViewToOriginalPosition(viewHolder: RecyclerView.ViewHolder) {
+        mReturnAnimator?.takeIf { it.isRunning }?.cancel()
+
+        mReturnAnimator = ValueAnimator.ofFloat(viewHolder.itemView.translationX, 0f).apply {
+            addUpdateListener { animation ->
+                val value = animation.animatedValue as Float
+                viewHolder.itemView.translationX = value
+                viewHolder.itemView.alpha = (1f - abs(value) / (viewHolder.itemView.width * SWIPE_THRESHOLD))
+            }
+            interpolator = DecelerateInterpolator()
+            duration = ANIMATION_DURATION
+            start()
+        }
+    }
+
+    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
+        if (actionState != ItemTouchHelper.ACTION_STATE_IDLE && viewHolder is ItemTouchHelperViewHolder) {
+            viewHolder.onItemSelected()
+        }
+        super.onSelectedChanged(viewHolder, actionState)
+    }
+
+    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+        viewHolder.itemView.alpha = ALPHA_FULL
+        if (viewHolder is ItemTouchHelperViewHolder) {
+            viewHolder.onItemClear()
+        }
+        mAdapter.onItemMoveCompleted()
+    }
+
+    override fun getSwipeThreshold(viewHolder: RecyclerView.ViewHolder): Float {
+        return 1.1f // Set a value greater than 1 to prevent default swipe delete
+    }
+
+    override fun getSwipeEscapeVelocity(defaultValue: Float): Float {
+        return defaultValue * 10 // Increase swipe escape velocity to make swipe harder to trigger
+    }
+
+    companion object {
+        private const val ALPHA_FULL = 1.0f
+        private const val SWIPE_THRESHOLD = 0.25f
+        private const val ANIMATION_DURATION: Long = 200
+    }
+}

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

@@ -29,8 +29,9 @@ class PluginList : ArrayList<Plugin>() {
     init {
         addAll(
             AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA)
-            .filter { it.providerInfo.exported }.map { NativePlugin(it) })
+                Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
+            )
+                .filter { it.providerInfo.exported }.map { NativePlugin(it) })
     }
 
     val lookup = mutableMapOf<String, Plugin>().apply {
@@ -39,13 +40,13 @@ class PluginList : ArrayList<Plugin>() {
                 if (old != null && old != plugin) {
                     this@PluginList.remove(old)
                 }
-               /* if (old != null && old !== plugin) {
-                    val packages = this@PluginList.filter { it.id == plugin.id }
-                        .joinToString { it.packageName }
-                    val message = "Conflicting plugins found from: $packages"
-                    Toast.makeText(SagerNet.application, message, Toast.LENGTH_LONG).show()
-                    throw IllegalStateException(message)
-                }*/
+                /* if (old != null && old !== plugin) {
+                     val packages = this@PluginList.filter { it.id == plugin.id }
+                         .joinToString { it.packageName }
+                     val message = "Conflicting plugins found from: $packages"
+                     Toast.makeText(SagerNet.application, message, Toast.LENGTH_LONG).show()
+                     throw IllegalStateException(message)
+                 }*/
             }
             check(put(plugin.id, plugin))
         }

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

@@ -43,6 +43,7 @@ import java.io.FileNotFoundException
 object PluginManager {
 
     class PluginNotFoundException(val plugin: String) : FileNotFoundException(plugin)
+
     private var receiver: BroadcastReceiver? = null
     private var cachedPlugins: PluginList? = null
     fun fetchPlugins() = synchronized(this) {
@@ -88,30 +89,34 @@ object PluginManager {
                 flags or PackageManager.MATCH_DIRECT_BOOT_UNAWARE or PackageManager.MATCH_DIRECT_BOOT_AWARE
         }
         var providers = AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "com.github.dyhkwong.AngApplication")), flags)
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "com.github.dyhkwong.AngApplication")), flags
+        )
             .filter { it.providerInfo.exported }
         if (providers.isEmpty()) {
             providers = AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "io.nekohasekai.AngApplication")), flags)
-            .filter { it.providerInfo.exported }
+                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "io.nekohasekai.AngApplication")), flags
+            )
+                .filter { it.providerInfo.exported }
         }
         if (providers.isEmpty()) {
             providers = AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "moe.matsuri.lite")), flags)
-            .filter { it.providerInfo.exported }
+                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "moe.matsuri.lite")), flags
+            )
+                .filter { it.providerInfo.exported }
         }
         if (providers.isEmpty()) {
             providers = AngApplication.application.packageManager.queryIntentContentProviders(
-            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "fr.husi")), flags)
-            .filter { it.providerInfo.exported }
+                Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "fr.husi")), flags
+            )
+                .filter { it.providerInfo.exported }
         }
         if (providers.isEmpty()) {
             providers = AngApplication.application.packageManager.queryIntentContentProviders(
                 Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
             ).filter {
                 it.providerInfo.exported &&
-                it.providerInfo.metaData.containsKey(METADATA_KEY_ID) &&
-                it.providerInfo.metaData.getString(METADATA_KEY_ID) == pluginId
+                        it.providerInfo.metaData.containsKey(METADATA_KEY_ID) &&
+                        it.providerInfo.metaData.getString(METADATA_KEY_ID) == pluginId
             }
             if (providers.size > 1) {
                 providers = listOf(providers[0]) // What if there is more than one?
@@ -129,7 +134,7 @@ object PluginManager {
         try {
             initNativeFaster(provider)?.also { return InitResult(it) }
         } catch (t: Throwable) {
-         //   Logs.w("Initializing native plugin faster mode failed")
+            //   Logs.w("Initializing native plugin faster mode failed")
             failure = t
         }
 
@@ -138,19 +143,23 @@ object PluginManager {
             authority(provider.authority)
         }.build()
         try {
-            return initNativeFast(AngApplication.application.contentResolver,
+            return initNativeFast(
+                AngApplication.application.contentResolver,
                 pluginId,
-                uri)?.let { InitResult(it) }
+                uri
+            )?.let { InitResult(it) }
         } catch (t: Throwable) {
-          //  Logs.w("Initializing native plugin fast mode failed")
+            //  Logs.w("Initializing native plugin fast mode failed")
             failure?.also { t.addSuppressed(it) }
             failure = t
         }
 
         try {
-            return initNativeSlow(AngApplication.application.contentResolver,
+            return initNativeSlow(
+                AngApplication.application.contentResolver,
                 pluginId,
-                uri)?.let { InitResult(it) }
+                uri
+            )?.let { InitResult(it) }
         } catch (t: Throwable) {
             failure?.also { t.addSuppressed(it) }
             throw t
@@ -180,11 +189,13 @@ object PluginManager {
             throw IndexOutOfBoundsException("Plugin entry binary not found")
 
         val pluginDir = File(AngApplication.application.noBackupFilesDir, "plugin")
-        (cr.query(uri,
+        (cr.query(
+            uri,
             arrayOf(PluginContract.COLUMN_PATH, PluginContract.COLUMN_MODE),
             null,
             null,
-            null)
+            null
+        )
             ?: return null).use { cursor ->
             if (!cursor.moveToFirst()) entryNotFound()
             pluginDir.deleteRecursively()
@@ -197,11 +208,13 @@ object PluginManager {
                 cr.openInputStream(uri.buildUpon().path(path).build())!!.use { inStream ->
                     file.outputStream().use { outStream -> inStream.copyTo(outStream) }
                 }
-                Os.chmod(file.absolutePath, when (cursor.getType(1)) {
-                    Cursor.FIELD_TYPE_INTEGER -> cursor.getInt(1)
-                    Cursor.FIELD_TYPE_STRING -> cursor.getString(1).toInt(8)
-                    else -> throw IllegalArgumentException("File mode should be of type int")
-                })
+                Os.chmod(
+                    file.absolutePath, when (cursor.getType(1)) {
+                        Cursor.FIELD_TYPE_INTEGER -> cursor.getInt(1)
+                        Cursor.FIELD_TYPE_STRING -> cursor.getString(1).toInt(8)
+                        else -> throw IllegalArgumentException("File mode should be of type int")
+                    }
+                )
                 if (path == pluginId) initialized = true
             } while (cursor.moveToNext())
         }
@@ -209,10 +222,11 @@ 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)
+
         null -> null
         else -> error("meta-data $key has invalid type ${value.javaClass}")
     }

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

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

@@ -0,0 +1,18 @@
+package com.v2ray.ang.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.service.V2RayServiceManager
+
+class BootReceiver : BroadcastReceiver() {
+    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)
+    }
+}

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

@@ -5,8 +5,8 @@ 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.MmkvManager
 import com.v2ray.ang.util.Utils
 
 class TaskerReceiver : BroadcastReceiver() {
@@ -16,9 +16,9 @@ class TaskerReceiver : BroadcastReceiver() {
         try {
             val bundle = intent?.getBundleExtra(AppConfig.TASKER_EXTRA_BUNDLE)
             val switch = bundle?.getBoolean(AppConfig.TASKER_EXTRA_BUNDLE_SWITCH, false)
-            val guid = bundle?.getString(AppConfig.TASKER_EXTRA_BUNDLE_GUID, "")
+            val guid = bundle?.getString(AppConfig.TASKER_EXTRA_BUNDLE_GUID).orEmpty()
 
-            if (switch == null || guid == null || TextUtils.isEmpty(guid)) {
+            if (switch == null || TextUtils.isEmpty(guid)) {
                 return
             } else if (switch) {
                 if (guid == AppConfig.TASKER_DEFAULT_GUID) {

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

@@ -8,11 +8,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class ProcessService {
-    private val TAG = ANG_PACKAGE
-    private lateinit var process: Process
+    private var process: Process? = null
 
     fun runProcess(context: Context, cmd: MutableList<String>) {
-        Log.d(TAG, cmd.toString())
+        Log.d(ANG_PACKAGE, cmd.toString())
 
         try {
             val proBuilder = ProcessBuilder(cmd)
@@ -23,23 +22,23 @@ class ProcessService {
 
             CoroutineScope(Dispatchers.IO).launch {
                 Thread.sleep(50L)
-                Log.d(TAG, "runProcess check")
-                process.waitFor()
-                Log.d(TAG, "runProcess exited")
+                Log.d(ANG_PACKAGE, "runProcess check")
+                process?.waitFor()
+                Log.d(ANG_PACKAGE, "runProcess exited")
             }
-            Log.d(TAG, process.toString())
+            Log.d(ANG_PACKAGE, process.toString())
 
         } catch (e: Exception) {
-            Log.d(TAG, e.toString())
+            Log.d(ANG_PACKAGE, e.toString())
         }
     }
 
     fun stopProcess() {
         try {
-            Log.d(TAG, "runProcess destroy")
+            Log.d(ANG_PACKAGE, "runProcess destroy")
             process?.destroy()
         } catch (e: Exception) {
-            Log.d(TAG, e.toString())
+            Log.d(ANG_PACKAGE, e.toString())
         }
     }
-}
+}

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

@@ -9,6 +9,7 @@ import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.util.MessageUtil
@@ -32,24 +33,31 @@ class QSTileService : TileService() {
         qsTile?.updateTile()
     }
 
+    /**
+     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
+     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
+     */
+
     override fun onStartListening() {
         super.onStartListening()
+
         setState(Tile.STATE_INACTIVE)
         mMsgReceive = ReceiveMessageHandler(this)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            registerReceiver(mMsgReceive, IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY), Context.RECEIVER_EXPORTED)
-        } else {
-            registerReceiver(mMsgReceive, IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY))
-        }
-
+        val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
+        ContextCompat.registerReceiver(applicationContext, mMsgReceive, mFilter, Utils.receiverFlags())
         MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")
     }
 
     override fun onStopListening() {
         super.onStopListening()
 
-        unregisterReceiver(mMsgReceive)
-        mMsgReceive = null
+        try {
+            applicationContext.unregisterReceiver(mMsgReceive)
+            mMsgReceive = null
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
     }
 
     override fun onClick() {

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

@@ -14,10 +14,8 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
 import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
-import com.v2ray.ang.util.AngConfigManager
-import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.Utils
+import com.v2ray.ang.handler.AngConfigManager.updateConfigViaSub
+import com.v2ray.ang.handler.MmkvManager
 
 object SubscriptionUpdater {
 

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

@@ -4,6 +4,7 @@ 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
@@ -13,21 +14,21 @@ 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.ServerConfig
+import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toSpeedString
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.ui.MainActivity
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.V2rayConfigUtil
 import go.Seq
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
@@ -44,6 +45,7 @@ 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_PENDING_INTENT_RESTART_V2RAY = 2
     private const val NOTIFICATION_ICON_THRESHOLD = 3000
 
     val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
@@ -55,7 +57,7 @@ object V2RayServiceManager {
             Seq.setContext(value?.get()?.getService()?.applicationContext)
             Libv2ray.initV2Env(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
         }
-    var currentConfig: ServerConfig? = null
+    var currentConfig: ProfileItem? = null
 
     private var lastQueryTime = 0L
     private var mBuilder: NotificationCompat.Builder? = null
@@ -65,15 +67,17 @@ object V2RayServiceManager {
     fun startV2Ray(context: Context) {
         if (v2rayPoint.isRunning) return
         val guid = MmkvManager.getSelectServer() ?: return
-        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
-        if (!result.status) return
+        val config = MmkvManager.decodeServerConfig(guid) ?: return
+        if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) return
+//        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
+//        if (!result.status) return
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_PROXY_SHARING) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) == true) {
             context.toast(R.string.toast_warning_pref_proxysharing_short)
         } else {
             context.toast(R.string.toast_services_start)
         }
-        val intent = if ((settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
+        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
             Intent(context.applicationContext, V2RayVpnService::class.java)
         } else {
             Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
@@ -125,6 +129,11 @@ object V2RayServiceManager {
         }
     }
 
+    /**
+     * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
+     * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
+     */
+
     fun startV2rayPoint() {
         val service = serviceControl?.get()?.getService() ?: return
         val guid = MmkvManager.getSelectServer() ?: return
@@ -132,7 +141,7 @@ object V2RayServiceManager {
         if (v2rayPoint.isRunning) {
             return
         }
-        val result = V2rayConfigUtil.getV2rayConfig(service, guid)
+        val result = V2rayConfigManager.getV2rayConfig(service, guid)
         if (!result.status)
             return
 
@@ -141,11 +150,7 @@ object V2RayServiceManager {
             mFilter.addAction(Intent.ACTION_SCREEN_ON)
             mFilter.addAction(Intent.ACTION_SCREEN_OFF)
             mFilter.addAction(Intent.ACTION_USER_PRESENT)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                service.registerReceiver(mMsgReceive, mFilter, Context.RECEIVER_EXPORTED)
-            } else {
-                service.registerReceiver(mMsgReceive, mFilter)
-            }
+            ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
         } catch (e: Exception) {
             Log.d(ANG_PACKAGE, e.toString())
         }
@@ -155,7 +160,7 @@ object V2RayServiceManager {
         currentConfig = config
 
         try {
-            v2rayPoint.runLoop(settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) ?: false)
+            v2rayPoint.runLoop(MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
         } catch (e: Exception) {
             Log.d(ANG_PACKAGE, e.toString())
         }
@@ -216,11 +221,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)
+                    startV2Ray(serviceControl.getService())
                 }
 
                 AppConfig.MSG_MEASURE_DELAY -> {
@@ -275,30 +284,24 @@ object V2RayServiceManager {
 
     private fun showNotification() {
         val service = serviceControl?.get()?.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,
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
-        )
+        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 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 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) {
@@ -322,6 +325,11 @@ object V2RayServiceManager {
                 service.getString(R.string.notification_action_stop_v2ray),
                 stopV2RayPendingIntent
             )
+            .addAction(
+                R.drawable.ic_delete_24dp,
+                service.getString(R.string.title_service_restart),
+                restartV2RayPendingIntent
+            )
         //.build()
 
         //mBuilder?.setDefaults(NotificationCompat.FLAG_ONLY_ALERT_ONCE)  //取消震动,铃声其他都不好使
@@ -346,7 +354,12 @@ object V2RayServiceManager {
 
     fun cancelNotification() {
         val service = serviceControl?.get()?.getService() ?: return
-        service.stopForeground(true)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
+        } else {
+            service.stopForeground(true)
+        }
+
         mBuilder = null
         mDisposable?.dispose()
         mDisposable = null
@@ -378,7 +391,7 @@ object V2RayServiceManager {
     private fun startSpeedNotification() {
         if (mDisposable == null &&
             v2rayPoint.isRunning &&
-            settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) == true
+            MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) == true
         ) {
             var lastZeroSpeed = false
             val outboundTags = currentConfig?.getAllOutboundTags()
@@ -428,10 +441,11 @@ object V2RayServiceManager {
     }
 
     private fun stopSpeedNotification() {
-        if (mDisposable != null) {
-            mDisposable?.dispose() //stop queryStats
+        mDisposable?.let {
+            it.dispose() //stop queryStats
             mDisposable = null
             updateNotification(currentConfig?.remarks, 0, 0)
         }
     }
+
 }

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

@@ -8,12 +8,12 @@ import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_CANCEL
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.serializable
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
-import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.V2rayConfigUtil
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -24,7 +24,7 @@ import libv2ray.Libv2ray
 import java.util.concurrent.Executors
 
 class V2RayTestService : Service() {
-    private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(10).asCoroutineDispatcher()) }
+    private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()).asCoroutineDispatcher()) }
 
     override fun onCreate() {
         super.onCreate()
@@ -56,12 +56,12 @@ class V2RayTestService : Service() {
     private fun startRealPing(guid: String): Long {
         val retFailure = -1L
 
-        val server = MmkvManager.decodeServerConfig(guid) ?: return retFailure
-        if (server.getProxyOutbound()?.protocol?.equals(EConfigType.HYSTERIA2.name, true) == true) {
-            val delay = PluginUtil.realPingHy2(this, server)
+        val config = MmkvManager.decodeServerConfig(guid) ?: return retFailure
+        if (config.configType == EConfigType.HYSTERIA2) {
+            val delay = PluginUtil.realPingHy2(this, config)
             return delay
         } else {
-            val config = V2rayConfigUtil.getV2rayConfig(this, guid)
+            val config = V2rayConfigManager.getV2rayConfig(this, guid)
             if (!config.status) {
                 return retFailure
             }

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
@@ -17,12 +18,13 @@ import android.os.StrictMode
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -33,10 +35,10 @@ 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.10.1"
+        private const val PRIVATE_VLAN4_ROUTER = "10.10.10.2"
+        private const val PRIVATE_VLAN6_CLIENT = "fc00::10:10:10:1"
+        private const val PRIVATE_VLAN6_ROUTER = "fc00::10:10:10:2"
         private const val TUN2SOCKS = "libtun2socks.so"
     }
 
@@ -64,7 +66,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             .build()
     }
 
-    private val connectivity by lazy { getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager }
+    private val connectivity by lazy { getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager }
 
     @delegate:RequiresApi(Build.VERSION_CODES.P)
     private val defaultNetworkCallback by lazy {
@@ -130,7 +132,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             builder.addRoute("0.0.0.0", 0)
         }
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
             builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
             if (bypassLan) {
                 builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
@@ -139,7 +141,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             }
         }
 
-//        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
 //            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
 //        } else {
         Utils.getVpnDnsServers()
@@ -153,9 +155,9 @@ class V2RayVpnService : VpnService(), ServiceControl {
         builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
 
         val selfPackageName = BuildConfig.APPLICATION_ID
-        if (settingsStorage?.decodeBool(AppConfig.PREF_PER_APP_PROXY) == true) {
-            val apps = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-            val bypassApps = settingsStorage?.decodeBool(AppConfig.PREF_BYPASS_APPS) ?: false
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
+            val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+            val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
             //process self package
             if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
             apps?.forEach {
@@ -165,6 +167,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                     else
                         builder.addAllowedApplication(it)
                 } catch (e: PackageManager.NameNotFoundException) {
+                    Log.d(ANG_PACKAGE, "setup error : --${e.localizedMessage}")
                 }
             }
         } else {
@@ -188,6 +191,9 @@ 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.
@@ -215,12 +221,12 @@ class V2RayVpnService : VpnService(), ServiceControl {
             "--loglevel", "notice"
         )
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_PREFER_IPV6) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
             cmd.add("--netif-ip6addr")
             cmd.add(PRIVATE_VLAN6_ROUTER)
         }
-        if (settingsStorage?.decodeBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-            val localDnsPort = Utils.parseInt(settingsStorage?.decodeString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
+            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
             cmd.add("--dnsgw")
             cmd.add("$LOOPBACK:${localDnsPort}")
         }
@@ -232,7 +238,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
             process = proBuilder
                 .directory(applicationContext.filesDir)
                 .start()
-            Thread(Runnable {
+            Thread {
                 Log.d(packageName, "$TUN2SOCKS check")
                 process.waitFor()
                 Log.d(packageName, "$TUN2SOCKS exited")
@@ -240,7 +246,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
                     Log.d(packageName, "$TUN2SOCKS restart")
                     runTun2socks()
                 }
-            }).start()
+            }.start()
             Log.d(packageName, process.toString())
 
             sendFd()

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

@@ -4,6 +4,7 @@ import android.Manifest
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.FileProvider
 import com.tbruyelle.rxpermissions3.RxPermissions
@@ -20,6 +21,7 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
 
+
 class AboutActivity : BaseActivity() {
     private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
     private val extDir by lazy { File(Utils.backupPath(this)) }
@@ -86,6 +88,14 @@ class AboutActivity : BaseActivity() {
         binding.layoutFeedback.setOnClickListener {
             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", android.content.DialogInterface.OnClickListener { dialog, whichButton -> dialog.dismiss() }).show()
+        }
 
         binding.layoutTgChannel.setOnClickListener {
             Utils.openUri(this, AppConfig.TgChannelUrl)
@@ -133,13 +143,15 @@ class AboutActivity : BaseActivity() {
     }
 
     private fun showFileChooser() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "*/*"
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
+        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+            type = "*/*"
+            addCategory(Intent.CATEGORY_OPENABLE)
+        }
 
         try {
             chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
         } catch (ex: android.content.ActivityNotFoundException) {
+            Log.e(AppConfig.ANG_PACKAGE, "File chooser activity not found: ${ex.message}", ex)
             toast(R.string.toast_require_file_manager)
         }
     }
@@ -149,27 +161,23 @@ class AboutActivity : BaseActivity() {
             val uri = it.data?.data
             if (it.resultCode == RESULT_OK && uri != null) {
                 try {
-                    try {
-                        val targetFile =
-                            File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
-                        contentResolver.openInputStream(uri).use { input ->
-                            targetFile.outputStream().use { fileOut ->
-                                input?.copyTo(fileOut)
-                            }
+                    val targetFile =
+                        File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
+                    contentResolver.openInputStream(uri).use { input ->
+                        targetFile.outputStream().use { fileOut ->
+                            input?.copyTo(fileOut)
                         }
-                        if (restoreConfiguration(targetFile)) {
-                            toast(R.string.toast_success)
-                        } else {
-                            toast(R.string.toast_failure)
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
                     }
-
+                    if (restoreConfiguration(targetFile)) {
+                        toast(R.string.toast_success)
+                    } else {
+                        toast(R.string.toast_failure)
+                    }
                 } catch (e: Exception) {
-                    e.printStackTrace()
-                    toast(e.message.toString())
+                    Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e)
+                    toast(R.string.toast_failure)
                 }
             }
         }
+
 }

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

@@ -34,9 +34,6 @@ abstract class BaseActivity : AppCompatActivity() {
 
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
-        val context = newBase?.let {
-            MyContextWrapper.wrap(newBase, Utils.getLocale())
-        }
-        super.attachBaseContext(context)
+        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, Utils.getLocale()))
     }
 }

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

@@ -0,0 +1,146 @@
+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.lifecycle.lifecycleScope
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.R
+import com.v2ray.ang.databinding.ActivityLogcatBinding
+import com.v2ray.ang.extension.toast
+import com.v2ray.ang.util.Utils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+
+class LogcatActivity : BaseActivity() {
+    private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
+    private val throttleManager = ThrottleManager()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+        title = getString(R.string.title_logcat)
+        logcat(false)
+    }
+
+    class ThrottleManager {
+        private val throttleMap = mutableMapOf<String, Long>()
+
+        companion object {
+            private const val THROTTLE_DURATION = 1000L
+        }
+
+        @Synchronized
+        fun shouldProcess(key: String): Boolean {
+            val currentTime = System.currentTimeMillis()
+            val lastProcessTime = throttleMap[key] ?: 0L
+
+            return if (currentTime - lastProcessTime > THROTTLE_DURATION) {
+                throttleMap[key] = currentTime
+                true
+            } else {
+                false
+            }
+        }
+
+        @Synchronized
+        fun reset(key: String) {
+            throttleMap.remove(key)
+        }
+    }
+
+    private fun logcat(shouldFlushLog: Boolean) {
+        binding.pbWaiting.visibility = View.VISIBLE
+
+        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"
+                )
+
+                val process = withContext(Dispatchers.IO) {
+                    Runtime.getRuntime().exec(lst.toTypedArray())
+                }
+
+                val allLogs = process.inputStream.bufferedReader().use { it.readLines() }
+                val filteredLogs = processLogs(allLogs)
+
+                withContext(Dispatchers.Main) {
+                    updateLogDisplay(filteredLogs)
+                }
+
+            } catch (e: IOException) {
+                withContext(Dispatchers.Main) {
+                    binding.pbWaiting.visibility = View.GONE
+                    toast(R.string.toast_failure)
+                }
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun processLogs(logs: List<String>): List<String> {
+        val processedLogs = mutableListOf<String>()
+        var isNotMatch = false
+
+        for (line in logs) {
+            when {
+                line.contains("zxing.NotFoundException", ignoreCase = true) -> {
+                    if (!isNotMatch) {
+                        if (throttleManager.shouldProcess("NotFoundException")) {
+                            processedLogs.add(line)
+                            isNotMatch = true
+                        }
+                    }
+                }
+                else -> processedLogs.add(line)
+            }
+        }
+
+        return processedLogs.take(500)
+    }
+
+    private fun updateLogDisplay(logs: List<String>) {
+        binding.tvLogcat.text = logs.joinToString("\n")
+        binding.tvLogcat.movementMethod = ScrollingMovementMethod()
+        binding.pbWaiting.visibility = View.GONE
+
+        Handler(Looper.getMainLooper()).post {
+            binding.svLogcat.fullScroll(View.FOCUS_DOWN)
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_logcat, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+        R.id.copy_all -> {
+            Utils.setClipboard(this, binding.tvLogcat.text.toString())
+            toast(R.string.toast_success)
+            true
+        }
+        R.id.clear_all -> {
+            throttleManager.reset("zxing.NotFoundException")
+            logcat(true)
+            true
+        }
+        else -> super.onOptionsItemSelected(item)
+    }
+}

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

@@ -34,11 +34,11 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityMainBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.handler.AngConfigManager
+import com.v2ray.ang.handler.MigrateManager
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.AngConfigManager
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -46,6 +46,7 @@ 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
 
@@ -89,7 +90,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         binding.fab.setOnClickListener {
             if (mainViewModel.isRunning.value == true) {
                 Utils.stopVService(this)
-            } else if ((settingsStorage?.decodeString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
+            } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
                 val intent = VpnService.prepare(this)
                 if (intent == null) {
                     startV2Ray()
@@ -125,13 +126,14 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
         initGroupTab()
         setupViewModel()
+        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)
+                        toast(R.string.toast_permission_denied_notification)
                 }
         }
 
@@ -171,7 +173,22 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             }
         }
         mainViewModel.startListenBroadcast()
-        mainViewModel.copyAssets(assets)
+        mainViewModel.initAssets(assets)
+    }
+
+    private fun migrateLegacy() {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val result = MigrateManager.migrateServerConfig2Profile()
+            launch(Dispatchers.Main) {
+                if (result) {
+                    toast(getString(R.string.migration_success))
+                    mainViewModel.reloadServerList()
+                } else {
+                    //toast(getString(R.string.migration_fail))
+                }
+            }
+
+        }
     }
 
     private fun initGroupTab() {
@@ -329,8 +346,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             lifecycleScope.launch(Dispatchers.IO) {
                 val ret = mainViewModel.exportAllServer()
                 launch(Dispatchers.Main) {
-                    if (ret == 0)
-                        toast(R.string.toast_success)
+                    if (ret > 0)
+                        toast(getString(R.string.title_export_config_count, ret))
                     else
                         toast(R.string.toast_failure)
                     binding.pbWaiting.hide()
@@ -341,11 +358,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.ping_all -> {
+            toast(getString(R.string.connection_test_testing_count, mainViewModel.serversCache.count()))
             mainViewModel.testAllTcping()
             true
         }
 
         R.id.real_ping_all -> {
+            toast(getString(R.string.connection_test_testing_count, mainViewModel.serversCache.count()))
             mainViewModel.testAllRealPing()
             true
         }
@@ -360,14 +379,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     binding.pbWaiting.show()
                     lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeAllServer()
+                        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.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     //do noting
                 }
                 .show()
@@ -387,7 +407,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                         }
                     }
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     //do noting
                 }
                 .show()
@@ -399,14 +419,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     binding.pbWaiting.show()
                     lifecycleScope.launch(Dispatchers.IO) {
-                        mainViewModel.removeInvalidServer()
+                        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.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     //do noting
                 }
                 .show()
@@ -489,30 +510,35 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     private fun importBatchConfig(server: String?) {
-//        val dialog = AlertDialog.Builder(this)
-//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
-//            .setCancelable(false)
-//            .show()
         binding.pbWaiting.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
-            val (count, countSub) = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
-            delay(500L)
-            launch(Dispatchers.Main) {
-                if (count > 0) {
-                    toast(R.string.toast_success)
-                    mainViewModel.reloadServerList()
-                } else if (countSub > 0) {
-                    initGroupTab()
-                } else {
-                    toast(R.string.toast_failure)
+            try {
+                val (count, countSub) = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
+                delay(500L)
+                withContext(Dispatchers.Main) {
+                    when {
+                        count > 0 -> {
+                            toast(getString(R.string.title_import_config_count, count))
+                            mainViewModel.reloadServerList()
+                        }
+
+                        countSub > 0 -> initGroupTab()
+                        else -> toast(R.string.toast_failure)
+                    }
+                    binding.pbWaiting.hide()
                 }
-                //dialog.dismiss()
-                binding.pbWaiting.hide()
+            } catch (e: Exception) {
+                withContext(Dispatchers.Main) {
+                    toast(R.string.toast_failure)
+                    binding.pbWaiting.hide()
+                }
+                e.printStackTrace()
             }
         }
     }
 
+
     private fun importConfigCustomClipboard()
             : Boolean {
         try {
@@ -599,7 +625,7 @@ 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)

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

@@ -17,12 +17,11 @@ import com.v2ray.ang.databinding.ItemRecyclerFooterBinding
 import com.v2ray.ang.databinding.ItemRecyclerMainBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.handler.AngConfigManager
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.service.V2RayServiceManager
-import com.v2ray.ang.util.AngConfigManager
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
@@ -130,6 +129,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             holder.itemMainBinding.layoutEdit.setOnClickListener {
                 val intent = Intent().putExtra("guid", guid)
                     .putExtra("isRunning", isRunning)
+                    .putExtra("createConfigType", profile.configType.value)
                 if (profile.configType == EConfigType.CUSTOM) {
                     mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
                 } else {
@@ -138,12 +138,12 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
             }
             holder.itemMainBinding.layoutRemove.setOnClickListener {
                 if (guid != MmkvManager.getSelectServer()) {
-                    if (settingsStorage?.decodeBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+                    if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
                         AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
                             .setPositiveButton(android.R.string.ok) { _, _ ->
                                 removeServer(guid, position)
                             }
-                            .setNegativeButton(android.R.string.no) { _, _ ->
+                            .setNegativeButton(android.R.string.cancel) { _, _ ->
                                 //do noting
                             }
                             .show()

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

@@ -17,8 +17,8 @@ import com.v2ray.ang.databinding.ActivityBypassListBinding
 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.util.AppManagerUtil
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -41,7 +41,7 @@ class PerAppProxyActivity : BaseActivity() {
         val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
         binding.recyclerView.addItemDecoration(dividerItemDecoration)
 
-        val blacklist = settingsStorage?.decodeStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+        val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
 
         AppManagerUtil.rxLoadNetworkAppList(this)
             .subscribeOn(Schedulers.io())
@@ -132,14 +132,14 @@ class PerAppProxyActivity : BaseActivity() {
          ***/
 
         binding.switchPerAppProxy.setOnCheckedChangeListener { _, isChecked ->
-            settingsStorage.encode(AppConfig.PREF_PER_APP_PROXY, isChecked)
+            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY, isChecked)
         }
-        binding.switchPerAppProxy.isChecked = settingsStorage.getBoolean(AppConfig.PREF_PER_APP_PROXY, false)
+        binding.switchPerAppProxy.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false)
 
         binding.switchBypassApps.setOnCheckedChangeListener { _, isChecked ->
-            settingsStorage.encode(AppConfig.PREF_BYPASS_APPS, isChecked)
+            MmkvManager.encodeSettings(AppConfig.PREF_BYPASS_APPS, isChecked)
         }
-        binding.switchBypassApps.isChecked = settingsStorage.getBoolean(AppConfig.PREF_BYPASS_APPS, false)
+        binding.switchBypassApps.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS, false)
 
         /***
         et_search.setOnEditorActionListener { v, actionId, event ->
@@ -175,7 +175,7 @@ class PerAppProxyActivity : BaseActivity() {
     override fun onPause() {
         super.onPause()
         adapter?.let {
-            settingsStorage.encode(AppConfig.PREF_PER_APP_PROXY_SET, it.blacklist)
+            MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY_SET, it.blacklist)
         }
     }
 
@@ -215,7 +215,7 @@ class PerAppProxyActivity : BaseActivity() {
             }
             it.notifyDataSetChanged()
             true
-        } ?: false
+        } == true
 
         R.id.select_proxy_app -> {
             selectProxyApp()

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

@@ -59,22 +59,23 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
         fun bind(appInfo: AppInfo) {
             this.appInfo = appInfo
 
+            // Set app icon and name
             itemBypassBinding.icon.setImageDrawable(appInfo.appIcon)
-//            name.text = appInfo.appName
-
-            itemBypassBinding.checkBox.isChecked = inBlacklist
-            itemBypassBinding.packageName.text = appInfo.packageName
-            if (appInfo.isSystemApp) {
-                itemBypassBinding.name.text = String.format("** %1s", appInfo.appName)
-                //name.textColor = Color.RED
+            itemBypassBinding.name.text = if (appInfo.isSystemApp) {
+                String.format("** %s", appInfo.appName)
             } else {
-                itemBypassBinding.name.text = appInfo.appName
-                //name.textColor = Color.DKGRAY
+                appInfo.appName
             }
 
+            // Set package name and checkbox state
+            itemBypassBinding.packageName.text = appInfo.packageName
+            itemBypassBinding.checkBox.isChecked = inBlacklist
+
+            // Handle item click to toggle blacklist status
             itemView.setOnClickListener(this)
         }
 
+
         override fun onClick(v: View?) {
             if (inBlacklist) {
                 blacklist.remove(appInfo.packageName)

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

@@ -1,7 +1,6 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
@@ -10,7 +9,7 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingEditBinding
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -38,7 +37,7 @@ class RoutingEditActivity : BaseActivity() {
 
     private fun bindingServer(rulesetItem: RulesetItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(rulesetItem.remarks)
-        binding.chkLocked.isChecked = rulesetItem.looked ?: false
+        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)
@@ -59,16 +58,21 @@ class RoutingEditActivity : BaseActivity() {
     private fun saveServer(): Boolean {
         val rulesetItem = SettingsManager.getRoutingRuleset(position) ?: RulesetItem()
 
-        rulesetItem.remarks = binding.etRemarks.text.toString()
-        rulesetItem.looked = binding.chkLocked.isChecked
-        binding.etDomain.text.toString().let { rulesetItem.domain = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etIp.text.toString().let { rulesetItem.ip = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etProtocol.text.toString().let { rulesetItem.protocol = if (it.isEmpty()) null else it.split(",").map { itt -> itt.trim() }.filter { itt -> itt.isNotEmpty() } }
-        binding.etPort.text.toString().let { rulesetItem.port = it.ifEmpty { null } }
-        binding.etNetwork.text.toString().let { rulesetItem.network = it.ifEmpty { null } }
-        rulesetItem.outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
+        rulesetItem.apply {
+            remarks = binding.etRemarks.text.toString()
+            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() }
+                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            protocol = binding.etProtocol.text.toString().takeIf { it.isNotEmpty() }
+                ?.split(",")?.map { it.trim() }?.filter { it.isNotEmpty() }
+            port = binding.etPort.text.toString().takeIf { it.isNotEmpty() }
+            network = binding.etNetwork.text.toString().takeIf { it.isNotEmpty() }
+            outboundTag = outbound_tag[binding.spOutboundTag.selectedItemPosition]
+        }
 
-        if (TextUtils.isEmpty(rulesetItem.remarks)) {
+        if (rulesetItem.remarks.isNullOrEmpty()) {
             toast(R.string.sub_setting_remarks)
             return false
         }
@@ -79,6 +83,7 @@ class RoutingEditActivity : BaseActivity() {
         return true
     }
 
+
     private fun deleteServer(): Boolean {
         if (position >= 0) {
             AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
@@ -90,7 +95,7 @@ class RoutingEditActivity : BaseActivity() {
                         }
                     }
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     // do nothing
                 }
                 .show()

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

@@ -1,29 +1,31 @@
 package com.v2ray.ang.ui
 
+import android.Manifest
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.AdapterView
+import androidx.activity.result.contract.ActivityResultContracts
 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
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
-import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class RoutingSettingActivity : BaseActivity() {
     private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
@@ -51,14 +53,14 @@ class RoutingSettingActivity : BaseActivity() {
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
         mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
 
-        val found = Utils.arrayFind(routing_domain_strategy, settingsStorage?.decodeString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "")
+        val found = Utils.arrayFind(routing_domain_strategy, MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "")
         found.let { binding.spDomainStrategy.setSelection(if (it >= 0) it else 0) }
         binding.spDomainStrategy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
             }
 
             override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                settingsStorage.encode(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, routing_domain_strategy[position])
+                MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, routing_domain_strategy[position])
             }
         }
     }
@@ -84,13 +86,13 @@ class RoutingSettingActivity : BaseActivity() {
             true
         }
 
-        R.id.import_rulesets -> {
+        R.id.import_predefined_rulesets -> {
             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.resetRoutingRulesets(this@RoutingSettingActivity, i)
+                                SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
                                 launch(Dispatchers.Main) {
                                     refreshData()
                                     toast(R.string.toast_success)
@@ -103,7 +105,7 @@ class RoutingSettingActivity : BaseActivity() {
 
 
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     //do noting
                 }
                 .show()
@@ -113,30 +115,45 @@ class RoutingSettingActivity : BaseActivity() {
         R.id.import_rulesets_from_clipboard -> {
             AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
-                    try {
-                        val clipboard = Utils.getClipboard(this)
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            val ret = SettingsManager.resetRoutingRulesetsFromClipboard(clipboard)
-                            launch(Dispatchers.Main) {
-                                if (ret) {
-                                    refreshData()
-                                    toast(R.string.toast_success)
-                                } else {
-                                    toast(R.string.toast_failure)
-                                }
-                            }
-                        }
+                    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)
+                            }
+                        }
                     }
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
-                    //do noting
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do nothing
                 }
                 .show()
             true
         }
 
+        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)
+                }
+            true
+        }
+
+
         R.id.export_rulesets_to_clipboard -> {
             val rulesetList = MmkvManager.decodeRoutingRulesets()
             if (rulesetList.isNullOrEmpty()) {
@@ -151,8 +168,38 @@ class RoutingSettingActivity : BaseActivity() {
         else -> super.onOptionsItemSelected(item)
     }
 
+    private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_OK) {
+            importRulesetsFromQRcode(it.data?.getStringExtra("SCAN_RESULT"))
+        }
+    }
+
+    private fun importRulesetsFromQRcode(qrcode: String?): Boolean {
+        AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val result = SettingsManager.resetRoutingRulesets(qrcode)
+                    withContext(Dispatchers.Main) {
+                        if (result) {
+                            refreshData()
+                            toast(R.string.toast_success)
+                        } else {
+                            toast(R.string.toast_failure)
+                        }
+                    }
+                }
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                //do nothing
+            }
+            .show()
+        return true
+    }
+
     fun refreshData() {
-        rulesets = MmkvManager.decodeRoutingRulesets() ?: mutableListOf()
+        rulesets.clear()
+        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
         adapter.notifyDataSetChanged()
     }
+
 }

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

@@ -8,10 +8,9 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.v2ray.ang.databinding.ItemRecyclerRoutingSettingBinding
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
-import com.v2ray.ang.ui.MainRecyclerAdapter.BaseViewHolder
-import com.v2ray.ang.util.SettingsManager
 
 class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : RecyclerView.Adapter<RoutingSettingRecyclerAdapter.MainViewHolder>(),
     ItemTouchHelperAdapter {
@@ -26,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 ?: false
+        holder.itemRoutingSettingBinding.imgLocked.isVisible = ruleset.locked == true
         holder.itemView.setBackgroundColor(Color.TRANSPARENT)
 
         holder.itemRoutingSettingBinding.layoutEdit.setOnClickListener {
@@ -37,7 +36,7 @@ class RoutingSettingRecyclerAdapter(val activity: RoutingSettingActivity) : Recy
         }
 
         holder.itemRoutingSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
-            if( !it.isPressed) return@setOnCheckedChangeListener
+            if (!it.isPressed) return@setOnCheckedChangeListener
             ruleset.enabled = isChecked
             SettingsManager.saveRoutingRuleset(position, ruleset)
         }

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

@@ -7,7 +7,7 @@ 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.util.AngConfigManager
+import com.v2ray.ang.handler.AngConfigManager
 
 class ScScannerActivity : BaseActivity() {
 
@@ -20,26 +20,31 @@ class ScScannerActivity : BaseActivity() {
     fun importQRcode(): Boolean {
         RxPermissions(this)
             .request(Manifest.permission.CAMERA)
-            .subscribe {
-                if (it)
+            .subscribe { granted ->
+                if (granted) {
                     scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-                else
+                } else {
                     toast(R.string.toast_permission_denied)
+                }
             }
-
         return true
     }
 
+
     private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
-            val (count, countSub) = AngConfigManager.importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"), "", false)
+            val scanResult = it.data?.getStringExtra("SCAN_RESULT").orEmpty()
+            val (count, countSub) = AngConfigManager.importBatchConfig(scanResult, "", false)
+
             if (count + countSub > 0) {
                 toast(R.string.toast_success)
             } else {
                 toast(R.string.toast_failure)
             }
+
             startActivity(Intent(this, MainActivity::class.java))
         }
         finish()
     }
+
 }

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

@@ -12,7 +12,7 @@ import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
 import io.github.g00fy2.quickie.QRResult
 import io.github.g00fy2.quickie.ScanCustomCode
@@ -25,7 +25,7 @@ class ScannerActivity : BaseActivity() {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (settingsStorage?.decodeBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_START_SCAN_IMMEDIATE) == true) {
             launchScan()
         }
     }
@@ -74,19 +74,17 @@ class ScannerActivity : BaseActivity() {
             }
             RxPermissions(this)
                 .request(permission)
-                .subscribe {
-                    if (it) {
-                        try {
-                            showFileChooser()
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    } else
+                .subscribe { granted ->
+                    if (granted) {
+                        showFileChooser()
+                    } else {
                         toast(R.string.toast_permission_denied)
+                    }
                 }
             true
         }
 
+
         else -> super.onOptionsItemSelected(item)
     }
 
@@ -107,13 +105,21 @@ class ScannerActivity : BaseActivity() {
         val uri = it.data?.data
         if (it.resultCode == RESULT_OK && uri != null) {
             try {
-                val bitmap = BitmapFactory.decodeStream(contentResolver.openInputStream(uri))
+                val inputStream = contentResolver.openInputStream(uri)
+                val bitmap = BitmapFactory.decodeStream(inputStream)
+                inputStream?.close()
+
                 val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                finished(text.orEmpty())
+                if (text.isNullOrEmpty()) {
+                    toast(R.string.toast_decoding_failed)
+                } else {
+                    finished(text)
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
-                toast(e.message.toString())
+                toast(R.string.toast_decoding_failed)
             }
         }
     }
+
 }

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

@@ -2,6 +2,7 @@ package com.v2ray.ang.ui
 
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -13,22 +14,23 @@ import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.DEFAULT_PORT
 import com.v2ray.ang.AppConfig.PREF_ALLOW_INSECURE
+import com.v2ray.ang.AppConfig.REALITY
+import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.V2rayConfig.Companion.DEFAULT_PORT
-import com.v2ray.ang.dto.V2rayConfig.Companion.TLS
-import com.v2ray.ang.extension.removeWhiteSpace
+import com.v2ray.ang.dto.NetworkType
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
-import com.v2ray.ang.util.Utils.getIpv6Address
 
 class ServerActivity : BaseActivity() {
 
@@ -79,6 +81,10 @@ class ServerActivity : BaseActivity() {
     private val alpns: Array<out String> by lazy {
         resources.getStringArray(R.array.streamsecurity_alpn)
     }
+    private val xhttpMode: Array<out String> by lazy {
+        resources.getStringArray(R.array.xhttp_mode)
+    }
+
 
     // Kotlin synthetics was used, but since it is removed in 1.8. We switch to old manual approach.
     // We don't use AndroidViewBinding because, it is better to share similar logics for different
@@ -87,7 +93,6 @@ class ServerActivity : BaseActivity() {
     private val et_address: EditText by lazy { findViewById(R.id.et_address) }
     private val et_port: EditText by lazy { findViewById(R.id.et_port) }
     private val et_id: EditText by lazy { findViewById(R.id.et_id) }
-    private val et_alterId: EditText? by lazy { findViewById(R.id.et_alterId) }
     private val et_security: EditText? by lazy { findViewById(R.id.et_security) }
     private val sp_flow: Spinner? by lazy { findViewById(R.id.sp_flow) }
     private val sp_security: Spinner? by lazy { findViewById(R.id.sp_security) }
@@ -108,17 +113,21 @@ class ServerActivity : BaseActivity() {
     private val sp_stream_alpn: Spinner? by lazy { findViewById(R.id.sp_stream_alpn) } //uTLS
     private val container_alpn: LinearLayout? by lazy { findViewById(R.id.lay_stream_alpn) }
     private val et_public_key: EditText? by lazy { findViewById(R.id.et_public_key) }
+    private val et_preshared_key: EditText? by lazy { findViewById(R.id.et_preshared_key) }
     private val container_public_key: LinearLayout? by lazy { findViewById(R.id.lay_public_key) }
     private val et_short_id: EditText? by lazy { findViewById(R.id.et_short_id) }
     private val container_short_id: LinearLayout? by lazy { findViewById(R.id.lay_short_id) }
     private val et_spider_x: EditText? by lazy { findViewById(R.id.et_spider_x) }
     private val container_spider_x: LinearLayout? by lazy { findViewById(R.id.lay_spider_x) }
     private val et_reserved1: EditText? by lazy { findViewById(R.id.et_reserved1) }
-    private val et_reserved2: EditText? by lazy { findViewById(R.id.et_reserved2) }
-    private val et_reserved3: EditText? by lazy { findViewById(R.id.et_reserved3) }
     private val et_local_address: EditText? by lazy { findViewById(R.id.et_local_address) }
     private val et_local_mtu: EditText? by lazy { findViewById(R.id.et_local_mtu) }
     private val et_obfs_password: EditText? by lazy { findViewById(R.id.et_obfs_password) }
+    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_extra: EditText? by lazy { findViewById(R.id.et_extra) }
+    private val layout_extra: LinearLayout? by lazy { findViewById(R.id.layout_extra) }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -142,7 +151,7 @@ class ServerActivity : BaseActivity() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) {
                 val types = transportTypes(networks[position])
                 sp_header_type?.isEnabled = types.size > 1
@@ -150,25 +159,49 @@ class ServerActivity : BaseActivity() {
                     ArrayAdapter(this@ServerActivity, android.R.layout.simple_spinner_item, types)
                 adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
                 sp_header_type?.adapter = adapter
-                sp_header_type_title?.text = if (networks[position] == "grpc")
-                    getString(R.string.server_lab_mode_type) else
-                    getString(R.string.server_lab_head_type)
-                config?.getProxyOutbound()?.getTransportSettingDetails()?.let { transportDetails ->
-                    sp_header_type?.setSelection(Utils.arrayFind(types, transportDetails[0]))
-                    et_request_host?.text = Utils.getEditable(transportDetails[1])
-                    et_path?.text = Utils.getEditable(transportDetails[2])
-                }
+                sp_header_type_title?.text =
+                    when (networks[position]) {
+                        NetworkType.GRPC.type -> getString(R.string.server_lab_mode_type)
+                        NetworkType.XHTTP.type -> getString(R.string.server_lab_xhttp_mode)
+                        else -> getString(R.string.server_lab_head_type)
+                    }.orEmpty()
+                sp_header_type?.setSelection(
+                    Utils.arrayFind(
+                        types,
+                        when (networks[position]) {
+                            NetworkType.GRPC.type -> config?.mode
+                            NetworkType.XHTTP.type -> config?.xhttpMode
+                            else -> config?.headerType
+                        }.orEmpty()
+                    )
+                )
+
+                et_request_host?.text = Utils.getEditable(
+                    when (networks[position]) {
+                        //"quic" -> config?.quicSecurity
+                        NetworkType.GRPC.type -> config?.authority
+                        else -> config?.host
+                    }.orEmpty()
+                )
+                et_path?.text = Utils.getEditable(
+                    when (networks[position]) {
+                        NetworkType.KCP.type -> config?.seed
+                        //"quic" -> config?.quicKey
+                        NetworkType.GRPC.type -> config?.serviceName
+                        else -> config?.path
+                    }.orEmpty()
+                )
 
                 tv_request_host?.text = Utils.getEditable(
                     getString(
                         when (networks[position]) {
-                            "tcp" -> R.string.server_lab_request_host_http
-                            "ws" -> R.string.server_lab_request_host_ws
-                            "httpupgrade" -> R.string.server_lab_request_host_httpupgrade
-                            "splithttp" -> R.string.server_lab_request_host_splithttp
-                            "h2" -> R.string.server_lab_request_host_h2
-                            "quic" -> R.string.server_lab_request_host_quic
-                            "grpc" -> R.string.server_lab_request_host_grpc
+                            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.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
                             else -> R.string.server_lab_request_host
                         }
                     )
@@ -177,17 +210,29 @@ class ServerActivity : BaseActivity() {
                 tv_path?.text = Utils.getEditable(
                     getString(
                         when (networks[position]) {
-                            "kcp" -> R.string.server_lab_path_kcp
-                            "ws" -> R.string.server_lab_path_ws
-                            "httpupgrade" -> R.string.server_lab_path_httpupgrade
-                            "splithttp" -> R.string.server_lab_path_splithttp
-                            "h2" -> R.string.server_lab_path_h2
-                            "quic" -> R.string.server_lab_path_quic
-                            "grpc" -> R.string.server_lab_path_grpc
+                            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.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
                             else -> R.string.server_lab_path
                         }
                     )
                 )
+                et_extra?.text = Utils.getEditable(
+                    when (networks[position]) {
+                        NetworkType.XHTTP.type -> config?.xhttpExtra
+                        else -> null
+                    }.orEmpty()
+                )
+
+                layout_extra?.visibility =
+                    when (networks[position]) {
+                        NetworkType.XHTTP.type -> View.VISIBLE
+                        else -> View.GONE
+                    }
             }
 
             override fun onNothingSelected(parent: AdapterView<*>?) {
@@ -199,31 +244,48 @@ class ServerActivity : BaseActivity() {
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) {
-                if (streamSecuritys[position].isBlank()) {
-                    container_sni?.visibility = View.GONE
-                    container_fingerprint?.visibility = View.GONE
-                    container_alpn?.visibility = View.GONE
-                    container_allow_insecure?.visibility = View.GONE
-                    container_public_key?.visibility = View.GONE
-                    container_short_id?.visibility = View.GONE
-                    container_spider_x?.visibility = View.GONE
-                } else {
-                    container_sni?.visibility = View.VISIBLE
-                    container_fingerprint?.visibility = View.VISIBLE
-                    container_alpn?.visibility = View.VISIBLE
-                    if (streamSecuritys[position] == TLS) {
+                val isBlank = streamSecuritys[position].isBlank()
+                val isTLS = streamSecuritys[position] == TLS
+
+                when {
+                    // Case 1: Null or blank
+                    isBlank -> {
+                        listOf(
+                            container_sni, container_fingerprint, container_alpn,
+                            container_allow_insecure, container_public_key,
+                            container_short_id, container_spider_x
+                        ).forEach { it?.visibility = View.GONE }
+                    }
+
+                    // Case 2: TLS value
+                    isTLS -> {
+                        listOf(
+                            container_sni,
+                            container_fingerprint,
+                            container_alpn
+                        ).forEach { it?.visibility = View.VISIBLE }
                         container_allow_insecure?.visibility = View.VISIBLE
-                        container_public_key?.visibility = View.GONE
-                        container_short_id?.visibility = View.GONE
-                        container_spider_x?.visibility = View.GONE
-                    } else {
-                        container_allow_insecure?.visibility = View.GONE
+                        listOf(
+                            container_public_key,
+                            container_short_id,
+                            container_spider_x
+                        ).forEach { it?.visibility = View.GONE }
+                    }
+
+                    // Case 3: Other reality values
+                    else -> {
+                        listOf(container_sni, container_fingerprint).forEach {
+                            it?.visibility = View.VISIBLE
+                        }
                         container_alpn?.visibility = View.GONE
-                        container_public_key?.visibility = View.VISIBLE
-                        container_short_id?.visibility = View.VISIBLE
-                        container_spider_x?.visibility = View.VISIBLE
+                        container_allow_insecure?.visibility = View.GONE
+                        listOf(
+                            container_public_key,
+                            container_short_id,
+                            container_spider_x
+                        ).forEach { it?.visibility = View.VISIBLE }
                     }
                 }
             }
@@ -242,120 +304,90 @@ class ServerActivity : BaseActivity() {
     /**
      * binding selected server config
      */
-    private fun bindingServer(config: ServerConfig): Boolean {
-        val outbound = config.getProxyOutbound() ?: return false
+    private fun bindingServer(config: ProfileItem): Boolean {
 
         et_remarks.text = Utils.getEditable(config.remarks)
-        et_address.text = Utils.getEditable(outbound.getServerAddress().orEmpty())
-        et_port.text =
-            Utils.getEditable(outbound.getServerPort()?.toString() ?: DEFAULT_PORT.toString())
-        et_id.text = Utils.getEditable(outbound.getPassword().orEmpty())
-        et_alterId?.text =
-            Utils.getEditable(outbound.settings?.vnext?.get(0)?.users?.get(0)?.alterId.toString())
-        if (config.configType == EConfigType.SOCKS
-            || config.configType == EConfigType.HTTP
-        ) {
-            et_security?.text =
-                Utils.getEditable(outbound.settings?.servers?.get(0)?.users?.get(0)?.user.orEmpty())
+        et_address.text = Utils.getEditable(config.server.orEmpty())
+        et_port.text = Utils.getEditable(config.serverPort ?: DEFAULT_PORT.toString())
+        et_id.text = Utils.getEditable(config.password.orEmpty())
+
+        if (config.configType == EConfigType.SOCKS || config.configType == EConfigType.HTTP) {
+            et_security?.text = Utils.getEditable(config.username.orEmpty())
         } else if (config.configType == EConfigType.VLESS) {
-            et_security?.text = Utils.getEditable(outbound.getSecurityEncryption().orEmpty())
-            val flow = Utils.arrayFind(
-                flows,
-                outbound.settings?.vnext?.get(0)?.users?.get(0)?.flow.orEmpty()
-            )
+            et_security?.text = Utils.getEditable(config.method.orEmpty())
+            val flow = Utils.arrayFind(flows, config.flow.orEmpty())
             if (flow >= 0) {
                 sp_flow?.setSelection(flow)
             }
         } else if (config.configType == EConfigType.WIREGUARD) {
-            et_public_key?.text =
-                Utils.getEditable(outbound.settings?.peers?.get(0)?.publicKey.orEmpty())
-            if (outbound.settings?.reserved == null) {
-                et_reserved1?.text = Utils.getEditable("0")
-                et_reserved2?.text = Utils.getEditable("0")
-                et_reserved3?.text = Utils.getEditable("0")
-            } else {
-                et_reserved1?.text =
-                    Utils.getEditable(outbound.settings?.reserved?.get(0).toString())
-                et_reserved2?.text =
-                    Utils.getEditable(outbound.settings?.reserved?.get(1).toString())
-                et_reserved3?.text =
-                    Utils.getEditable(outbound.settings?.reserved?.get(2).toString())
-            }
-            if (outbound.settings?.address == null) {
-                et_local_address?.text =
-                    Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
-            } else {
-                val list = outbound.settings?.address as List<*>
-                et_local_address?.text = Utils.getEditable(list.joinToString(","))
-            }
-            if (outbound.settings?.mtu == null) {
-                et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
-            } else {
-                et_local_mtu?.text = Utils.getEditable(outbound.settings?.mtu.toString())
-            }
+            et_id.text = Utils.getEditable(config.secretKey.orEmpty())
+            et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
+            et_preshared_key?.visibility = View.VISIBLE
+            et_preshared_key?.text = Utils.getEditable(config.preSharedKey.orEmpty())
+            et_reserved1?.text = Utils.getEditable(config.reserved ?: "0,0,0")
+            et_local_address?.text = Utils.getEditable(
+                config.localAddress ?: "$WIREGUARD_LOCAL_ADDRESS_V4,$WIREGUARD_LOCAL_ADDRESS_V6"
+            )
+            et_local_mtu?.text = Utils.getEditable(config.mtu?.toString() ?: WIREGUARD_LOCAL_MTU)
         } else if (config.configType == EConfigType.HYSTERIA2) {
-            et_obfs_password?.text = Utils.getEditable(outbound.settings?.obfsPassword)
+            et_obfs_password?.text = Utils.getEditable(config.obfsPassword)
+            et_port_hop?.text = Utils.getEditable(config.portHopping)
+            et_port_hop_interval?.text = Utils.getEditable(config.portHoppingInterval)
+            et_pinsha256?.text = Utils.getEditable(config.pinSHA256)
         }
-
         val securityEncryptions =
             if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
-        val security =
-            Utils.arrayFind(securityEncryptions, outbound.getSecurityEncryption().orEmpty())
+        val security = Utils.arrayFind(securityEncryptions, config.method.orEmpty())
         if (security >= 0) {
             sp_security?.setSelection(security)
         }
 
-        val streamSetting = config.outboundBean?.streamSettings ?: return true
-        val streamSecurity = Utils.arrayFind(streamSecuritys, streamSetting.security)
+        val streamSecurity = Utils.arrayFind(streamSecuritys, config.security.orEmpty())
         if (streamSecurity >= 0) {
             sp_stream_security?.setSelection(streamSecurity)
-            (streamSetting.tlsSettings ?: streamSetting.realitySettings)?.let { tlsSetting ->
-                container_sni?.visibility = View.VISIBLE
-                container_fingerprint?.visibility = View.VISIBLE
-                container_alpn?.visibility = View.VISIBLE
-                et_sni?.text = Utils.getEditable(tlsSetting.serverName)
-                tlsSetting.fingerprint?.let {
-                    val utlsIndex = Utils.arrayFind(uTlsItems, tlsSetting.fingerprint)
-                    sp_stream_fingerprint?.setSelection(utlsIndex)
-                }
-                tlsSetting.alpn?.let {
-                    val alpnIndex = Utils.arrayFind(
-                        alpns,
-                        Utils.removeWhiteSpace(tlsSetting.alpn.joinToString(",")).orEmpty()
-                    )
-                    sp_stream_alpn?.setSelection(alpnIndex)
-                }
-                if (streamSetting.tlsSettings != null) {
-                    container_allow_insecure?.visibility = View.VISIBLE
-                    val allowinsecure =
-                        Utils.arrayFind(allowinsecures, tlsSetting.allowInsecure.toString())
-                    if (allowinsecure >= 0) {
-                        sp_allow_insecure?.setSelection(allowinsecure)
-                    }
-                    container_public_key?.visibility = View.GONE
-                    container_short_id?.visibility = View.GONE
-                    container_spider_x?.visibility = View.GONE
-                } else { // reality settings
-                    container_public_key?.visibility = View.VISIBLE
-                    et_public_key?.text = Utils.getEditable(tlsSetting.publicKey.orEmpty())
-                    container_short_id?.visibility = View.VISIBLE
-                    et_short_id?.text = Utils.getEditable(tlsSetting.shortId.orEmpty())
-                    container_spider_x?.visibility = View.VISIBLE
-                    et_spider_x?.text = Utils.getEditable(tlsSetting.spiderX.orEmpty())
-                    container_allow_insecure?.visibility = View.GONE
-                }
+            container_sni?.visibility = View.VISIBLE
+            container_fingerprint?.visibility = View.VISIBLE
+            container_alpn?.visibility = View.VISIBLE
+
+            et_sni?.text = Utils.getEditable(config.sni)
+            config.fingerPrint?.let {
+                val utlsIndex = Utils.arrayFind(uTlsItems, it)
+                sp_stream_fingerprint?.setSelection(utlsIndex)
             }
-            if (streamSetting.tlsSettings == null && streamSetting.realitySettings == null) {
-                container_sni?.visibility = View.GONE
-                container_fingerprint?.visibility = View.GONE
-                container_alpn?.visibility = View.GONE
-                container_allow_insecure?.visibility = View.GONE
+            config.alpn?.let {
+                val alpnIndex = Utils.arrayFind(alpns, it)
+                sp_stream_alpn?.setSelection(alpnIndex)
+            }
+            if (config.security == TLS) {
+                container_allow_insecure?.visibility = View.VISIBLE
+                val allowinsecure = Utils.arrayFind(allowinsecures, config.insecure.toString())
+                if (allowinsecure >= 0) {
+                    sp_allow_insecure?.setSelection(allowinsecure)
+                }
                 container_public_key?.visibility = View.GONE
                 container_short_id?.visibility = View.GONE
                 container_spider_x?.visibility = View.GONE
+            } else if (config.security == REALITY) {
+                container_public_key?.visibility = View.VISIBLE
+                et_public_key?.text = Utils.getEditable(config.publicKey.orEmpty())
+                container_short_id?.visibility = View.VISIBLE
+                et_short_id?.text = Utils.getEditable(config.shortId.orEmpty())
+                container_spider_x?.visibility = View.VISIBLE
+                et_spider_x?.text = Utils.getEditable(config.spiderX.orEmpty())
+                container_allow_insecure?.visibility = View.GONE
             }
         }
-        val network = Utils.arrayFind(networks, streamSetting.network)
+
+        if (config.security.isNullOrEmpty()) {
+            container_sni?.visibility = View.GONE
+            container_fingerprint?.visibility = View.GONE
+            container_alpn?.visibility = View.GONE
+            container_allow_insecure?.visibility = View.GONE
+            container_public_key?.visibility = View.GONE
+            container_short_id?.visibility = View.GONE
+            container_spider_x?.visibility = View.GONE
+        }
+        val network = Utils.arrayFind(networks, config.network.orEmpty())
         if (network >= 0) {
             sp_network?.setSelection(network)
         }
@@ -370,7 +402,6 @@ class ServerActivity : BaseActivity() {
         et_address.text = null
         et_port.text = Utils.getEditable(DEFAULT_PORT.toString())
         et_id.text = null
-        et_alterId?.text = Utils.getEditable("0")
         sp_security?.setSelection(0)
         sp_network?.setSelection(0)
 
@@ -384,9 +415,7 @@ class ServerActivity : BaseActivity() {
         //et_security.text = null
         sp_flow?.setSelection(0)
         et_public_key?.text = null
-        et_reserved1?.text = Utils.getEditable("0")
-        et_reserved2?.text = Utils.getEditable("0")
-        et_reserved3?.text = Utils.getEditable("0")
+        et_reserved1?.text = Utils.getEditable("0,0,0")
         et_local_address?.text =
             Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
         et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
@@ -405,13 +434,14 @@ class ServerActivity : BaseActivity() {
             toast(R.string.server_lab_address)
             return false
         }
-        val port = Utils.parseInt(et_port.text.toString())
-        if (port <= 0) {
-            toast(R.string.server_lab_port)
-            return false
+        if (createConfigType != EConfigType.HYSTERIA2) {
+            if (Utils.parseInt(et_port.text.toString()) <= 0) {
+                toast(R.string.server_lab_port)
+                return false
+            }
         }
         val config =
-            MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(createConfigType)
+            MmkvManager.decodeServerConfig(editGuid) ?: ProfileItem.create(createConfigType)
         if (config.configType != EConfigType.SOCKS
             && config.configType != EConfigType.HTTP
             && TextUtils.isEmpty(et_id.text.toString())
@@ -432,125 +462,82 @@ class ServerActivity : BaseActivity() {
                 return false
             }
         }
-        et_alterId?.let {
-            val alterId = Utils.parseInt(it.text.toString())
-            if (alterId < 0) {
-                toast(R.string.server_lab_alterid)
+        if (et_extra?.text?.toString().isNotNullEmpty()) {
+            if (JsonUtil.parseString(et_extra?.text?.toString()) == null) {
+                toast(R.string.server_lab_xhttp_extra)
                 return false
             }
         }
 
-        config.remarks = et_remarks.text.toString().trim()
-        config.outboundBean?.settings?.vnext?.get(0)?.let { vnext ->
-            saveVnext(vnext, port, config)
-        }
-        config.outboundBean?.settings?.servers?.get(0)?.let { server ->
-            saveServers(server, port, config)
-        }
-        val wireguard = config.outboundBean?.settings
-        wireguard?.peers?.get(0)?.let { _ ->
-            savePeer(wireguard, port)
-        }
+        saveCommon(config)
+        saveStreamSettings(config)
+        saveTls(config)
 
-        config.outboundBean?.streamSettings?.let {
-            val sni = saveStreamSettings(it)
-            saveTls(it, sni)
-        }
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
             config.subscriptionId = subscriptionId.orEmpty()
         }
-        if (config.configType == EConfigType.HYSTERIA2) {
-            config.outboundBean?.settings?.obfsPassword = et_obfs_password?.text?.toString()
-        }
-
+        Log.d(ANG_PACKAGE, JsonUtil.toJsonPretty(config) ?: "")
         MmkvManager.encodeServerConfig(editGuid, config)
         toast(R.string.toast_success)
         finish()
         return true
     }
 
-    private fun saveVnext(
-        vnext: V2rayConfig.OutboundBean.OutSettingsBean.VnextBean,
-        port: Int,
-        config: ServerConfig
-    ) {
-        vnext.address = et_address.text.toString().trim()
-        vnext.port = port
-        vnext.users[0].id = et_id.text.toString().trim()
+    private fun saveCommon(config: ProfileItem) {
+        config.remarks = et_remarks.text.toString().trim()
+        config.server = et_address.text.toString().trim()
+        config.serverPort = et_port.text.toString().trim()
+        config.password = et_id.text.toString().trim()
+
         if (config.configType == EConfigType.VMESS) {
-            vnext.users[0].alterId = Utils.parseInt(et_alterId?.text.toString())
-            vnext.users[0].security = securitys[sp_security?.selectedItemPosition ?: 0]
+            config.method = securitys[sp_security?.selectedItemPosition ?: 0]
         } else if (config.configType == EConfigType.VLESS) {
-            vnext.users[0].encryption = et_security?.text.toString().trim()
-            vnext.users[0].flow = flows[sp_flow?.selectedItemPosition ?: 0]
-        }
-    }
-
-    private fun saveServers(
-        server: V2rayConfig.OutboundBean.OutSettingsBean.ServersBean,
-        port: Int,
-        config: ServerConfig
-    ) {
-        server.address = et_address.text.toString().trim()
-        server.port = port
-        if (config.configType == EConfigType.SHADOWSOCKS) {
-            server.password = et_id.text.toString().trim()
-            server.method = shadowsocksSecuritys[sp_security?.selectedItemPosition ?: 0]
+            config.method = et_security?.text.toString().trim()
+            config.flow = flows[sp_flow?.selectedItemPosition ?: 0]
+        } else if (config.configType == EConfigType.SHADOWSOCKS) {
+            config.method = shadowsocksSecuritys[sp_security?.selectedItemPosition ?: 0]
         } else if (config.configType == EConfigType.SOCKS || config.configType == EConfigType.HTTP) {
-            if (TextUtils.isEmpty(et_security?.text) && TextUtils.isEmpty(et_id.text)) {
-                server.users = null
-            } else {
-                val socksUsersBean =
-                    V2rayConfig.OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()
-                socksUsersBean.user = et_security?.text.toString().trim()
-                socksUsersBean.pass = et_id.text.toString().trim()
-                server.users = listOf(socksUsersBean)
+            if (!TextUtils.isEmpty(et_security?.text) || !TextUtils.isEmpty(et_id.text)) {
+                config.username = et_security?.text.toString().trim()
             }
-        } else if (config.configType == EConfigType.TROJAN || config.configType == EConfigType.HYSTERIA2) {
-            server.password = et_id.text.toString().trim()
+        } else if (config.configType == EConfigType.TROJAN) {
+        } else if (config.configType == EConfigType.WIREGUARD) {
+            config.secretKey = et_id.text.toString().trim()
+            config.publicKey = et_public_key?.text.toString().trim()
+            config.preSharedKey = et_preshared_key?.text.toString().trim()
+            config.reserved = et_reserved1?.text.toString().trim()
+            config.localAddress = et_local_address?.text.toString().trim()
+            config.mtu = Utils.parseInt(et_local_mtu?.text.toString())
+        } else if (config.configType == EConfigType.HYSTERIA2) {
+            config.obfsPassword = et_obfs_password?.text?.toString()
+            config.portHopping = et_port_hop?.text?.toString()
+            config.portHoppingInterval = et_port_hop_interval?.text?.toString()
+            config.pinSHA256 = et_pinsha256?.text?.toString()
         }
     }
 
-    private fun savePeer(wireguard: V2rayConfig.OutboundBean.OutSettingsBean, port: Int) {
-        wireguard.secretKey = et_id.text.toString().trim()
-        wireguard.peers?.get(0)?.publicKey = et_public_key?.text.toString().trim()
-        wireguard.peers?.get(0)?.endpoint =
-            getIpv6Address(et_address.text.toString().trim()) + ":" + port
-        val reserved1 = Utils.parseInt(et_reserved1?.text.toString())
-        val reserved2 = Utils.parseInt(et_reserved2?.text.toString())
-        val reserved3 = Utils.parseInt(et_reserved3?.text.toString())
-        if (reserved1 > 0 || reserved2 > 0 || reserved3 > 0) {
-            wireguard.reserved = listOf(reserved1, reserved2, reserved3)
-        } else {
-            wireguard.reserved = null
-        }
-        wireguard.address = et_local_address?.text.toString().removeWhiteSpace().split(",")
-        wireguard.mtu = Utils.parseInt(et_local_mtu?.text.toString())
+
+    private fun saveStreamSettings(profileItem: ProfileItem) {
+        val network = sp_network?.selectedItemPosition ?: return
+        val type = sp_header_type?.selectedItemPosition ?: return
+        val requestHost = et_request_host?.text?.toString()?.trim() ?: return
+        val path = et_path?.text?.toString()?.trim() ?: return
+
+        profileItem.network = networks[network]
+        profileItem.headerType = transportTypes(networks[network])[type]
+        profileItem.host = requestHost
+        profileItem.path = path
+        profileItem.seed = path
+        profileItem.quicSecurity = requestHost
+        profileItem.quicKey = path
+        profileItem.mode = transportTypes(networks[network])[type]
+        profileItem.serviceName = path
+        profileItem.authority = requestHost
+        profileItem.xhttpMode = transportTypes(networks[network])[type]
+        profileItem.xhttpExtra = et_extra?.text?.toString()?.trim()
     }
 
-    private fun saveStreamSettings(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean): String? {
-        val network = sp_network?.selectedItemPosition ?: return null
-        val type = sp_header_type?.selectedItemPosition ?: return null
-        val requestHost = et_request_host?.text?.toString()?.trim() ?: return null
-        val path = et_path?.text?.toString()?.trim() ?: return null
-
-        val sni = streamSetting.populateTransportSettings(
-            transport = networks[network],
-            headerType = transportTypes(networks[network])[type],
-            host = requestHost,
-            path = path,
-            seed = path,
-            quicSecurity = requestHost,
-            key = path,
-            mode = transportTypes(networks[network])[type],
-            serviceName = path,
-            authority = requestHost,
-        )
-
-        return sni
-    }
-
-    private fun saveTls(streamSetting: V2rayConfig.OutboundBean.StreamSettingsBean, sni: String?) {
+    private fun saveTls(config: ProfileItem) {
         val streamSecurity = sp_stream_security?.selectedItemPosition ?: return
         val sniField = et_sni?.text?.toString()?.trim()
         val allowInsecureField = sp_allow_insecure?.selectedItemPosition
@@ -560,38 +547,41 @@ class ServerActivity : BaseActivity() {
         val shortId = et_short_id?.text?.toString()
         val spiderX = et_spider_x?.text?.toString()
 
-        val allowInsecure = if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
-            settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
-        } else {
-            allowinsecures[allowInsecureField].toBoolean()
-        }
+        val allowInsecure =
+            if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) {
+                MmkvManager.decodeSettingsBool(PREF_ALLOW_INSECURE)
+            } else {
+                allowinsecures[allowInsecureField].toBoolean()
+            }
 
-        streamSetting.populateTlsSettings(
-            streamSecurity = streamSecuritys[streamSecurity],
-            allowInsecure = allowInsecure,
-            sni = sniField ?: sni ?: "",
-            fingerprint = uTlsItems[utlsIndex],
-            alpns = alpns[alpnIndex],
-            publicKey = publicKey,
-            shortId = shortId,
-            spiderX = spiderX
-        )
+        config.security = streamSecuritys[streamSecurity]
+        config.insecure = allowInsecure
+        config.sni = sniField
+        config.fingerPrint = uTlsItems[utlsIndex]
+        config.alpn = alpns[alpnIndex]
+        config.publicKey = publicKey
+        config.shortId = shortId
+        config.spiderX = spiderX
     }
 
     private fun transportTypes(network: String?): Array<out String> {
         return when (network) {
-            "tcp" -> {
+            NetworkType.TCP.type -> {
                 tcpTypes
             }
 
-            "kcp", "quic" -> {
+            NetworkType.KCP.type -> {
                 kcpAndQuicTypes
             }
 
-            "grpc" -> {
+            NetworkType.GRPC.type -> {
                 grpcModes
             }
 
+            NetworkType.XHTTP.type -> {
+                xhttpMode
+            }
+
             else -> {
                 arrayOf("---")
             }
@@ -599,18 +589,18 @@ class ServerActivity : BaseActivity() {
     }
 
     /**
-     * save server config
+     * delete server config
      */
     private fun deleteServer(): Boolean {
         if (editGuid.isNotEmpty()) {
             if (editGuid != MmkvManager.getSelectServer()) {
-                if (settingsStorage?.decodeBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+                if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
                     AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
                         .setPositiveButton(android.R.string.ok) { _, _ ->
                             MmkvManager.removeServer(editGuid)
                             finish()
                         }
-                        .setNegativeButton(android.R.string.no) { _, _ ->
+                        .setNegativeButton(android.R.string.cancel) { _, _ ->
                             // do nothing
                         }
                         .show()

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

@@ -8,15 +8,13 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.blacksquircle.ui.editorkit.utils.EditorTheme
 import com.blacksquircle.ui.language.json.JsonLanguage
-
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
 import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.fmt.CustomFmt
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 import me.drakeet.support.toast.ToastCompat
 
@@ -48,16 +46,14 @@ class ServerCustomConfigActivity : BaseActivity() {
     }
 
     /**
-     * bingding seleced server config
+     * Binding selected server config
      */
-    private fun bindingServer(config: ServerConfig): Boolean {
+    private fun bindingServer(config: ProfileItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(config.remarks)
         val raw = MmkvManager.decodeServerRaw(editGuid)
-        if (raw.isNullOrBlank()) {
-            binding.editor.setTextContent(Utils.getEditable(config.fullConfig?.toPrettyPrinting().orEmpty()))
-        } else {
-            binding.editor.setTextContent(Utils.getEditable(raw))
-        }
+        val configContent = raw.orEmpty()
+
+        binding.editor.setTextContent(Utils.getEditable(configContent))
         return true
     }
 
@@ -78,17 +74,20 @@ class ServerCustomConfigActivity : BaseActivity() {
             return false
         }
 
-        val v2rayConfig = try {
-            JsonUtil.fromJson(binding.editor.text.toString(), V2rayConfig::class.java)
+        val profileItem = try {
+            CustomFmt.parse(binding.editor.text.toString())
         } catch (e: Exception) {
             e.printStackTrace()
             ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
             return false
         }
 
-        val config = MmkvManager.decodeServerConfig(editGuid) ?: ServerConfig.create(EConfigType.CUSTOM)
-        config.remarks = if (binding.etRemarks.text.isNullOrEmpty()) v2rayConfig.remarks.orEmpty() else binding.etRemarks.text.toString()
-        config.fullConfig = v2rayConfig
+        val config = MmkvManager.decodeServerConfig(editGuid) ?: ProfileItem.create(EConfigType.CUSTOM)
+        binding.etRemarks.text.let {
+            config.remarks = if (it.isNullOrEmpty()) profileItem?.remarks.orEmpty() else it.toString()
+        }
+        config.server = profileItem?.server
+        config.serverPort = profileItem?.serverPort
 
         MmkvManager.encodeServerConfig(editGuid, config)
         MmkvManager.encodeServerRaw(editGuid, binding.editor.text.toString())
@@ -107,7 +106,7 @@ class ServerCustomConfigActivity : BaseActivity() {
                     MmkvManager.removeServer(editGuid)
                     finish()
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     // do nothing
                 }
                 .show()

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

@@ -17,8 +17,8 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toLongEx
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.service.SubscriptionUpdater
-import com.v2ray.ang.util.MmkvManager.settingsStorage
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.SettingsViewModel
 import java.util.concurrent.TimeUnit
@@ -40,6 +40,7 @@ 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) }
 
@@ -57,9 +58,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 +142,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 +153,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
@@ -172,33 +174,34 @@ class SettingsActivity : BaseActivity() {
 
         override fun onStart() {
             super.onStart()
-            updateMode(settingsStorage.decodeString(AppConfig.PREF_MODE, VPN))
-            localDns?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
-            fakeDns?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_FAKE_DNS_ENABLED, false)
-            localDnsPort?.summary = settingsStorage.decodeString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
-            vpnDns?.summary = settingsStorage.decodeString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
+            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)
 
-            updateMux(settingsStorage.getBoolean(AppConfig.PREF_MUX_ENABLED, false))
-            mux?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_MUX_ENABLED, false)
-            muxConcurrency?.summary = settingsStorage.decodeString(AppConfig.PREF_MUX_CONCURRENCY, "8")
-            muxXudpConcurrency?.summary = settingsStorage.decodeString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
+            updateMux(MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false))
+            mux?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false)
+            muxConcurrency?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8")
+            muxXudpConcurrency?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
 
-            updateFragment(settingsStorage.getBoolean(AppConfig.PREF_FRAGMENT_ENABLED, false))
-            fragment?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_FRAGMENT_ENABLED, false)
-            fragmentPackets?.summary = settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello")
-            fragmentLength?.summary = settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100")
-            fragmentInterval?.summary = settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
+            updateFragment(MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false))
+            fragment?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false)
+            fragmentPackets?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello")
+            fragmentLength?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100")
+            fragmentInterval?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20")
 
-            autoUpdateCheck?.isChecked = settingsStorage.getBoolean(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
+            autoUpdateCheck?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
             autoUpdateInterval?.summary =
-                settingsStorage.decodeString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
-            autoUpdateInterval?.isEnabled = settingsStorage.getBoolean(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
+                MmkvManager.decodeSettingsString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL, AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+            autoUpdateInterval?.isEnabled = MmkvManager.decodeSettingsBool(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
 
-            socksPort?.summary = settingsStorage.decodeString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
-            httpPort?.summary = settingsStorage.decodeString(AppConfig.PREF_HTTP_PORT, AppConfig.PORT_HTTP)
-            remoteDns?.summary = settingsStorage.decodeString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
-            domesticDns?.summary = settingsStorage.decodeString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
-            delayTestUrl?.summary = settingsStorage.decodeString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl)
+            socksPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT, AppConfig.PORT_SOCKS)
+            remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
+            domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
+            dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
+            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl)
 
             initSharedPreference()
         }
@@ -213,7 +216,6 @@ class SettingsActivity : BaseActivity() {
                 fragmentInterval,
                 autoUpdateInterval,
                 socksPort,
-                httpPort,
                 remoteDns,
                 domesticDns,
                 delayTestUrl
@@ -225,7 +227,7 @@ class SettingsActivity : BaseActivity() {
                 AppConfig.PREF_SNIFFING_ENABLED,
             ).forEach { key ->
                 findPreference<CheckBoxPreference>(key)?.isChecked =
-                    settingsStorage.decodeBool(key, true)
+                    MmkvManager.decodeSettingsBool(key, true)
             }
 
             listOf(
@@ -240,7 +242,7 @@ class SettingsActivity : BaseActivity() {
                 AppConfig.PREF_ALLOW_INSECURE
             ).forEach { key ->
                 findPreference<CheckBoxPreference>(key)?.isChecked =
-                    settingsStorage.decodeBool(key, false)
+                    MmkvManager.decodeSettingsBool(key, false)
             }
 
             listOf(
@@ -252,8 +254,8 @@ class SettingsActivity : BaseActivity() {
                 AppConfig.PREF_LOGLEVEL,
                 AppConfig.PREF_MODE
             ).forEach { key ->
-                if (settingsStorage.decodeString(key) != null) {
-                    findPreference<ListPreference>(key)?.value = settingsStorage.decodeString(key)
+                if (MmkvManager.decodeSettingsString(key) != null) {
+                    findPreference<ListPreference>(key)?.value = MmkvManager.decodeSettingsString(key)
                 }
             }
         }
@@ -261,14 +263,15 @@ class SettingsActivity : BaseActivity() {
         private fun updateMode(mode: String?) {
             val vpn = mode == VPN
             perAppProxy?.isEnabled = vpn
-            perAppProxy?.isChecked = settingsStorage.getBoolean(AppConfig.PREF_PER_APP_PROXY, false)
+            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
             if (vpn) {
                 updateLocalDns(
-                    settingsStorage.getBoolean(
+                    MmkvManager.decodeSettingsBool(
                         AppConfig.PREF_LOCAL_DNS_ENABLED,
                         false
                     )
@@ -310,19 +313,17 @@ class SettingsActivity : BaseActivity() {
             muxXudpConcurrency?.isEnabled = enabled
             muxXudpQuic?.isEnabled = enabled
             if (enabled) {
-                updateMuxConcurrency(settingsStorage.decodeString(AppConfig.PREF_MUX_CONCURRENCY, "8"))
-                updateMuxXudpConcurrency(settingsStorage.decodeString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8"))
+                updateMuxConcurrency(MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8"))
+                updateMuxXudpConcurrency(MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8"))
             }
         }
 
         private fun updateMuxConcurrency(value: String?) {
-            if (value == null) {
-            } else {
-                val concurrency = value.toIntOrNull() ?: 8
-                muxConcurrency?.summary = concurrency.toString()
-            }
+            val concurrency = value?.toIntOrNull() ?: 8
+            muxConcurrency?.summary = concurrency.toString()
         }
 
+
         private fun updateMuxXudpConcurrency(value: String?) {
             if (value == null) {
                 muxXudpQuic?.isEnabled = true
@@ -338,9 +339,9 @@ class SettingsActivity : BaseActivity() {
             fragmentLength?.isEnabled = enabled
             fragmentInterval?.isEnabled = enabled
             if (enabled) {
-                updateFragmentPackets(settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello"))
-                updateFragmentLength(settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100"))
-                updateFragmentInterval(settingsStorage.decodeString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20"))
+                updateFragmentPackets(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello"))
+                updateFragmentLength(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100"))
+                updateFragmentInterval(MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_INTERVAL, "10-20"))
             }
         }
 

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

@@ -10,7 +10,7 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubEditBinding
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -81,10 +81,17 @@ class SubEditActivity : BaseActivity() {
             toast(R.string.sub_setting_remarks)
             return false
         }
-//        if (TextUtils.isEmpty(subItem.url)) {
-//            toast(R.string.sub_setting_url)
-//            return false
-//        }
+        if (subItem.url.isNotEmpty()) {
+            if (!Utils.isValidUrl(subItem.url)) {
+                toast(R.string.toast_invalid_url)
+                return false
+            }
+
+            if (!Utils.isValidSubUrl(subItem.url)) {
+                toast(R.string.toast_insecure_url_protocol)
+                //return false
+            }
+        }
 
         MmkvManager.encodeSubscription(editSubId, subItem)
         toast(R.string.toast_success)
@@ -106,7 +113,7 @@ class SubEditActivity : BaseActivity() {
                         }
                     }
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     // do nothing
                 }
                 .show()

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

@@ -13,9 +13,9 @@ 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
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
-import com.v2ray.ang.util.AngConfigManager
-import com.v2ray.ang.util.MmkvManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch

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

@@ -12,11 +12,11 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
 import com.v2ray.ang.extension.toast
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
-import com.v2ray.ang.util.MmkvManager
 import com.v2ray.ang.util.QRCodeDecoder
-import com.v2ray.ang.util.SettingsManager
 import com.v2ray.ang.util.Utils
 
 class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {
@@ -45,7 +45,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
         }
 
         holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
-            if( !it.isPressed) return@setOnCheckedChangeListener
+            if (!it.isPressed) return@setOnCheckedChangeListener
             subItem.enabled = isChecked
             MmkvManager.encodeSubscription(subId, subItem)
 

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

@@ -11,7 +11,7 @@ import android.widget.ListView
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityTaskerBinding
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.handler.MmkvManager
 
 class TaskerActivity : BaseActivity() {
     private val binding by lazy { ActivityTaskerBinding.inflate(layoutInflater) }

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

@@ -7,7 +7,7 @@ import android.util.Log
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.AngConfigManager
+import com.v2ray.ang.handler.AngConfigManager
 import java.net.URLDecoder
 
 class UrlSchemeActivity : BaseActivity() {

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

@@ -29,12 +29,12 @@ 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.util.MmkvManager
-import com.v2ray.ang.util.MmkvManager.settingsStorage
-import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
@@ -71,23 +71,12 @@ class UserAssetActivity : BaseActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.add_file -> {
-            showFileChooser()
-            true
-        }
-
-        R.id.add_url -> {
-            val intent = Intent(this, UserAssetUrlActivity::class.java)
-            startActivity(intent)
-            true
-        }
-
-        R.id.download_file -> {
-            downloadGeoFiles()
-            true
-        }
-
+    // Use when to streamline the option selection
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.add_file -> showFileChooser().let { true }
+        R.id.add_url -> startActivity(Intent(this, UserAssetUrlActivity::class.java)).let { true }
+        R.id.add_qrcode -> importAssetFromQRcode().let { true }
+        R.id.download_file -> downloadGeoFiles().let { true }
         else -> super.onOptionsItemSelected(item)
     }
 
@@ -120,31 +109,29 @@ class UserAssetActivity : BaseActivity() {
             }
     }
 
-    private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { it ->
-            val uri = it.data?.data
-            if (it.resultCode == RESULT_OK && uri != null) {
-                val assetId = Utils.getUuid()
-                try {
-                    val assetItem = AssetUrlItem(
-                        getCursorName(uri) ?: uri.toString(),
-                        "file"
-                    )
+    val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val uri = result.data?.data
+        if (result.resultCode == RESULT_OK && uri != null) {
+            val assetId = Utils.getUuid()
+            runCatching {
+                val assetItem = AssetUrlItem(
+                    getCursorName(uri) ?: uri.toString(),
+                    "file"
+                )
 
-                    // check remarks unique
-                    val assetList = MmkvManager.decodeAssetUrls()
-                    if (assetList.any { it.second.remarks == assetItem.remarks && it.first != assetId }) {
-                        toast(R.string.msg_remark_is_duplicate)
-                        return@registerForActivityResult
-                    }
+                val assetList = MmkvManager.decodeAssetUrls()
+                if (assetList.any { it.second.remarks == assetItem.remarks && it.first != assetId }) {
+                    toast(R.string.msg_remark_is_duplicate)
+                } else {
                     MmkvManager.encodeAsset(assetId, assetItem)
                     copyFile(uri)
-                } catch (e: Exception) {
-                    toast(R.string.toast_asset_copy_failed)
-                    MmkvManager.removeAssetUrl(assetId)
                 }
+            }.onFailure {
+                toast(R.string.toast_asset_copy_failed)
+                MmkvManager.removeAssetUrl(assetId)
             }
         }
+    }
 
     private fun copyFile(uri: Uri): String {
         val targetFile = File(extDir, getCursorName(uri) ?: uri.toString())
@@ -170,6 +157,40 @@ class UserAssetActivity : BaseActivity() {
         null
     }
 
+    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)
+            }
+        return true
+    }
+
+    private val scanQRCodeForAssetURL = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_OK) {
+            importAsset(it.data?.getStringExtra("SCAN_RESULT"))
+        }
+    }
+
+    private fun importAsset(url: String?): Boolean {
+        try {
+            if (!Utils.isValidUrl(url)) {
+                toast(R.string.toast_invalid_url)
+                return false
+            }
+            // Send URL to UserAssetUrlActivity for Processing
+            startActivity(Intent(this, UserAssetUrlActivity::class.java)
+                .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url))
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+        return true
+    }
+
     private fun downloadGeoFiles() {
         val dialog = AlertDialog.Builder(this)
             .setView(LayoutProgressBinding.inflate(layoutInflater).root)
@@ -254,6 +275,15 @@ class UserAssetActivity : BaseActivity() {
         return list + assets
     }
 
+    fun initAssets() {
+        lifecycleScope.launch(Dispatchers.Default) {
+            SettingsManager.initAssets(this@UserAssetActivity, assets)
+            withContext(Dispatchers.Main) {
+                binding.recyclerView.adapter?.notifyDataSetChanged()
+            }
+        }
+    }
+
     inner class UserAssetAdapter : RecyclerView.Adapter<UserAssetViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserAssetViewHolder {
             return UserAssetViewHolder(
@@ -285,10 +315,10 @@ class UserAssetActivity : BaseActivity() {
 
             if (item.second.remarks in builtInGeoFiles && item.second.url == AppConfig.GeoUrl + item.second.remarks) {
                 holder.itemUserAssetBinding.layoutEdit.visibility = GONE
-                holder.itemUserAssetBinding.layoutRemove.visibility = GONE
+                //holder.itemUserAssetBinding.layoutRemove.visibility = GONE
             } else {
                 holder.itemUserAssetBinding.layoutEdit.visibility = item.second.url.let { if (it == "file") GONE else VISIBLE }
-                holder.itemUserAssetBinding.layoutRemove.visibility = VISIBLE
+                //holder.itemUserAssetBinding.layoutRemove.visibility = VISIBLE
             }
 
             holder.itemUserAssetBinding.layoutEdit.setOnClickListener {
@@ -297,9 +327,16 @@ class UserAssetActivity : BaseActivity() {
                 startActivity(intent)
             }
             holder.itemUserAssetBinding.layoutRemove.setOnClickListener {
-                file?.delete()
-                MmkvManager.removeAssetUrl(item.first)
-                binding.recyclerView.adapter?.notifyItemRemoved(position)
+                AlertDialog.Builder(this@UserAssetActivity).setMessage(R.string.del_config_comfirm)
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                        file?.delete()
+                        MmkvManager.removeAssetUrl(item.first)
+                        initAssets()
+                    }
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
+                        //do noting
+                    }
+                    .show()
             }
         }
 

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

@@ -9,11 +9,16 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityUserAssetUrlBinding
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 import java.io.File
 
 class UserAssetUrlActivity : BaseActivity() {
+    // Receive QRcode URL from UserAssetActivity
+    companion object {
+        const val ASSET_URL_QRCODE = "ASSET_URL_QRCODE"
+    }
+
     private val binding by lazy { ActivityUserAssetUrlBinding.inflate(layoutInflater) }
 
     var del_config: MenuItem? = null
@@ -28,10 +33,15 @@ class UserAssetUrlActivity : BaseActivity() {
         title = getString(R.string.title_user_asset_add_url)
 
         val assetItem = MmkvManager.decodeAsset(editAssetId)
-        if (assetItem != null) {
-            bindingAsset(assetItem)
-        } else {
-            clearAsset()
+        val assetUrlQrcode = intent.getStringExtra(ASSET_URL_QRCODE)
+        val assetNameQrcode = File(assetUrlQrcode.toString()).name
+        when {
+            assetItem != null -> bindingAsset(assetItem)
+            assetUrlQrcode != null -> {
+                binding.etRemarks.setText(assetNameQrcode)
+                binding.etUrl.setText(assetUrlQrcode)
+            }
+            else -> clearAsset()
         }
     }
 
@@ -106,7 +116,7 @@ class UserAssetUrlActivity : BaseActivity() {
                     MmkvManager.removeAssetUrl(editAssetId)
                     finish()
                 }
-                .setNegativeButton(android.R.string.no) { _, _ ->
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
                     // do nothing
                 }
                 .show()

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

@@ -13,13 +13,11 @@ object AppManagerUtil {
         val apps = ArrayList<AppInfo>()
 
         for (pkg in packages) {
-            //if (!pkg.hasInternetPermission && pkg.packageName != "android") continue
-
-            val applicationInfo = pkg.applicationInfo
+            val applicationInfo = pkg.applicationInfo ?: continue
 
             val appName = applicationInfo.loadLabel(packageManager).toString()
-            val appIcon = applicationInfo.loadIcon(packageManager)
-            val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0
+            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)

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

@@ -2,6 +2,8 @@ package com.v2ray.ang.util
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
@@ -15,15 +17,17 @@ object JsonUtil {
         return gson.toJson(src)
     }
 
-    fun <T> fromJson(json: String, cls: Class<T>): T {
-        return gson.fromJson(json, cls)
+    fun <T> fromJson(src: String, cls: Class<T>): T {
+        return gson.fromJson(src, cls)
     }
 
-    fun toJsonPretty(src: Any?): String {
+    fun toJsonPretty(src: Any?): String? {
+        if (src == null)
+            return null
         val gsonPre = GsonBuilder()
             .setPrettyPrinting()
             .disableHtmlEscaping()
-            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
+            .registerTypeAdapter( // custom serializer is needed here since JSON by default parse number as Double, core will fail to start
                 object : TypeToken<Double>() {}.type,
                 JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? ->
                     JsonPrimitive(
@@ -34,4 +38,15 @@ object JsonUtil {
             .create()
         return gsonPre.toJson(src)
     }
+
+    fun parseString(src: String?): JsonObject? {
+        if (src == null)
+            return null
+        try {
+            return JsonParser.parseString(src).getAsJsonObject()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return null
+        }
+    }
 }