.github/workflows/build.yml

@@ -1,14 +1,13 @@
 name: Build APK
 
 on:
+  push:
   workflow_dispatch:
     inputs:
-      release_tag:
+      XRAY_CORE_VERSION:
+        description: 'Xray core version or commit hash'
         required: false
-        type: string
+
-  push:
-    branches:
-      - master
 
 jobs:
   build:
@@ -16,144 +15,49 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v4
-      with:
-        submodules: 'recursive'
-        fetch-depth: '0'
-
-    - name: Setup Android SDK
-      uses: android-actions/setup-android@v3.2.0
-      with:
-        log-accepted-android-sdk-licenses: false
-        cmdline-tools-version: '12266719'
-        packages: 'platforms;android-35 build-tools;35.0.0 platform-tools'
-
-    - name: Install NDK
-      run: |
-        echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \
-          --channel=3 \
-          --install "ndk;29.0.13113456"
-        echo "NDK_HOME=$ANDROID_HOME/ndk/29.0.13113456" >> $GITHUB_ENV
-        sed -i '10i\
-        \
-            ndkVersion = "29.0.13113456"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
-
-    - name: Restore cached libtun2socks
-      id: cache-libtun2socks-restore
-      uses: actions/cache/restore@v4
-      with:
-        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
-
-    - name: Build libtun2socks
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
-      run: |
-        bash compile-tun2socks.sh
-
-    - name: Save libtun2socks
-      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
-
-    - name: Copy libtun2socks
-      run: |
-        cp -r ${{ github.workspace }}/libs ${{ github.workspace }}/V2rayNG/app
-
-    - name: Fetch AndroidLibXrayLite tag
-      run: |
-        pushd AndroidLibXrayLite
-        CURRENT_TAG=$(git describe --tags --abbrev=0)
-        echo "Current tag in this repo: $CURRENT_TAG"
-        echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_ENV
-        popd
-
-    - name: Download libv2ray
-      uses: robinraju/release-downloader@v1.12
-      with:
-        repository: '2dust/AndroidLibXrayLite'
-        tag: ${{ env.CURRENT_TAG }}
-        fileName: 'libv2ray.aar'
-        out-file-path: V2rayNG/app/libs/
-
-    - name: Restore cached libhysteria2
-      id: cache-libhysteria2-restore
-      uses: actions/cache/restore@v4
-      with:
-        path: ${{ github.workspace }}/hysteria/libs
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
-
-    - name: Setup Golang
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      uses: actions/setup-go@v5.4.0
-      with:
-        go-version-file: 'AndroidLibXrayLite/go.mod'
-        cache: false
-
-    - name: Build libhysteria2
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      run: |
-        bash libhysteria2.sh
-
-    - name: Save libhysteria2
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ${{ github.workspace }}/hysteria/libs
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
-
-    - name: Copy libhysteria2
-      run: |
-        cp -r ${{ github.workspace }}/hysteria/libs ${{ github.workspace }}/V2rayNG/app
 
     - name: Setup Java
-      uses: actions/setup-java@v4.7.0
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21'
+        java-version: '17'
 
-    - name: Decode Keystore
+    - name: Setup Golang
-      uses: timheuer/base64-to-file@v1.2.4
+      uses: actions/setup-go@v5
-      id: android_keystore
       with:
-        fileName: "android_keystore.jks"
+        go-version: '1.22.2'
-        encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }}
+
+    - name: Install gomobile
+      run: |
+        go install golang.org/x/mobile/cmd/gomobile@latest
+        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+
+
+    - name: Setup Android environment
+      uses: android-actions/setup-android@v3
+
+
+    - name: Build dependencies
+      run: |
+        mkdir ${{ github.workspace }}/build
+        cd ${{ github.workspace }}/build
+        git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git
+        cd AndroidLibXrayLite
+        go get github.com/xtls/xray-core@${{ github.event.inputs.XRAY_CORE_VERSION }} || true
+        gomobile init
+        go mod tidy -v
+        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
+        cp *.aar ${{ github.workspace }}/V2rayNG/app/libs/
 
     - name: Build APK
       run: |
         cd ${{ github.workspace }}/V2rayNG
-        echo "sdk.dir=${ANDROID_HOME}" > local.properties
         chmod 755 gradlew
-        ./gradlew licenseFdroidReleaseReport
+        ./gradlew assembleDebug
-        ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}
 
-    - name: Upload arm64-v8a APK
+    - name: Upload APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v4
-      if: ${{  success() }}
       with:
-        name: arm64-v8a
+        name: apk
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
+        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/debug/
-
-    - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4.6.2
-      if: ${{  success() }}
-      with:
-        name: armeabi-v7a
-        path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
-
-    - name: Upload x86 APK
-      uses: actions/upload-artifact@v4.6.2
-      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

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

.gitignore

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

.gitmodules

@@ -1,12 +0,0 @@
-[submodule "hysteria"]
-	path = hysteria
-	url = https://github.com/apernet/hysteria
-[submodule "AndroidLibXrayLite"]
-	path = AndroidLibXrayLite
-	url = https://github.com/2dust/AndroidLibXrayLite
-[submodule "badvpn"]
-	path = badvpn
-	url = https://github.com/XTLS/badvpn
-[submodule "libancillary"]
-	path = libancillary
-	url = https://github.com/shadowsocks/libancillary

AndroidLibV2rayLite/README.md

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

AndroidLibXrayLite

@@ -1 +0,0 @@
-Subproject commit 8ad3e1ddf165d8d67e488346b2faa9153d3e33a4

README.md

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

V2rayNG/.gitignore

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

V2rayNG/app/.gitignore

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

V2rayNG/app/build.gradle.kts

@@ -1,63 +1,46 @@
 plugins {
-    alias(libs.plugins.android.application)
+    id("com.android.application")
-    alias(libs.plugins.kotlin.android)
+    id("org.jetbrains.kotlin.android")
-    id("com.jaredsburrows.license")
 }
 
 android {
     namespace = "com.v2ray.ang"
-    compileSdk = 35
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.v2ray.ang"
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 34
-        versionCode = 658
+        versionCode = 601
-        versionName = "1.10.8"
+        versionName = "1.9.7"
         multiDexEnabled = true
-
-        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
         splits {
             abi {
                 isEnable = true
-                reset()
-                if (abiFilterList != null && abiFilterList.isNotEmpty()) {
-                    include(*abiFilterList.toTypedArray())
-                } else {
                 include(
                     "arm64-v8a",
                     "armeabi-v7a",
                     "x86_64",
                     "x86"
                 )
-                }
+                isUniversalApk = true
-                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"
-            )
-        }
-    }
 
-    flavorDimensions.add("distribution")
-    productFlavors {
-        create("fdroid") {
-            dimension = "distribution"
-            applicationIdSuffix = ".fdroid"
-            buildConfigField("String", "DISTRIBUTION", "\"F-Droid\"")
         }
-        create("playstore") {
+        debug {
-            dimension = "distribution"
+            isMinifyEnabled = false
-            buildConfigField("String", "DISTRIBUTION", "\"Play Store\"")
+
         }
     }
 
@@ -67,38 +50,12 @@ android {
         }
     }
 
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     applicationVariants.all {
         val variant = this
-        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 = 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)
 
@@ -112,14 +69,12 @@ android {
 
                 output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk"
                 if (versionCodes.containsKey(abi)) {
-                        output.versionCodeOverride =
+                    output.versionCodeOverride = (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
-                            (1000000 * versionCodes[abi]!!).plus(variant.versionCode)
                 } else {
                     return@forEach
                 }
             }
     }
-    }
 
     buildFeatures {
         viewBinding = true
@@ -131,61 +86,47 @@ android {
             useLegacyPackaging = true
         }
     }
-
 }
 
 dependencies {
-    // Core Libraries
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar", "*.jar"))))
+    testImplementation(libs.junit)
 
-    // AndroidX Core Libraries
+    implementation(libs.flexbox)
-    implementation(libs.androidx.core.ktx)
+    // Androidx
-    implementation(libs.androidx.appcompat)
+    implementation(libs.constraintlayout)
-    implementation(libs.androidx.activity)
+    implementation(libs.legacy.support.v4)
-    implementation(libs.androidx.constraintlayout)
+    implementation(libs.appcompat)
+    implementation(libs.material)
+    implementation(libs.cardview)
     implementation(libs.preference.ktx)
     implementation(libs.recyclerview)
-    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.fragment.ktx)
+    implementation(libs.multidex)
+    implementation(libs.viewpager2)
 
-    // UI Libraries
+    // Androidx ktx
-    implementation(libs.material)
+    implementation(libs.activity.ktx)
-    implementation(libs.toasty)
-    implementation(libs.editorkit)
-    implementation(libs.flexbox)
-
-    // Data and Storage Libraries
-    implementation(libs.mmkv.static)
-    implementation(libs.gson)
-
-    // Reactive and Utility Libraries
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.kotlinx.coroutines.core)
-
-    // Language and Processing Libraries
-    implementation(libs.language.base)
-    implementation(libs.language.json)
-
-    // Intent and Utility Libraries
-    implementation(libs.quickie.foss)
-    implementation(libs.core)
-
-    // AndroidX Lifecycle and Architecture Components
     implementation(libs.lifecycle.viewmodel.ktx)
     implementation(libs.lifecycle.livedata.ktx)
     implementation(libs.lifecycle.runtime.ktx)
 
-    // Background Task Libraries
+    //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)
     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

@@ -1,21 +0,0 @@
-# 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

@@ -35,6 +35,7 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- <useapplications-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
@@ -51,7 +52,6 @@
         android:banner="@mipmap/ic_banner"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppThemeDayNight"
         android:usesCleartextTraffic="true"
@@ -144,9 +144,6 @@
                 <data android:host="install-sub" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.CheckUpdateActivity"
-            android:exported="false" />
         <activity
             android:name=".ui.AboutActivity"
             android:exported="false" />
@@ -215,8 +212,7 @@
             android:icon="@drawable/ic_stat_name"
             android:label="@string/app_tile_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:process=":RunSoLibV2RayDaemon"
+            android:process=":RunSoLibV2RayDaemon">
-            tools:targetApi="24">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -228,7 +224,8 @@
         <activity
             android:name=".ui.TaskerActivity"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher">
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
@@ -237,8 +234,7 @@
         <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

@@ -20,6 +20,13 @@
     "port": "443",
     "network": "udp"
   },
+  {
+    "remarks": "阻断广告",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -35,89 +42,21 @@
     ]
   },
   {
-    "remarks": "代理海外公共DNSIP",
+    "remarks": "代理GFW",
-    "outboundTag": "proxy",
-    "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": "代理海外公共DNS域名",
     "outboundTag": "proxy",
     "domain": [
-      "domain:cloudflare-dns.com",
+      "geosite:gfw",
-      "domain:one.one.one.one",
+      "geosite:greatfire"
-      "domain:dns.google",
-      "domain:adguard-dns.com",
-      "domain:opendns.com",
-      "domain:umbrella.com",
-      "domain:quad9.net",
-      "domain:yandex.net"
     ]
   },
   {
-    "remarks": "代理IP",
+    "remarks": "代理Google等",
     "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",
@@ -126,14 +65,6 @@
       "geoip:twitter"
     ]
   },
-  {
-    "remarks": "代理GFW",
-    "outboundTag": "proxy",
-    "domain": [
-      "geosite:gfw",
-      "geosite:greatfire"
-    ]
-  },
   {
     "remarks": "最终直连",
     "port": "0-65535",

V2rayNG/app/src/main/assets/custom_routing_global

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

V2rayNG/app/src/main/assets/custom_routing_white

@@ -13,6 +13,13 @@
     "port": "443",
     "network": "udp"
   },
+  {
+    "remarks": "阻断广告",
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
   {
     "remarks": "绕过局域网IP",
     "outboundTag": "direct",
@@ -28,69 +35,48 @@
     ]
   },
   {
-    "remarks": "绕过中国公共DNSIP",
+    "remarks": "绕过中国域名",
-    "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:dns.alidns.com",
+      "domain:dns.pub",
       "domain:doh.pub",
       "domain:dot.pub",
-      "domain:360.cn",
+      "domain:doh.360.cn",
-      "domain:onedns.net"
+      "domain:dot.360.cn",
+      "geosite:cn",
+      "geosite:geolocation-cn"
     ]
   },
   {
     "remarks": "绕过中国IP",
     "outboundTag": "direct",
     "ip": [
+      "223.5.5.5/32",
+      "223.6.6.6/32",
+      "2400:3200::1/128",
+      "2400:3200:baba::1/128",
+      "119.29.29.29/32",
+      "1.12.12.12/32",
+      "120.53.53.53/32",
+      "2402:4e00::/128",
+      "2402:4e00:1::/128",
+      "180.76.76.76/32",
+      "2400:da00::6666/128",
+      "114.114.114.114/32",
+      "114.114.115.115/32",
+      "180.184.1.1/32",
+      "180.184.2.2/32",
+      "101.226.4.6/32",
+      "218.30.118.6/32",
+      "123.125.81.6/32",
+      "140.207.198.6/32",
       "geoip:cn"
     ]
   },
   {
-    "remarks": "绕过中国域名",
+    "remarks": "最终代理",
-    "outboundTag": "direct",
+    "port": "0-65535",
-    "domain": [
+    "outboundTag": "proxy"
-      "geosite:cn"
-    ]
   }
 ]

V2rayNG/app/src/main/assets/custom_routing_white_iran

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

V2rayNG/app/src/main/assets/proxy_packagename.txt

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

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

@@ -97,7 +97,7 @@
   }
   ],
   "routing": {
-      "domainStrategy": "AsIs",
+      "domainStrategy": "IPIfNonMatch",
       "rules": []
   },
   "dns": {

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

@@ -1,47 +0,0 @@
-package com.v2ray.ang
-
-import android.content.Context
-import androidx.multidex.MultiDexApplication
-import androidx.work.Configuration
-import androidx.work.WorkManager
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.handler.SettingsManager
-
-class AngApplication : MultiDexApplication() {
-    companion object {
-        lateinit var application: AngApplication
-    }
-
-    /**
-     * Attaches the base context to the application.
-     * @param base The base context.
-     */
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        application = this
-    }
-
-    private val workManagerConfiguration: Configuration = Configuration.Builder()
-        .setDefaultProcessName("${ANG_PACKAGE}:bg")
-        .build()
-
-    /**
-     * Initializes the application.
-     */
-    override fun onCreate() {
-        super.onCreate()
-
-        MMKV.initialize(this)
-
-        SettingsManager.setNightMode()
-        // Initialize WorkManager with the custom configuration
-        WorkManager.initialize(this, workManagerConfiguration)
-
-        SettingsManager.initRoutingRulesets(this)
-
-        es.dmoral.toasty.Toasty.Config.getInstance()
-            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
-            .apply()
-    }
-}

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-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"),
-    ARABIC("ar"),
-    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

@@ -1,18 +0,0 @@
-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

@@ -1,120 +0,0 @@
-package com.v2ray.ang.dto
-
-import com.v2ray.ang.AppConfig.LOOPBACK
-import com.v2ray.ang.AppConfig.PORT_SOCKS
-import com.v2ray.ang.AppConfig.TAG_BLOCKED
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.AppConfig.TAG_PROXY
-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,
-    var bandwidthDown: String? = null,
-    var bandwidthUp: 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 {
-        if (server.isNullOrEmpty() && configType == EConfigType.CUSTOM) {
-            return "$LOOPBACK:$PORT_SOCKS"
-        }
-        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/RoutingType.kt

@@ -1,20 +0,0 @@
-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/VpnInterfaceAddressConfig.kt

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

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

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

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

@@ -1,27 +0,0 @@
-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() {
-    /**
-     * Parses a JSON string into a ProfileItem object.
-     *
-     * @param str the JSON string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.CUSTOM)
-
-        val fullConfig = JsonUtil.fromJson(str, V2rayConfig::class.java)
-        val outbound = fullConfig.getProxyOutbound()
-
-        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

@@ -1,170 +0,0 @@
-package com.v2ray.ang.fmt
-
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.HttpUtil
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-open class FmtBase {
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @param userInfo the user information to include in the URI
-     * @param dicQuery the query parameters to include in the URI
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, String>?): String {
-        val query = if (dicQuery != null)
-            "?" + dicQuery.toList().joinToString(
-                separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) })
-        else ""
-
-        val url = String.format(
-            "%s@%s:%s",
-            Utils.urlEncode(userInfo ?: ""),
-            Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
-            config.serverPort
-        )
-
-        return "${url}${query}#${Utils.urlEncode(config.remarks)}"
-    }
-
-    /**
-     * Extracts query parameters from a URI.
-     *
-     * @param uri the URI to extract query parameters from
-     * @return a map of query parameters
-     */
-    fun getQueryParam(uri: URI): Map<String, String> {
-        return uri.rawQuery.split("&")
-            .associate { it.split("=").let { (k, v) -> k to Utils.urlDecode(v) } }
-    }
-
-    /**
-     * Populates a ProfileItem object with values from query parameters.
-     *
-     * @param config the ProfileItem object to populate
-     * @param queryParam the query parameters to use for populating the ProfileItem
-     * @param allowInsecure whether to allow insecure connections
-     */
-    fun getItemFormQuery(config: ProfileItem, queryParam: Map<String, String>, allowInsecure: Boolean) {
-        config.network = queryParam["type"] ?: NetworkType.TCP.type
-        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"]
-    }
-
-    /**
-     * Creates a map of query parameters from a ProfileItem object.
-     *
-     * @param config the ProfileItem object to create query parameters from
-     * @return a map of query parameters
-     */
-    fun getQueryDic(config: ProfileItem): HashMap<String, String> {
-        val dicQuery = HashMap<String, String>()
-        dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
-        config.sni.let { if (it.isNotNullEmpty()) dicQuery["sni"] = it.orEmpty() }
-        config.alpn.let { if (it.isNotNullEmpty()) dicQuery["alpn"] = it.orEmpty() }
-        config.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
-    }
-
-    fun getServerAddress(profileItem: ProfileItem): String {
-        if (Utils.isPureIpAddress(profileItem.server.orEmpty())) {
-            return profileItem.server.orEmpty()
-        }
-
-        val domain = HttpUtil.toIdnDomain(profileItem.server.orEmpty())
-        if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") != "2") {
-            return domain
-        }
-        //Resolve and replace domain
-        val resolvedIps = HttpUtil.resolveHostToIP(domain, MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
-        if (resolvedIps.isNullOrEmpty()) {
-            return domain
-        }
-        return resolvedIps.first()
-    }
-}

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

@@ -1,32 +0,0 @@
-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 com.v2ray.ang.handler.V2rayConfigManager
-
-object HttpFmt : FmtBase() {
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HTTP)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = getServerAddress(profileItem)
-            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

@@ -1,151 +0,0 @@
-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.handler.V2rayConfigManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object Hysteria2Fmt : FmtBase() {
-    /**
-     * Parses a Hysteria2 URI string into a ProfileItem object.
-     *
-     * @param str the Hysteria2 URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.HYSTERIA2)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
-        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
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = HashMap<String, String>()
-
-        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)
-    }
-
-    /**
-     * Converts a ProfileItem object to a Hysteria2Bean object.
-     *
-     * @param config the ProfileItem object to convert
-     * @param socksPort the port number for the socks5 proxy
-     * @return the converted Hysteria2Bean object, or null if conversion fails
-     */
-    fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
-
-        val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
-            Hysteria2Bean.ObfsBean(
-                type = "salamander",
-                salamander = Hysteria2Bean.ObfsBean.SalamanderBean(
-                    password = config.obfsPassword
-                )
-            )
-
-        val transport = if (config.portHopping.isNullOrEmpty()) null else
-            Hysteria2Bean.TransportBean(
-                type = "udp",
-                udp = Hysteria2Bean.TransportBean.TransportUdpBean(
-                    hopInterval = (config.portHoppingInterval ?: "30") + "s"
-                )
-            )
-
-        val bandwidth = if (config.bandwidthDown.isNullOrEmpty() || config.bandwidthUp.isNullOrEmpty()) null else
-            Hysteria2Bean.BandwidthBean(
-                down = config.bandwidthDown,
-                up = config.bandwidthUp,
-            )
-
-        val server =
-            if (config.portHopping.isNullOrEmpty())
-                config.getServerAddressAndPort()
-            else
-                Utils.getIpv6Address(config.server) + ":" + config.portHopping
-
-        val bean = Hysteria2Bean(
-            server = server,
-            auth = config.password,
-            obfs = obfs,
-            transport = transport,
-            bandwidth = bandwidth,
-            socks5 = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            http = Hysteria2Bean.Socks5Bean(
-                listen = "$LOOPBACK:${socksPort}",
-            ),
-            tls = Hysteria2Bean.TlsBean(
-                sni = config.sni ?: config.server,
-                insecure = config.insecure,
-                pinSHA256 = if (config.pinSHA256.isNullOrEmpty()) null else config.pinSHA256
-            )
-        )
-        return bean
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2)
-        return outboundBean
-    }
-}

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

@@ -1,154 +0,0 @@
-package com.v2ray.ang.fmt
-
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.NetworkType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.V2rayConfig.OutboundBean
-import com.v2ray.ang.extension.idnHost
-import com.v2ray.ang.handler.V2rayConfigManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object ShadowsocksFmt : FmtBase() {
-    /**
-     * Parses a Shadowsocks URI string into a ProfileItem object.
-     *
-     * @param str the Shadowsocks URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        return parseSip002(str) ?: parseLegacy(str)
-    }
-
-    /**
-     * Parses a SIP002 Shadowsocks URI string into a ProfileItem object.
-     *
-     * @param str the SIP002 Shadowsocks URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parseSip002(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
-
-        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()).let { if (it.isEmpty()) "none" else it }
-        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
-    }
-
-    /**
-     * Parses a legacy Shadowsocks URI string into a ProfileItem object.
-     *
-     * @param str the legacy Shadowsocks URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parseLegacy(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SHADOWSOCKS)
-        var result = str.replace(EConfigType.SHADOWSOCKS.protocolScheme, "")
-        val indexSplit = result.indexOf("#")
-        if (indexSplit > 0) {
-            try {
-                config.remarks =
-                    Utils.urlDecode(result.substring(indexSplit + 1, result.length))
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to decode remarks in SS legacy URL", e)
-            }
-
-            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
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val pw = "${config.method}:${config.password}"
-
-        return toUri(config, Utils.encode(pw), null)
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SHADOWSOCKS)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = getServerAddress(profileItem)
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            server.password = profileItem.password
-            server.method = profileItem.method
-        }
-
-        val sni = outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
-        }
-
-        outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-        }
-
-        return outboundBean
-    }
-}

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

@@ -1,79 +0,0 @@
-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.handler.V2rayConfigManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object SocksFmt : FmtBase() {
-    /**
-     * Parses a Socks URI string into a ProfileItem object.
-     *
-     * @param str the Socks URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        val config = ProfileItem.create(EConfigType.SOCKS)
-
-        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()).let { if (it.isEmpty()) "none" else it }
-        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
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val pw =
-            if (config.username.isNotNullEmpty())
-                "${config.username}:${config.password}"
-            else
-                ":"
-
-        return toUri(config, Utils.encode(pw), null)
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SOCKS)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = getServerAddress(profileItem)
-            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

@@ -1,83 +0,0 @@
-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.handler.V2rayConfigManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object TrojanFmt : FmtBase() {
-    /**
-     * Parses a Trojan URI string into a ProfileItem object.
-     *
-     * @param str the Trojan URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.TROJAN)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
-        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
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = getQueryDic(config)
-
-        return toUri(config, config.password, dicQuery)
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.TROJAN)
-
-        outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = getServerAddress(profileItem)
-            server.port = profileItem.serverPort.orEmpty().toInt()
-            server.password = profileItem.password
-            server.flow = profileItem.flow
-        }
-
-        val sni = outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
-        }
-
-        outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-        }
-
-        return outboundBean
-    }
-}

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

@@ -1,80 +0,0 @@
-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.handler.V2rayConfigManager
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object VlessFmt : FmtBase() {
-
-    /**
-     * Parses a Vless URI string into a ProfileItem object.
-     *
-     * @param str the Vless URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VLESS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.rawQuery.isNullOrEmpty()) return null
-        val queryParam = getQueryParam(uri)
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-        config.method = queryParam["encryption"] ?: "none"
-
-        getItemFormQuery(config, queryParam, allowInsecure)
-
-        return config
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val dicQuery = getQueryDic(config)
-        dicQuery["encryption"] = config.method ?: "none"
-
-        return toUri(config, config.password, dicQuery)
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VLESS)
-
-        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = getServerAddress(profileItem)
-            vnext.port = profileItem.serverPort.orEmpty().toInt()
-            vnext.users[0].id = profileItem.password.orEmpty()
-            vnext.users[0].encryption = profileItem.method
-            vnext.users[0].flow = profileItem.flow
-        }
-
-        val sni = outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
-        }
-
-        outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-        }
-
-        return outboundBean
-    }
-}

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

@@ -1,192 +0,0 @@
-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.handler.V2rayConfigManager
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import java.net.URI
-
-object VmessFmt : FmtBase() {
-    /**
-     * Parses a Vmess string into a ProfileItem object.
-     *
-     * @param str the Vmess string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parse(str: String): ProfileItem? {
-        if (str.indexOf('?') > 0 && str.indexOf('&') > 0) {
-            return parseVmessStd(str)
-        }
-
-        var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VMESS)
-
-        var result = str.replace(EConfigType.VMESS.protocolScheme, "")
-        result = Utils.decode(result)
-        if (TextUtils.isEmpty(result)) {
-            Log.w(AppConfig.TAG, "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.w(AppConfig.TAG, "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
-    }
-
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
-    fun toUri(config: ProfileItem): String {
-        val vmessQRCode = VmessQRCode()
-
-        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)
-    }
-
-    /**
-     * Parses a standard Vmess URI string into a ProfileItem object.
-     *
-     * @param str the standard Vmess URI string to parse
-     * @return the parsed ProfileItem object, or null if parsing fails
-     */
-    fun parseVmessStd(str: String): ProfileItem? {
-        val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false)
-        val config = ProfileItem.create(EConfigType.VMESS)
-
-        val uri = URI(Utils.fixIllegalUrl(str))
-        if (uri.rawQuery.isNullOrEmpty()) return null
-        val queryParam = getQueryParam(uri)
-
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
-        config.server = uri.idnHost
-        config.serverPort = uri.port.toString()
-        config.password = uri.userInfo
-        config.method = AppConfig.DEFAULT_SECURITY
-
-        getItemFormQuery(config, queryParam, allowInsecure)
-
-        return config
-    }
-
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
-    fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VMESS)
-
-        outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = getServerAddress(profileItem)
-            vnext.port = profileItem.serverPort.orEmpty().toInt()
-            vnext.users[0].id = profileItem.password.orEmpty()
-            vnext.users[0].security = profileItem.method
-        }
-
-        val sni = outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
-        }
-
-        outboundBean?.streamSettings?.let {
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
-        }
-
-        return outboundBean
-    }
-
-}

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

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

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

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

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

@@ -1,588 +0,0 @@
-package com.v2ray.ang.handler
-
-import com.tencent.mmkv.MMKV
-import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
-import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
-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.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_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"
-    private const val ID_ASSET = "ASSET"
-    private const val ID_SETTING = "SETTING"
-    private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
-    private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
-    private const val KEY_SUB_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) }
-    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 settingsStorage by lazy { MMKV.mmkvWithID(ID_SETTING, MMKV.MULTI_PROCESS_MODE) }
-
-    //endregion
-
-    //region Server
-
-    /**
-     * Gets the selected server GUID.
-     *
-     * @return The selected server GUID.
-     */
-    fun getSelectServer(): String? {
-        return mainStorage.decodeString(KEY_SELECTED_SERVER)
-    }
-
-    /**
-     * Sets the selected server GUID.
-     *
-     * @param guid The server GUID.
-     */
-    fun setSelectServer(guid: String) {
-        mainStorage.encode(KEY_SELECTED_SERVER, guid)
-    }
-
-    /**
-     * Encodes the server list.
-     *
-     * @param serverList The list of server GUIDs.
-     */
-    fun encodeServerList(serverList: MutableList<String>) {
-        mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
-    }
-
-    /**
-     * Decodes the server list.
-     *
-     * @return The list of server GUIDs.
-     */
-    fun decodeServerList(): MutableList<String> {
-        val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
-        return if (json.isNullOrBlank()) {
-            mutableListOf()
-        } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
-        }
-    }
-
-    /**
-     * Decodes the server configuration.
-     *
-     * @param guid The server GUID.
-     * @return The server configuration.
-     */
-    fun decodeServerConfig(guid: String): ProfileItem? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = profileFullStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ProfileItem::class.java)
-    }
-
-//    fun decodeProfileConfig(guid: String): ProfileLiteItem? {
-//        if (guid.isBlank()) {
-//            return null
-//        }
-//        val json = profileStorage.decodeString(guid)
-//        if (json.isNullOrBlank()) {
-//            return null
-//        }
-//        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
-//    }
-
-    /**
-     * Encodes the server configuration.
-     *
-     * @param guid The server GUID.
-     * @param config The server configuration.
-     * @return The server GUID.
-     */
-    fun encodeServerConfig(guid: String, config: ProfileItem): String {
-        val key = guid.ifBlank { Utils.getUuid() }
-        profileFullStorage.encode(key, JsonUtil.toJson(config))
-        val serverList = decodeServerList()
-        if (!serverList.contains(key)) {
-            serverList.add(0, key)
-            encodeServerList(serverList)
-            if (getSelectServer().isNullOrBlank()) {
-                mainStorage.encode(KEY_SELECTED_SERVER, key)
-            }
-        }
-//        val profile = ProfileLiteItem(
-//            configType = config.configType,
-//            subscriptionId = config.subscriptionId,
-//            remarks = config.remarks,
-//            server = config.getProxyOutbound()?.getServerAddress(),
-//            serverPort = config.getProxyOutbound()?.getServerPort(),
-//        )
-//        profileStorage.encode(key, JsonUtil.toJson(profile))
-        return key
-    }
-
-    /**
-     * Removes the server configuration.
-     *
-     * @param guid The server GUID.
-     */
-    fun removeServer(guid: String) {
-        if (guid.isBlank()) {
-            return
-        }
-        if (getSelectServer() == guid) {
-            mainStorage.remove(KEY_SELECTED_SERVER)
-        }
-        val serverList = decodeServerList()
-        serverList.remove(guid)
-        encodeServerList(serverList)
-        profileFullStorage.remove(guid)
-        //profileStorage.remove(guid)
-        serverAffStorage.remove(guid)
-    }
-
-    /**
-     * Removes the server configurations via subscription ID.
-     *
-     * @param subid The subscription ID.
-     */
-    fun removeServerViaSubid(subid: String) {
-        if (subid.isBlank()) {
-            return
-        }
-        profileFullStorage.allKeys()?.forEach { key ->
-            decodeServerConfig(key)?.let { config ->
-                if (config.subscriptionId == subid) {
-                    removeServer(key)
-                }
-            }
-        }
-    }
-
-    /**
-     * Decodes the server affiliation information.
-     *
-     * @param guid The server GUID.
-     * @return The server affiliation information.
-     */
-    fun decodeServerAffiliationInfo(guid: String): ServerAffiliationInfo? {
-        if (guid.isBlank()) {
-            return null
-        }
-        val json = serverAffStorage.decodeString(guid)
-        if (json.isNullOrBlank()) {
-            return null
-        }
-        return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
-    }
-
-    /**
-     * Encodes the server test delay in milliseconds.
-     *
-     * @param guid The server GUID.
-     * @param testResult The test delay in milliseconds.
-     */
-    fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
-        if (guid.isBlank()) {
-            return
-        }
-        val aff = decodeServerAffiliationInfo(guid) ?: ServerAffiliationInfo()
-        aff.testDelayMillis = testResult
-        serverAffStorage.encode(guid, JsonUtil.toJson(aff))
-    }
-
-    /**
-     * Clears all test delay results.
-     *
-     * @param keys The list of server GUIDs.
-     */
-    fun clearAllTestDelayResults(keys: List<String>?) {
-        keys?.forEach { key ->
-            decodeServerAffiliationInfo(key)?.let { aff ->
-                aff.testDelayMillis = 0
-                serverAffStorage.encode(key, JsonUtil.toJson(aff))
-            }
-        }
-    }
-
-    /**
-     * Removes all server configurations.
-     *
-     * @return The number of server configurations removed.
-     */
-    fun removeAllServer(): Int {
-        val count = profileFullStorage.allKeys()?.count() ?: 0
-        mainStorage.clearAll()
-        profileFullStorage.clearAll()
-        //profileStorage.clearAll()
-        serverAffStorage.clearAll()
-        return count
-    }
-
-    /**
-     * Removes invalid server configurations.
-     *
-     * @param guid The server GUID.
-     * @return The number of server configurations removed.
-     */
-    fun removeInvalidServer(guid: String): Int {
-        var count = 0
-        if (guid.isNotEmpty()) {
-            decodeServerAffiliationInfo(guid)?.let { aff ->
-                if (aff.testDelayMillis < 0L) {
-                    removeServer(guid)
-                    count++
-                }
-            }
-        } else {
-            serverAffStorage.allKeys()?.forEach { key ->
-                decodeServerAffiliationInfo(key)?.let { aff ->
-                    if (aff.testDelayMillis < 0L) {
-                        removeServer(key)
-                        count++
-                    }
-                }
-            }
-        }
-        return count
-    }
-
-    /**
-     * Encodes the raw server configuration.
-     *
-     * @param guid The server GUID.
-     * @param config The raw server configuration.
-     */
-    fun encodeServerRaw(guid: String, config: String) {
-        serverRawStorage.encode(guid, config)
-    }
-
-    /**
-     * Decodes the raw server configuration.
-     *
-     * @param guid The server GUID.
-     * @return The raw server configuration.
-     */
-    fun decodeServerRaw(guid: String): String? {
-        return serverRawStorage.decodeString(guid)
-    }
-
-    //endregion
-
-    //region Subscriptions
-
-    /**
-     * Initializes the subscription list.
-     */
-    private fun initSubsList() {
-        val subsList = decodeSubsList()
-        if (subsList.isNotEmpty()) {
-            return
-        }
-        subStorage.allKeys()?.forEach { key ->
-            subsList.add(key)
-        }
-        encodeSubsList(subsList)
-    }
-
-    /**
-     * Decodes the subscriptions.
-     *
-     * @return The list of subscriptions.
-     */
-    fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
-        initSubsList()
-
-        val subscriptions = mutableListOf<Pair<String, SubscriptionItem>>()
-        decodeSubsList().forEach { key ->
-            val json = subStorage.decodeString(key)
-            if (!json.isNullOrBlank()) {
-                subscriptions.add(Pair(key, JsonUtil.fromJson(json, SubscriptionItem::class.java)))
-            }
-        }
-        return subscriptions
-    }
-
-    /**
-     * Removes the subscription.
-     *
-     * @param subid The subscription ID.
-     */
-    fun removeSubscription(subid: String) {
-        subStorage.remove(subid)
-        val subsList = decodeSubsList()
-        subsList.remove(subid)
-        encodeSubsList(subsList)
-
-        removeServerViaSubid(subid)
-    }
-
-    /**
-     * Encodes the subscription.
-     *
-     * @param guid The subscription GUID.
-     * @param subItem The subscription item.
-     */
-    fun encodeSubscription(guid: String, subItem: SubscriptionItem) {
-        val key = guid.ifBlank { Utils.getUuid() }
-        subStorage.encode(key, JsonUtil.toJson(subItem))
-
-        val subsList = decodeSubsList()
-        if (!subsList.contains(key)) {
-            subsList.add(key)
-            encodeSubsList(subsList)
-        }
-    }
-
-    /**
-     * Decodes the subscription.
-     *
-     * @param subscriptionId The subscription ID.
-     * @return The subscription item.
-     */
-    fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
-        val json = subStorage.decodeString(subscriptionId) ?: return null
-        return JsonUtil.fromJson(json, SubscriptionItem::class.java)
-    }
-
-    /**
-     * Encodes the subscription list.
-     *
-     * @param subsList The list of subscription IDs.
-     */
-    fun encodeSubsList(subsList: MutableList<String>) {
-        mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList))
-    }
-
-    /**
-     * Decodes the subscription list.
-     *
-     * @return The list of subscription IDs.
-     */
-    fun decodeSubsList(): MutableList<String> {
-        val json = mainStorage.decodeString(KEY_SUB_IDS)
-        return if (json.isNullOrBlank()) {
-            mutableListOf()
-        } else {
-            JsonUtil.fromJson(json, Array<String>::class.java).toMutableList()
-        }
-    }
-
-    //endregion
-
-    //region Asset
-
-    /**
-     * Decodes the asset URLs.
-     *
-     * @return The list of asset URLs.
-     */
-    fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
-        val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
-        assetStorage.allKeys()?.forEach { key ->
-            val json = assetStorage.decodeString(key)
-            if (!json.isNullOrBlank()) {
-                assetUrlItems.add(Pair(key, JsonUtil.fromJson(json, AssetUrlItem::class.java)))
-            }
-        }
-        return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
-    }
-
-    /**
-     * Removes the asset URL.
-     *
-     * @param assetid The asset ID.
-     */
-    fun removeAssetUrl(assetid: String) {
-        assetStorage.remove(assetid)
-    }
-
-    /**
-     * Encodes the asset.
-     *
-     * @param assetid The asset ID.
-     * @param assetItem The asset item.
-     */
-    fun encodeAsset(assetid: String, assetItem: AssetUrlItem) {
-        val key = assetid.ifBlank { Utils.getUuid() }
-        assetStorage.encode(key, JsonUtil.toJson(assetItem))
-    }
-
-    /**
-     * Decodes the asset.
-     *
-     * @param assetid The asset ID.
-     * @return The asset item.
-     */
-    fun decodeAsset(assetid: String): AssetUrlItem? {
-        val json = assetStorage.decodeString(assetid) ?: return null
-        return JsonUtil.fromJson(json, AssetUrlItem::class.java)
-    }
-
-    //endregion
-
-    //region Routing
-
-    /**
-     * Decodes the routing rulesets.
-     *
-     * @return The list of routing rulesets.
-     */
-    fun decodeRoutingRulesets(): MutableList<RulesetItem>? {
-        val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET)
-        if (ruleset.isNullOrEmpty()) return null
-        return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
-    }
-
-    /**
-     * Encodes the routing rulesets.
-     *
-     * @param rulesetList The list of routing rulesets.
-     */
-    fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
-        if (rulesetList.isNullOrEmpty())
-            encodeSettings(PREF_ROUTING_RULESET, "")
-        else
-            encodeSettings(PREF_ROUTING_RULESET, JsonUtil.toJson(rulesetList))
-    }
-
-    //endregion
-
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
-    fun encodeSettings(key: String, value: String?): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
-    fun encodeSettings(key: String, value: Int): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
-    fun encodeSettings(key: String, value: Boolean): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
-    fun encodeSettings(key: String, value: MutableSet<String>): Boolean {
-        return settingsStorage.encode(key, value)
-    }
-
-    /**
-     * Decodes the settings string.
-     *
-     * @param key The settings key.
-     * @return The settings value.
-     */
-    fun decodeSettingsString(key: String): String? {
-        return settingsStorage.decodeString(key)
-    }
-
-    /**
-     * Decodes the settings string.
-     *
-     * @param key The settings key.
-     * @param defaultValue The default value.
-     * @return The settings value.
-     */
-    fun decodeSettingsString(key: String, defaultValue: String?): String? {
-        return settingsStorage.decodeString(key, defaultValue)
-    }
-
-    /**
-     * Decodes the settings boolean.
-     *
-     * @param key The settings key.
-     * @return The settings value.
-     */
-    fun decodeSettingsBool(key: String): Boolean {
-        return settingsStorage.decodeBool(key, false)
-    }
-
-    /**
-     * Decodes the settings boolean.
-     *
-     * @param key The settings key.
-     * @param defaultValue The default value.
-     * @return The settings value.
-     */
-    fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
-        return settingsStorage.decodeBool(key, defaultValue)
-    }
-
-    /**
-     * Decodes the settings string set.
-     *
-     * @param key The settings key.
-     * @return The settings value.
-     */
-    fun decodeSettingsStringSet(key: String): MutableSet<String>? {
-        return settingsStorage.decodeStringSet(key)
-    }
-
-    //endregion
-
-    //region Others
-
-    /**
-     * Encodes the start on boot setting.
-     *
-     * @param startOnBoot Whether to start on boot.
-     */
-    fun encodeStartOnBoot(startOnBoot: Boolean) {
-        encodeSettings(PREF_IS_BOOTED, startOnBoot)
-    }
-
-    /**
-     * Decodes the start on boot setting.
-     *
-     * @return Whether to start on boot.
-     */
-    fun decodeStartOnBoot(): Boolean {
-        return decodeSettingsBool(PREF_IS_BOOTED, false)
-    }
-
-    //endregion
-
-}

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

@@ -1,373 +0,0 @@
-package com.v2ray.ang.handler
-
-import android.content.Context
-import android.content.res.AssetManager
-import android.text.TextUtils
-import android.util.Log
-import androidx.appcompat.app.AppCompatDelegate
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
-import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
-import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.Language
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.dto.RoutingType
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.VpnInterfaceAddressConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerList
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import java.io.File
-import java.io.FileOutputStream
-import java.util.Collections
-import java.util.Locale
-
-object SettingsManager {
-
-    /**
-     * Initialize routing rulesets.
-     * @param context The application context.
-     */
-    fun initRoutingRulesets(context: Context) {
-        val exist = MmkvManager.decodeRoutingRulesets()
-        if (exist.isNullOrEmpty()) {
-            val rulesetList = getPresetRoutingRulesets(context)
-            MmkvManager.encodeRoutingRulesets(rulesetList)
-        }
-    }
-
-    /**
-     * Get preset routing rulesets.
-     * @param context The application context.
-     * @param index The index of the routing type.
-     * @return A mutable list of RulesetItem.
-     */
-    private fun getPresetRoutingRulesets(context: Context, index: Int = 0): MutableList<RulesetItem>? {
-        val fileName = RoutingType.fromIndex(index).fileName
-        val assets = Utils.readTextFromAssets(context, fileName)
-        if (TextUtils.isEmpty(assets)) {
-            return null
-        }
-
-        return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
-    }
-
-    /**
-     * Reset routing rulesets from presets.
-     * @param context The application context.
-     * @param index The index of the routing type.
-     */
-    fun resetRoutingRulesetsFromPresets(context: Context, index: Int) {
-        val rulesetList = getPresetRoutingRulesets(context, index) ?: return
-        resetRoutingRulesetsCommon(rulesetList)
-    }
-
-    /**
-     * Reset routing rulesets.
-     * @param content The content of the rulesets.
-     * @return True if successful, false otherwise.
-     */
-    fun resetRoutingRulesets(content: String?): Boolean {
-        if (content.isNullOrEmpty()) {
-            return false
-        }
-
-        try {
-            val rulesetList = JsonUtil.fromJson(content, Array<RulesetItem>::class.java).toMutableList()
-            if (rulesetList.isNullOrEmpty()) {
-                return false
-            }
-
-            resetRoutingRulesetsCommon(rulesetList)
-            return true
-        } catch (e: Exception) {
-            Log.e(ANG_PACKAGE, "Failed to reset routing rulesets", e)
-            return false
-        }
-    }
-
-    /**
-     * Common method to reset routing rulesets.
-     * @param rulesetList The list of rulesets.
-     */
-    private fun resetRoutingRulesetsCommon(rulesetList: MutableList<RulesetItem>) {
-        val rulesetNew: MutableList<RulesetItem> = mutableListOf()
-        MmkvManager.decodeRoutingRulesets()?.forEach { key ->
-            if (key.locked == true) {
-                rulesetNew.add(key)
-            }
-        }
-
-        rulesetNew.addAll(rulesetList)
-        MmkvManager.encodeRoutingRulesets(rulesetNew)
-    }
-
-    /**
-     * Get a routing ruleset by index.
-     * @param index The index of the ruleset.
-     * @return The RulesetItem.
-     */
-    fun getRoutingRuleset(index: Int): RulesetItem? {
-        if (index < 0) return null
-
-        val rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) return null
-
-        return rulesetList[index]
-    }
-
-    /**
-     * Save a routing ruleset.
-     * @param index The index of the ruleset.
-     * @param ruleset The RulesetItem to save.
-     */
-    fun saveRoutingRuleset(index: Int, ruleset: RulesetItem?) {
-        if (ruleset == null) return
-
-        var rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) {
-            rulesetList = mutableListOf()
-        }
-
-        if (index < 0 || index >= rulesetList.count()) {
-            rulesetList.add(0, ruleset)
-        } else {
-            rulesetList[index] = ruleset
-        }
-        MmkvManager.encodeRoutingRulesets(rulesetList)
-    }
-
-    /**
-     * Remove a routing ruleset by index.
-     * @param index The index of the ruleset.
-     */
-    fun removeRoutingRuleset(index: Int) {
-        if (index < 0) return
-
-        val rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) return
-
-        rulesetList.removeAt(index)
-        MmkvManager.encodeRoutingRulesets(rulesetList)
-    }
-
-    /**
-     * Check if routing rulesets bypass LAN.
-     * @return True if bypassing LAN, false otherwise.
-     */
-    fun routingRulesetsBypassLan(): Boolean {
-        val vpnBypassLan = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_BYPASS_LAN) ?: "1"
-        if (vpnBypassLan == "1") {
-            return true
-        } else if (vpnBypassLan == "2") {
-            return false
-        }
-
-        val guid = MmkvManager.getSelectServer() ?: return false
-        val config = decodeServerConfig(guid) ?: return false
-        if (config.configType == EConfigType.CUSTOM) {
-            val raw = MmkvManager.decodeServerRaw(guid) ?: return false
-            val v2rayConfig = JsonUtil.fromJson(raw, V2rayConfig::class.java)
-            val exist = v2rayConfig.routing.rules.filter { it.outboundTag == TAG_DIRECT }.any {
-                it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
-            }
-            return exist == true
-        }
-
-        val rulesetItems = MmkvManager.decodeRoutingRulesets()
-        val exist = rulesetItems?.filter { it.enabled && it.outboundTag == TAG_DIRECT }?.any {
-            it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
-        }
-        return exist == true
-    }
-
-    /**
-     * Swap routing rulesets.
-     * @param fromPosition The position to swap from.
-     * @param toPosition The position to swap to.
-     */
-    fun swapRoutingRuleset(fromPosition: Int, toPosition: Int) {
-        val rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) return
-
-        Collections.swap(rulesetList, fromPosition, toPosition)
-        MmkvManager.encodeRoutingRulesets(rulesetList)
-    }
-
-    /**
-     * Swap subscriptions.
-     * @param fromPosition The position to swap from.
-     * @param toPosition The position to swap to.
-     */
-    fun swapSubscriptions(fromPosition: Int, toPosition: Int) {
-        val subsList = MmkvManager.decodeSubsList()
-        if (subsList.isNullOrEmpty()) return
-
-        Collections.swap(subsList, fromPosition, toPosition)
-        MmkvManager.encodeSubsList(subsList)
-    }
-
-    /**
-     * Get server via remarks.
-     * @param remarks The remarks of the server.
-     * @return The ProfileItem.
-     */
-    fun getServerViaRemarks(remarks: String?): ProfileItem? {
-        if (remarks.isNullOrEmpty()) {
-            return null
-        }
-        val serverList = decodeServerList()
-        for (guid in serverList) {
-            val profile = decodeServerConfig(guid)
-            if (profile != null && profile.remarks == remarks) {
-                return profile
-            }
-        }
-        return null
-    }
-
-    /**
-     * Get the SOCKS port.
-     * @return The SOCKS port.
-     */
-    fun getSocksPort(): Int {
-        return Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_SOCKS_PORT), AppConfig.PORT_SOCKS.toInt())
-    }
-
-    /**
-     * Get the HTTP port.
-     * @return The HTTP port.
-     */
-    fun getHttpPort(): Int {
-        return getSocksPort() + if (Utils.isXray()) 0 else 1
-    }
-
-    /**
-     * Initialize assets.
-     * @param context The application context.
-     * @param assets The AssetManager.
-     */
-    fun initAssets(context: Context, assets: AssetManager) {
-        val extFolder = Utils.userAssetPath(context)
-
-        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(AppConfig.TAG, "Copied from apk assets folder to ${target.absolutePath}")
-                }
-        } catch (e: Exception) {
-            Log.e(ANG_PACKAGE, "asset copy failed", e)
-        }
-    }
-
-    /**
-     * Get domestic DNS servers from preference.
-     * @return A list of domestic DNS servers.
-     */
-    fun getDomesticDnsServers(): List<String> {
-        val domesticDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS) ?: AppConfig.DNS_DIRECT
-        val ret = domesticDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_DIRECT)
-        }
-        return ret
-    }
-
-    /**
-     * Get remote DNS servers from preference.
-     * @return A list of remote DNS servers.
-     */
-    fun getRemoteDnsServers(): List<String> {
-        val remoteDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS) ?: AppConfig.DNS_PROXY
-        val ret = remoteDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_PROXY)
-        }
-        return ret
-    }
-
-    /**
-     * Get VPN DNS servers from preference.
-     * @return A list of VPN DNS servers.
-     */
-    fun getVpnDnsServers(): List<String> {
-        val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
-        return vpnDns.split(",").filter { Utils.isPureIpAddress(it) }
-    }
-
-    /**
-     * Get delay test URL.
-     * @param second Whether to use the second URL.
-     * @return The delay test URL.
-     */
-    fun getDelayTestUrl(second: Boolean = false): String {
-        return if (second) {
-            AppConfig.DELAY_TEST_URL2
-        } else {
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
-                ?: AppConfig.DELAY_TEST_URL
-        }
-    }
-
-    /**
-     * Get the locale.
-     * @return The locale.
-     */
-    fun getLocale(): Locale {
-        val langCode =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_LANGUAGE) ?: Language.AUTO.code
-        val language = Language.fromCode(langCode)
-
-        return when (language) {
-            Language.AUTO -> Utils.getSysLocale()
-            Language.ENGLISH -> Locale.ENGLISH
-            Language.CHINA -> Locale.CHINA
-            Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
-            Language.VIETNAMESE -> Locale("vi")
-            Language.RUSSIAN -> Locale("ru")
-            Language.PERSIAN -> Locale("fa")
-            Language.ARABIC -> Locale("ar")
-            Language.BANGLA -> Locale("bn")
-            Language.BAKHTIARI -> Locale("bqi", "IR")
-        }
-    }
-
-    /**
-     * Set night mode.
-     */
-    fun setNightMode() {
-        when (MmkvManager.decodeSettingsString(AppConfig.PREF_UI_MODE_NIGHT, "0")) {
-            "0" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-            "1" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-            "2" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-        }
-    }
-
-    /**
-     * Retrieves the currently selected VPN interface address configuration.
-     * This method reads the user's preference for VPN interface addressing and returns
-     * the corresponding configuration containing IPv4 and IPv6 addresses.
-     *
-     * @return The selected VpnInterfaceAddressConfig instance, or the default configuration
-     *         if no valid selection is found or if the stored index is invalid.
-     */
-    fun getCurrentVpnInterfaceAddressConfig(): VpnInterfaceAddressConfig {
-        val selectedIndex = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX, "0")?.toInt()
-        return VpnInterfaceAddressConfig.getConfigByIndex(selectedIndex ?: 0)
-    }
-}

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

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

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

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

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

@@ -13,41 +13,46 @@
  * 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.RecyclerView;
 
 /**
- * Interface to listen for a move or dismissal event from a [ItemTouchHelper.Callback].
+ * Interface to listen for a move or dismissal event from a {@link ItemTouchHelper.Callback}.
  *
  * @author Paul Burke (ipaulpro)
  */
-interface ItemTouchHelperAdapter {
+public 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 **not** at the end of a "drop" event.<br></br>
+     * an item is shifted, and <strong>not</strong> at the end of a "drop" event.<br/>
-     * <br></br>
+     * <br/>
-     * Implementations should call [RecyclerView.Adapter.notifyItemMoved] after
+     * Implementations should call {@link RecyclerView.Adapter#notifyItemMoved(int, int)} 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
+     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder.getAdapterPosition
+     * @see RecyclerView.ViewHolder#getAdapterPosition()
      */
-    fun onItemMove(fromPosition: Int, toPosition: Int): Boolean
+    boolean onItemMove(int fromPosition, int toPosition);
 
 
-    fun onItemMoveCompleted()
+    void onItemMoveCompleted();
 
     /**
-     * Called when an item has been dismissed by a swipe.<br></br>
+     * Called when an item has been dismissed by a swipe.<br/>
-     * <br></br>
+     * <br/>
-     * Implementations should call [RecyclerView.Adapter.notifyItemRemoved] after
+     * Implementations should call {@link RecyclerView.Adapter#notifyItemRemoved(int)} after
      * adjusting the underlying data to reflect this removal.
      *
      * @param position The position of the item dismissed.
-     * @see RecyclerView.getAdapterPositionFor
+     * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
-     * @see RecyclerView.ViewHolder.getAdapterPosition
+     * @see RecyclerView.ViewHolder#getAdapterPosition()
      */
-    fun onItemDismiss(position: Int)
+    void onItemDismiss(int position);
 }

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

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

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

@@ -0,0 +1,129 @@
+/*
+ * 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

@@ -1,147 +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.animation.ValueAnimator
-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/receiver/BootReceiver.kt

@@ -1,23 +0,0 @@
-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() {
-    /**
-     * This method is called when the BroadcastReceiver is receiving an Intent broadcast.
-     * It checks if the context is not null and the action is ACTION_BOOT_COMPLETED.
-     * If the conditions are met, it starts the V2Ray service.
-     *
-     * @param context The Context in which the receiver is running.
-     * @param intent The Intent being received.
-     */
-    override fun onReceive(context: Context?, intent: Intent?) {
-        if (context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) return
-        if (!MmkvManager.decodeStartOnBoot() || MmkvManager.getSelectServer().isNullOrEmpty()) return
-        V2RayServiceManager.startVService(context)
-    }
-}

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

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

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

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

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

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

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

@@ -1,65 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.content.Context
-import android.os.Build
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import androidx.core.view.WindowCompat
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.helper.CustomDividerItemDecoration
-import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.util.Utils
-
-
-abstract class BaseActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        if (!Utils.getDarkModeStatus(this)) {
-            WindowCompat.getInsetsController(window, window.decorView).apply {
-                isAppearanceLightStatusBars = true
-            }
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        android.R.id.home -> {
-            // Handles the home button press by delegating to the onBackPressedDispatcher.
-            // This ensures consistent back navigation behavior.
-            onBackPressedDispatcher.onBackPressed()
-            true
-        }
-
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    @RequiresApi(Build.VERSION_CODES.N)
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, SettingsManager.getLocale()))
-    }
-
-    /**
-     * Adds a custom divider to a RecyclerView.
-     *
-     * @param recyclerView  The target RecyclerView to which the divider will be added.
-     * @param context       The context used to access resources.
-     * @param drawableResId The resource ID of the drawable to be used as the divider.
-     * @param orientation   The orientation of the divider (DividerItemDecoration.VERTICAL or DividerItemDecoration.HORIZONTAL).
-     */
-    fun addCustomDividerToRecyclerView(recyclerView: RecyclerView, context: Context?, drawableResId: Int, orientation: Int = DividerItemDecoration.VERTICAL) {
-        // Get the drawable from resources
-        val drawable = ContextCompat.getDrawable(context!!, drawableResId)
-        requireNotNull(drawable) { "Drawable resource not found" }
-
-        // Create a DividerItemDecoration with the specified orientation
-        val dividerItemDecoration = CustomDividerItemDecoration(drawable, orientation)
-
-        // Add the divider to the RecyclerView
-        recyclerView.addItemDecoration(dividerItemDecoration)
-    }
-}

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

@@ -1,77 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityCheckUpdateBinding
-import com.v2ray.ang.dto.CheckUpdateResult
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
-import com.v2ray.ang.handler.UpdateCheckerManager
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.launch
-
-class CheckUpdateActivity : BaseActivity() {
-
-    private val binding by lazy { ActivityCheckUpdateBinding.inflate(layoutInflater) }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.update_check_for_update)
-
-        binding.layoutCheckUpdate.setOnClickListener {
-            checkForUpdates(binding.checkPreRelease.isChecked)
-        }
-
-        binding.checkPreRelease.setOnCheckedChangeListener { _, isChecked ->
-            MmkvManager.encodeSettings(AppConfig.PREF_CHECK_UPDATE_PRE_RELEASE, isChecked)
-        }
-        binding.checkPreRelease.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_CHECK_UPDATE_PRE_RELEASE, false)
-
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
-            binding.tvVersion.text = it
-        }
-
-        checkForUpdates(binding.checkPreRelease.isChecked)
-    }
-
-    private fun checkForUpdates(includePreRelease: Boolean) {
-        toast(R.string.update_checking_for_update)
-
-        lifecycleScope.launch {
-            try {
-                val result = UpdateCheckerManager.checkForUpdate(includePreRelease)
-                if (result.hasUpdate) {
-                    showUpdateDialog(result)
-                } else {
-                    toastSuccess(R.string.update_already_latest_version)
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to check for updates: ${e.message}")
-                toastError(e.message ?: getString(R.string.toast_failure))
-            }
-        }
-    }
-
-    private fun showUpdateDialog(result: CheckUpdateResult) {
-        AlertDialog.Builder(this)
-            .setTitle(getString(R.string.update_new_version_found, result.latestVersion))
-            .setMessage(result.releaseNotes)
-            .setPositiveButton(R.string.update_now) { _, _ ->
-                result.downloadUrl?.let {
-                    Utils.openUri(this, it)
-                }
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .show()
-    }
-}

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

@@ -1,156 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.widget.SearchView
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.ANG_PACKAGE
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityLogcatBinding
-import com.v2ray.ang.extension.toastSuccess
-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(), SwipeRefreshLayout.OnRefreshListener {
-    private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
-
-    private var logsetsAll: MutableList<String> = mutableListOf()
-    var logsets: MutableList<String> = mutableListOf()
-    private val adapter by lazy { LogcatRecyclerAdapter(this) }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.title_logcat)
-
-        binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
-        binding.recyclerView.adapter = adapter
-
-        binding.refreshLayout.setOnRefreshListener(this)
-
-        logsets.add(getString(R.string.pull_down_to_refresh))
-    }
-
-    private fun getLogcat() {
-
-        try {
-            binding.refreshLayout.isRefreshing = true
-
-            lifecycleScope.launch(Dispatchers.Default) {
-                val lst = LinkedHashSet<String>()
-                lst.add("logcat")
-                lst.add("-d")
-                lst.add("-v")
-                lst.add("time")
-                lst.add("-s")
-                lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err")
-                val process = withContext(Dispatchers.IO) {
-                    Runtime.getRuntime().exec(lst.toTypedArray())
-                }
-
-                val allText = process.inputStream.bufferedReader().use { it.readLines() }.reversed()
-                launch(Dispatchers.Main) {
-                    logsetsAll = allText.toMutableList()
-                    logsets = allText.toMutableList()
-                    refreshData()
-                    binding.refreshLayout.isRefreshing = false
-                }
-            }
-        } catch (e: IOException) {
-            Log.e(AppConfig.TAG, "Failed to get logcat", e)
-        }
-    }
-
-    private fun clearLogcat() {
-        try {
-            lifecycleScope.launch(Dispatchers.Default) {
-                val lst = LinkedHashSet<String>()
-                lst.add("logcat")
-                lst.add("-c")
-                withContext(Dispatchers.IO) {
-                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
-                    process.waitFor()
-                }
-                launch(Dispatchers.Main) {
-                    logsetsAll.clear()
-                    logsets.clear()
-                    refreshData()
-                }
-            }
-        } catch (e: IOException) {
-            Log.e(AppConfig.TAG, "Failed to clear logcat", e)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_logcat, menu)
-
-        val searchItem = menu.findItem(R.id.search_view)
-        if (searchItem != null) {
-            val searchView = searchItem.actionView as SearchView
-            searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String?): Boolean = false
-
-                override fun onQueryTextChange(newText: String?): Boolean {
-                    filterLogs(newText)
-                    return false
-                }
-            })
-            searchView.setOnCloseListener {
-                filterLogs("")
-                false
-            }
-        }
-
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.copy_all -> {
-            Utils.setClipboard(this, logsets.joinToString("\n"))
-            toastSuccess(R.string.toast_success)
-            true
-        }
-
-        R.id.clear_all -> {
-            clearLogcat()
-            true
-        }
-
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    private fun filterLogs(content: String?): Boolean {
-        val key = content?.trim()
-        logsets = if (key.isNullOrEmpty()) {
-            logsetsAll.toMutableList()
-        } else {
-            logsetsAll.filter { it.contains(key) }.toMutableList()
-        }
-
-        refreshData()
-        return true
-    }
-
-    override fun onRefresh() {
-        getLogcat()
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun refreshData() {
-        adapter.notifyDataSetChanged()
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.databinding.ItemRecyclerLogcatBinding
-
-class LogcatRecyclerAdapter(val activity: LogcatActivity) : RecyclerView.Adapter<LogcatRecyclerAdapter.MainViewHolder>() {
-    private var mActivity: LogcatActivity = activity
-
-
-    override fun getItemCount() = mActivity.logsets.size
-
-    override fun onBindViewHolder(holder: MainViewHolder, position: Int) {
-        try {
-            val log = mActivity.logsets[position]
-            if (log.isEmpty()) {
-                holder.itemSubSettingBinding.logTag.text = ""
-                holder.itemSubSettingBinding.logContent.text = ""
-            } else {
-                val content = log.split("):", limit = 2)
-                holder.itemSubSettingBinding.logTag.text = content.first().split("(", limit = 2).first().trim()
-                holder.itemSubSettingBinding.logContent.text = if (content.count() > 1) content.last().trim() else ""
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Error binding log view data", e)
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
-        return MainViewHolder(
-            ItemRecyclerLogcatBinding.inflate(
-                LayoutInflater.from(parent.context),
-                parent,
-                false
-            )
-        )
-    }
-
-    class MainViewHolder(val itemSubSettingBinding: ItemRecyclerLogcatBinding) : RecyclerView.ViewHolder(itemSubSettingBinding.root)
-
-}

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

@@ -1,362 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.content.Intent
-import android.graphics.Color
-import android.text.TextUtils
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.AngApplication.Companion.application
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ItemQrcodeBinding
-import com.v2ray.ang.databinding.ItemRecyclerFooterBinding
-import com.v2ray.ang.databinding.ItemRecyclerMainBinding
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.AngConfigManager
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.helper.ItemTouchHelperAdapter
-import com.v2ray.ang.helper.ItemTouchHelperViewHolder
-import com.v2ray.ang.service.V2RayServiceManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
-    companion object {
-        private const val VIEW_TYPE_ITEM = 1
-        private const val VIEW_TYPE_FOOTER = 2
-    }
-
-    private var mActivity: MainActivity = activity
-    private val share_method: Array<out String> by lazy {
-        mActivity.resources.getStringArray(R.array.share_method)
-    }
-    private val share_method_more: Array<out String> by lazy {
-        mActivity.resources.getStringArray(R.array.share_method_more)
-    }
-    var isRunning = false
-    private val doubleColumnDisplay = MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)
-
-    /**
-     * Gets the total number of items in the adapter (servers count + footer view)
-     * @return The total item count
-     */
-    override fun getItemCount() = mActivity.mainViewModel.serversCache.size + 1
-
-    override fun onBindViewHolder(holder: BaseViewHolder, position: Int) {
-        if (holder is MainViewHolder) {
-            val guid = mActivity.mainViewModel.serversCache[position].guid
-            val profile = mActivity.mainViewModel.serversCache[position].profile
-            val isCustom = profile.configType == EConfigType.CUSTOM
-
-            holder.itemView.setBackgroundColor(Color.TRANSPARENT)
-
-            //Name address
-            holder.itemMainBinding.tvName.text = profile.remarks
-            holder.itemMainBinding.tvStatistics.text = getAddress(profile)
-            holder.itemMainBinding.tvType.text = profile.configType.name
-
-            //TestResult
-            val aff = MmkvManager.decodeServerAffiliationInfo(guid)
-            holder.itemMainBinding.tvTestResult.text = aff?.getTestDelayString().orEmpty()
-            if ((aff?.testDelayMillis ?: 0L) < 0L) {
-                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPingRed))
-            } else {
-                holder.itemMainBinding.tvTestResult.setTextColor(ContextCompat.getColor(mActivity, R.color.colorPing))
-            }
-
-            //layoutIndicator
-            if (guid == MmkvManager.getSelectServer()) {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(R.color.colorAccent)
-            } else {
-                holder.itemMainBinding.layoutIndicator.setBackgroundResource(0)
-            }
-
-            //subscription remarks
-            val subRemarks = getSubscriptionRemarks(profile)
-            holder.itemMainBinding.tvSubscription.text = subRemarks
-            holder.itemMainBinding.layoutSubscription.visibility = if (subRemarks.isEmpty()) View.GONE else View.VISIBLE
-
-            //layout
-            if (doubleColumnDisplay) {
-                holder.itemMainBinding.layoutShare.visibility = View.GONE
-                holder.itemMainBinding.layoutEdit.visibility = View.GONE
-                holder.itemMainBinding.layoutRemove.visibility = View.GONE
-                holder.itemMainBinding.layoutMore.visibility = View.VISIBLE
-
-                //share method
-                val shareOptions = if (isCustom) share_method_more.asList().takeLast(3) else share_method_more.asList()
-
-                holder.itemMainBinding.layoutMore.setOnClickListener {
-                    shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0)
-                }
-            } else {
-                holder.itemMainBinding.layoutShare.visibility = View.VISIBLE
-                holder.itemMainBinding.layoutEdit.visibility = View.VISIBLE
-                holder.itemMainBinding.layoutRemove.visibility = View.VISIBLE
-                holder.itemMainBinding.layoutMore.visibility = View.GONE
-
-                //share method
-                val shareOptions = if (isCustom) share_method.asList().takeLast(1) else share_method.asList()
-
-                holder.itemMainBinding.layoutShare.setOnClickListener {
-                    shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0)
-                }
-
-                holder.itemMainBinding.layoutEdit.setOnClickListener {
-                    editServer(guid, profile)
-                }
-                holder.itemMainBinding.layoutRemove.setOnClickListener {
-                    removeServer(guid, position)
-                }
-            }
-
-            holder.itemMainBinding.infoContainer.setOnClickListener {
-                setSelectServer(guid)
-            }
-        }
-//        if (holder is FooterViewHolder) {
-//            if (true) {
-//                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
-//            } else {
-//                holder.itemFooterBinding.layoutEdit.setOnClickListener {
-//                    Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
-//                }
-//            }
-//        }
-    }
-
-    /**
-     * Gets the server address information
-     * Hides part of IP or domain information for privacy protection
-     * @param profile The server configuration
-     * @return Formatted address string
-     */
-    private fun getAddress(profile: ProfileItem): String {
-        // Hide xxx:xxx:***/xxx.xxx.xxx.***
-        return "${
-            profile.server?.let {
-                if (it.contains(":"))
-                    it.split(":").take(2).joinToString(":", postfix = ":***")
-                else
-                    it.split('.').dropLast(1).joinToString(".", postfix = ".***")
-            }
-        } : ${profile.serverPort}"
-    }
-
-    /**
-     * Gets the subscription remarks information
-     * @param profile The server configuration
-     * @return Subscription remarks string, or empty string if none
-     */
-    private fun getSubscriptionRemarks(profile: ProfileItem): String {
-        val subRemarks =
-            if (mActivity.mainViewModel.subscriptionId.isEmpty())
-                MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks?.firstOrNull()
-            else
-                null
-        return subRemarks?.toString() ?: ""
-    }
-
-    /**
-     * Shares server configuration
-     * Displays a dialog with sharing options and executes the selected action
-     * @param guid The server unique identifier
-     * @param profile The server configuration
-     * @param position The position in the list
-     * @param shareOptions The list of share options
-     * @param skip The number of options to skip
-     */
-    private fun shareServer(guid: String, profile: ProfileItem, position: Int, shareOptions: List<String>, skip: Int) {
-        AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i ->
-            try {
-                when (i + skip) {
-                    0 -> showQRCode(guid)
-                    1 -> share2Clipboard(guid)
-                    2 -> shareFullContent(guid)
-                    3 -> editServer(guid, profile)
-                    4 -> removeServer(guid, position)
-                    else -> mActivity.toast("else")
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Error when sharing server", e)
-            }
-        }.show()
-    }
-
-    /**
-     * Displays QR code for the server configuration
-     * @param guid The server unique identifier
-     */
-    private fun showQRCode(guid: String) {
-        val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(mActivity))
-        ivBinding.ivQcode.setImageBitmap(AngConfigManager.share2QRCode(guid))
-        AlertDialog.Builder(mActivity).setView(ivBinding.root).show()
-    }
-
-    /**
-     * Shares server configuration to clipboard
-     * @param guid The server unique identifier
-     */
-    private fun share2Clipboard(guid: String) {
-        if (AngConfigManager.share2Clipboard(mActivity, guid) == 0) {
-            mActivity.toastSuccess(R.string.toast_success)
-        } else {
-            mActivity.toastError(R.string.toast_failure)
-        }
-    }
-
-    /**
-     * Shares full server configuration content to clipboard
-     * @param guid The server unique identifier
-     */
-    private fun shareFullContent(guid: String) {
-        mActivity.lifecycleScope.launch(Dispatchers.IO) {
-            val result = AngConfigManager.shareFullContent2Clipboard(mActivity, guid)
-            launch(Dispatchers.Main) {
-                if (result == 0) {
-                    mActivity.toastSuccess(R.string.toast_success)
-                } else {
-                    mActivity.toastError(R.string.toast_failure)
-                }
-            }
-        }
-    }
-
-    /**
-     * Edits server configuration
-     * Opens appropriate editing interface based on configuration type
-     * @param guid The server unique identifier
-     * @param profile The server configuration
-     */
-    private fun editServer(guid: String, profile: ProfileItem) {
-        val intent = Intent().putExtra("guid", guid)
-            .putExtra("isRunning", isRunning)
-            .putExtra("createConfigType", profile.configType.value)
-        if (profile.configType == EConfigType.CUSTOM) {
-            mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
-        } else {
-            mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java))
-        }
-    }
-
-    /**
-     * Removes server configuration
-     * Handles confirmation dialog and related checks
-     * @param guid The server unique identifier
-     * @param position The position in the list
-     */
-    private fun removeServer(guid: String, position: Int) {
-        if (guid != MmkvManager.getSelectServer()) {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
-                AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
-                        removeServerSub(guid, position)
-                    }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        //do noting
-                    }
-                    .show()
-            } else {
-                removeServerSub(guid, position)
-            }
-        } else {
-            application.toast(R.string.toast_action_not_allowed)
-        }
-    }
-
-    /**
-     * Executes the actual server removal process
-     * @param guid The server unique identifier
-     * @param position The position in the list
-     */
-    private fun removeServerSub(guid: String, position: Int) {
-        mActivity.mainViewModel.removeServer(guid)
-        notifyItemRemoved(position)
-        notifyItemRangeChanged(position, mActivity.mainViewModel.serversCache.size)
-    }
-
-    /**
-     * Sets the selected server
-     * Updates UI and restarts service if needed
-     * @param guid The server unique identifier to select
-     */
-    private fun setSelectServer(guid: String) {
-        val selected = MmkvManager.getSelectServer()
-        if (guid != selected) {
-            MmkvManager.setSelectServer(guid)
-            if (!TextUtils.isEmpty(selected)) {
-                notifyItemChanged(mActivity.mainViewModel.getPosition(selected.orEmpty()))
-            }
-            notifyItemChanged(mActivity.mainViewModel.getPosition(guid))
-            if (isRunning) {
-                V2RayServiceManager.stopVService(mActivity)
-                mActivity.lifecycleScope.launch {
-                    try {
-                        delay(500)
-                        V2RayServiceManager.startVService(mActivity)
-                    } catch (e: Exception) {
-                        Log.e(AppConfig.TAG, "Failed to restart V2Ray service", e)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder {
-        return when (viewType) {
-            VIEW_TYPE_ITEM ->
-                MainViewHolder(ItemRecyclerMainBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-
-            else ->
-                FooterViewHolder(ItemRecyclerFooterBinding.inflate(LayoutInflater.from(parent.context), parent, false))
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position == mActivity.mainViewModel.serversCache.size) {
-            VIEW_TYPE_FOOTER
-        } else {
-            VIEW_TYPE_ITEM
-        }
-    }
-
-    open class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        fun onItemSelected() {
-            itemView.setBackgroundColor(Color.LTGRAY)
-        }
-
-        fun onItemClear() {
-            itemView.setBackgroundColor(0)
-        }
-    }
-
-    class MainViewHolder(val itemMainBinding: ItemRecyclerMainBinding) :
-        BaseViewHolder(itemMainBinding.root), ItemTouchHelperViewHolder
-
-    class FooterViewHolder(val itemFooterBinding: ItemRecyclerFooterBinding) :
-        BaseViewHolder(itemFooterBinding.root)
-
-    override fun onItemMove(fromPosition: Int, toPosition: Int): Boolean {
-        mActivity.mainViewModel.swapServer(fromPosition, toPosition)
-        notifyItemMoved(fromPosition, toPosition)
-        return true
-    }
-
-    override fun onItemMoveCompleted() {
-        // do nothing
-    }
-
-    override fun onItemDismiss(position: Int) {
-    }
-}

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

@@ -1,204 +0,0 @@
-package com.v2ray.ang.ui
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
-import com.v2ray.ang.util.JsonUtil
-import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class RoutingSettingActivity : BaseActivity() {
-    private val binding by lazy { ActivityRoutingSettingBinding.inflate(layoutInflater) }
-
-    var rulesets: MutableList<RulesetItem> = mutableListOf()
-    private val adapter by lazy { RoutingSettingRecyclerAdapter(this) }
-    private var mItemTouchHelper: ItemTouchHelper? = null
-    private val routing_domain_strategy: Array<out String> by lazy {
-        resources.getStringArray(R.array.routing_domain_strategy)
-    }
-    private val preset_rulesets: Array<out String> by lazy {
-        resources.getStringArray(R.array.preset_rulesets)
-    }
-
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(binding.root)
-
-        title = getString(R.string.routing_settings_title)
-
-        binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
-        binding.recyclerView.adapter = adapter
-
-        mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
-        mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
-
-        binding.tvDomainStrategySummary.text = getDomainStrategy()
-        binding.layoutDomainStrategy.setOnClickListener {
-            setDomainStrategy()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        refreshData()
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_routing_setting, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
-        R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
-        R.id.import_predefined_rulesets -> importPredefined().let { true }
-        R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
-        R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true }
-        R.id.export_rulesets_to_clipboard -> export2Clipboard().let { true }
-        else -> super.onOptionsItemSelected(item)
-    }
-
-    private fun getDomainStrategy(): String {
-        return MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: routing_domain_strategy.first()
-    }
-
-    private fun setDomainStrategy() {
-        android.app.AlertDialog.Builder(this).setItems(routing_domain_strategy.asList().toTypedArray()) { _, i ->
-            try {
-                val value = routing_domain_strategy[i]
-                MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, value)
-                binding.tvDomainStrategySummary.text = value
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to set domain strategy", e)
-            }
-        }.show()
-    }
-
-    private fun importPredefined() {
-        AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
-            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    try {
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
-                            launch(Dispatchers.Main) {
-                                refreshData()
-                                toastSuccess(R.string.toast_success)
-                            }
-                        }
-                    } catch (e: Exception) {
-                        Log.e(AppConfig.TAG, "Failed to import predefined ruleset", e)
-                    }
-                }
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    //do nothing
-                }
-                .show()
-        }.show()
-    }
-
-    private fun importFromClipboard() {
-        AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                val clipboard = try {
-                    Utils.getClipboard(this)
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to get clipboard content", e)
-                    toastError(R.string.toast_failure)
-                    return@setPositiveButton
-                }
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val result = SettingsManager.resetRoutingRulesets(clipboard)
-                    withContext(Dispatchers.Main) {
-                        if (result) {
-                            refreshData()
-                            toastSuccess(R.string.toast_success)
-                        } else {
-                            toastError(R.string.toast_failure)
-                        }
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                //do nothing
-            }
-            .show()
-    }
-
-    private fun export2Clipboard() {
-        val rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) {
-            toastError(R.string.toast_failure)
-        } else {
-            Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
-            toastSuccess(R.string.toast_success)
-        }
-    }
-
-    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()
-                            toastSuccess(R.string.toast_success)
-                        } else {
-                            toastError(R.string.toast_failure)
-                        }
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                //do nothing
-            }
-            .show()
-        return true
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun refreshData() {
-        rulesets.clear()
-        rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
-        adapter.notifyDataSetChanged()
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.v2ray.ang.util
-
-import android.content.Context
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import com.v2ray.ang.dto.AppInfo
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-object AppManagerUtil {
-    /**
-     * Load the list of network applications.
-     *
-     * @param context The context to use.
-     * @return A list of AppInfo objects representing the network applications.
-     */
-    suspend fun loadNetworkAppList(context: Context): ArrayList<AppInfo> =
-        withContext(Dispatchers.IO) {
-            val packageManager = context.packageManager
-            val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)
-            val apps = ArrayList<AppInfo>()
-
-            for (pkg in packages) {
-                val applicationInfo = pkg.applicationInfo ?: continue
-
-                val appName = applicationInfo.loadLabel(packageManager).toString()
-                val appIcon = applicationInfo.loadIcon(packageManager) ?: continue
-                val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0
-
-                val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
-                apps.add(appInfo)
-            }
-
-            return@withContext apps
-        }
-
-    fun getLastUpdateTime(context: Context): Long =
-        context.packageManager.getPackageInfo(context.packageName, 0).lastUpdateTime
-
-}

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

@@ -1,223 +0,0 @@
-package com.v2ray.ang.util
-
-import android.util.Log
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
-import com.v2ray.ang.BuildConfig
-import com.v2ray.ang.util.Utils.encode
-import com.v2ray.ang.util.Utils.urlDecode
-import java.io.IOException
-import java.net.HttpURLConnection
-import java.net.IDN
-import java.net.Inet6Address
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.Proxy
-import java.net.URL
-
-object HttpUtil {
-
-    /**
-     * Converts the domain part of a URL string to its IDN (Punycode, ASCII Compatible Encoding) format.
-     *
-     * For example, a URL like "https://例子.中国/path" will be converted to "https://xn--fsqu00a.xn--fiqs8s/path".
-     *
-     * @param str The URL string to convert (can contain non-ASCII characters in the domain).
-     * @return The URL string with the domain part converted to ASCII-compatible (Punycode) format.
-     */
-    fun toIdnUrl(str: String): String {
-        val url = URL(str)
-        val host = url.host
-        val asciiHost = IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED)
-        if (host != asciiHost) {
-            return str.replace(host, asciiHost)
-        } else {
-            return str
-        }
-    }
-
-    /**
-     * Converts a Unicode domain name to its IDN (Punycode, ASCII Compatible Encoding) format.
-     * If the input is an IP address or already an ASCII domain, returns the original string.
-     *
-     * @param domain The domain string to convert (can include non-ASCII internationalized characters).
-     * @return The domain in ASCII-compatible (Punycode) format, or the original string if input is an IP or already ASCII.
-     */
-    fun toIdnDomain(domain: String): String {
-        // Return as is if it's a pure IP address (IPv4 or IPv6)
-        if (Utils.isPureIpAddress(domain)) {
-            return domain
-        }
-
-        // Return as is if already ASCII (English domain or already punycode)
-        if (domain.all { it.code < 128 }) {
-            return domain
-        }
-
-        // Otherwise, convert to ASCII using IDN
-        return IDN.toASCII(domain, IDN.ALLOW_UNASSIGNED)
-    }
-
-    /**
-     * Resolves a hostname to an IP address, returns original input if it's already an IP
-     *
-     * @param host The hostname or IP address to resolve
-     * @param ipv6Preferred Whether to prefer IPv6 addresses, defaults to false
-     * @return The resolved IP address or the original input (if it's already an IP or resolution fails)
-     */
-    fun resolveHostToIP(host: String, ipv6Preferred: Boolean = false): List<String>? {
-        try {
-            // If it's already an IP address, return it as a list
-            if (Utils.isPureIpAddress(host)) {
-                return null
-            }
-
-            // Get all IP addresses
-            val addresses = InetAddress.getAllByName(host)
-            if (addresses.isEmpty()) {
-                return null
-            }
-
-            // Sort addresses based on preference
-            val sortedAddresses = if (ipv6Preferred) {
-                addresses.sortedWith(compareByDescending { it is Inet6Address })
-            } else {
-                addresses.sortedWith(compareBy { it is Inet6Address })
-            }
-
-            val ipList = sortedAddresses.mapNotNull { it.hostAddress }
-
-            Log.i(AppConfig.TAG, "Resolved IPs for $host: ${ipList.joinToString()}")
-
-            return ipList
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to resolve host to IP", e)
-            return null
-        }
-    }
-
-
-    /**
-     * Retrieves the content of a URL as a string.
-     *
-     * @param url The URL to fetch content from.
-     * @param timeout The timeout value in milliseconds.
-     * @param httpPort The HTTP port to use.
-     * @return The content of the URL as a string.
-     */
-    fun getUrlContent(url: String, timeout: Int, httpPort: Int = 0): String? {
-        val conn = createProxyConnection(url, httpPort, timeout, timeout) ?: return null
-        try {
-            return conn.inputStream.bufferedReader().readText()
-        } catch (_: Exception) {
-        } finally {
-            conn.disconnect()
-        }
-        return null
-    }
-
-    /**
-     * Retrieves the content of a URL as a string with a custom User-Agent header.
-     *
-     * @param url The URL to fetch content from.
-     * @param timeout The timeout value in milliseconds.
-     * @param httpPort The HTTP port to use.
-     * @return The content of the URL as a string.
-     * @throws IOException If an I/O error occurs.
-     */
-    @Throws(IOException::class)
-    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 15000, httpPort: Int = 0): String {
-        var currentUrl = url
-        var redirects = 0
-        val maxRedirects = 3
-
-        while (redirects++ < maxRedirects) {
-            if (currentUrl == null) continue
-            val conn = createProxyConnection(currentUrl, httpPort, timeout, timeout) ?: continue
-            conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
-            conn.connect()
-
-            val responseCode = conn.responseCode
-            when (responseCode) {
-                in 300..399 -> {
-                    val location = conn.getHeaderField("Location")
-                    conn.disconnect()
-                    if (location.isNullOrEmpty()) {
-                        throw IOException("Redirect location not found")
-                    }
-                    currentUrl = location
-                    continue
-                }
-
-                else -> try {
-                    return conn.inputStream.use { it.bufferedReader().readText() }
-                } finally {
-                    conn.disconnect()
-                }
-            }
-        }
-        throw IOException("Too many redirects")
-    }
-
-    /**
-     * Creates an HttpURLConnection object connected through a proxy.
-     *
-     * @param urlStr The target URL address.
-     * @param port The port of the proxy server.
-     * @param connectTimeout The connection timeout in milliseconds (default is 15000 ms).
-     * @param readTimeout The read timeout in milliseconds (default is 15000 ms).
-     * @param needStream Whether the connection needs to support streaming.
-     * @return Returns a configured HttpURLConnection object, or null if it fails.
-     */
-    fun createProxyConnection(
-        urlStr: String,
-        port: Int,
-        connectTimeout: Int = 15000,
-        readTimeout: Int = 15000,
-        needStream: Boolean = false
-    ): HttpURLConnection? {
-
-        var conn: HttpURLConnection? = null
-        try {
-            val url = URL(urlStr)
-            // Create a connection
-            conn = if (port == 0) {
-                url.openConnection()
-            } else {
-                url.openConnection(
-                    Proxy(
-                        Proxy.Type.HTTP,
-                        InetSocketAddress(LOOPBACK, port)
-                    )
-                )
-            } as HttpURLConnection
-
-            // Set connection and read timeouts
-            conn.connectTimeout = connectTimeout
-            conn.readTimeout = readTimeout
-            if (!needStream) {
-                // Set request headers
-                conn.setRequestProperty("Connection", "close")
-                // Disable automatic redirects
-                conn.instanceFollowRedirects = false
-                // Disable caching
-                conn.useCaches = false
-            }
-
-            //Add Basic Authorization
-            url.userInfo?.let {
-                conn.setRequestProperty(
-                    "Authorization",
-                    "Basic ${encode(urlDecode(it))}"
-                )
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to create proxy connection", e)
-            // If an exception occurs, close the connection and return null
-            conn?.disconnect()
-            return null
-        }
-        return conn
-    }
-}
-

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

@@ -1,79 +0,0 @@
-package com.v2ray.ang.util
-
-import android.util.Log
-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
-import com.google.gson.reflect.TypeToken
-import com.v2ray.ang.AppConfig
-import java.lang.reflect.Type
-
-object JsonUtil {
-    private var gson = Gson()
-
-    /**
-     * Converts an object to its JSON representation.
-     *
-     * @param src The object to convert.
-     * @return The JSON representation of the object.
-     */
-    fun toJson(src: Any?): String {
-        return gson.toJson(src)
-    }
-
-    /**
-     * Parses a JSON string into an object of the specified class.
-     *
-     * @param src The JSON string to parse.
-     * @param cls The class of the object to parse into.
-     * @return The parsed object.
-     */
-    fun <T> fromJson(src: String, cls: Class<T>): T {
-        return gson.fromJson(src, cls)
-    }
-
-    /**
-     * Converts an object to its pretty-printed JSON representation.
-     *
-     * @param src The object to convert.
-     * @return The pretty-printed JSON representation of the object, or null if the object is null.
-     */
-    fun toJsonPretty(src: Any?): String? {
-        if (src == null)
-            return null
-        val gsonPre = GsonBuilder()
-            .setPrettyPrinting()
-            .disableHtmlEscaping()
-            .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(
-                        src?.toInt()
-                    )
-                }
-            )
-            .create()
-        return gsonPre.toJson(src)
-    }
-
-    /**
-     * Parses a JSON string into a JsonObject.
-     *
-     * @param src The JSON string to parse.
-     * @return The parsed JsonObject, or null if parsing fails.
-     */
-    fun parseString(src: String?): JsonObject? {
-        if (src == null)
-            return null
-        try {
-            return JsonParser.parseString(src).getAsJsonObject()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to parse JSON string", e)
-            return null
-        }
-    }
-}

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

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

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

@@ -1,123 +0,0 @@
-package com.v2ray.ang.util
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.BinaryBitmap
-import com.google.zxing.DecodeHintType
-import com.google.zxing.EncodeHintType
-import com.google.zxing.NotFoundException
-import com.google.zxing.RGBLuminanceSource
-import com.google.zxing.common.GlobalHistogramBinarizer
-import com.google.zxing.qrcode.QRCodeReader
-import com.google.zxing.qrcode.QRCodeWriter
-import java.util.EnumMap
-
-/**
- * QR code decoder utility.
- */
-object QRCodeDecoder {
-    val HINTS: MutableMap<DecodeHintType, Any?> = EnumMap(DecodeHintType::class.java)
-
-    /**
-     * Creates a QR code bitmap from the given text.
-     *
-     * @param text The text to encode in the QR code.
-     * @param size The size of the QR code bitmap.
-     * @return The generated QR code bitmap, or null if an error occurs.
-     */
-    fun createQRCode(text: String, size: Int = 800): Bitmap? {
-        return runCatching {
-            val hints = mapOf(EncodeHintType.CHARACTER_SET to Charsets.UTF_8)
-            val bitMatrix = QRCodeWriter().encode(text, BarcodeFormat.QR_CODE, size, size, hints)
-            val pixels = IntArray(size * size) { i ->
-                if (bitMatrix.get(i % size, i / size)) 0xff000000.toInt() else 0xffffffff.toInt()
-            }
-            Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888).apply {
-                setPixels(pixels, 0, size, 0, 0, size, size)
-            }
-        }.getOrNull()
-    }
-
-    /**
-     * Decodes a QR code from a local image file. This method is time-consuming and should be called in a background thread.
-     *
-     * @param picturePath The local path of the image file to decode.
-     * @return The content of the QR code, or null if decoding fails.
-     */
-    fun syncDecodeQRCode(picturePath: String): String? {
-        return syncDecodeQRCode(getDecodeAbleBitmap(picturePath))
-    }
-
-    /**
-     * Decodes a QR code from a bitmap. This method is time-consuming and should be called in a background thread.
-     *
-     * @param bitmap The bitmap to decode.
-     * @return The content of the QR code, or null if decoding fails.
-     */
-    fun syncDecodeQRCode(bitmap: Bitmap?): String? {
-        return bitmap?.let {
-            runCatching {
-                val pixels = IntArray(it.width * it.height).also { array ->
-                    it.getPixels(array, 0, it.width, 0, 0, it.width, it.height)
-                }
-                val source = RGBLuminanceSource(it.width, it.height, pixels)
-                val qrReader = QRCodeReader()
-
-                try {
-                    qrReader.decode(BinaryBitmap(GlobalHistogramBinarizer(source)), mapOf(DecodeHintType.TRY_HARDER to true)).text
-                } catch (e: NotFoundException) {
-                    qrReader.decode(BinaryBitmap(GlobalHistogramBinarizer(source.invert())), mapOf(DecodeHintType.TRY_HARDER to true)).text
-                }
-            }.getOrNull()
-        }
-    }
-
-    /**
-     * Converts a local image file to a bitmap that can be decoded as a QR code. The image is compressed to avoid being too large.
-     *
-     * @param picturePath The local path of the image file.
-     * @return The decoded bitmap, or null if an error occurs.
-     */
-    private fun getDecodeAbleBitmap(picturePath: String): Bitmap? {
-        return try {
-            val options = BitmapFactory.Options()
-            options.inJustDecodeBounds = true
-            BitmapFactory.decodeFile(picturePath, options)
-            var sampleSize = options.outHeight / 400
-            if (sampleSize <= 0) {
-                sampleSize = 1
-            }
-            options.inSampleSize = sampleSize
-            options.inJustDecodeBounds = false
-            BitmapFactory.decodeFile(picturePath, options)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    init {
-        val allFormats: List<BarcodeFormat> = arrayListOf(
-            BarcodeFormat.AZTEC,
-            BarcodeFormat.CODABAR,
-            BarcodeFormat.CODE_39,
-            BarcodeFormat.CODE_93,
-            BarcodeFormat.CODE_128,
-            BarcodeFormat.DATA_MATRIX,
-            BarcodeFormat.EAN_8,
-            BarcodeFormat.EAN_13,
-            BarcodeFormat.ITF,
-            BarcodeFormat.MAXICODE,
-            BarcodeFormat.PDF_417,
-            BarcodeFormat.QR_CODE,
-            BarcodeFormat.RSS_14,
-            BarcodeFormat.RSS_EXPANDED,
-            BarcodeFormat.UPC_A,
-            BarcodeFormat.UPC_E,
-            BarcodeFormat.UPC_EAN_EXTENSION
-        )
-        HINTS[DecodeHintType.TRY_HARDER] = BarcodeFormat.QR_CODE
-        HINTS[DecodeHintType.POSSIBLE_FORMATS] = allFormats
-        HINTS[DecodeHintType.CHARACTER_SET] = Charsets.UTF_8
-    }
-}

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

@@ -1,570 +0,0 @@
-package com.v2ray.ang.util
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
-import android.content.res.Configuration.UI_MODE_NIGHT_MASK
-import android.content.res.Configuration.UI_MODE_NIGHT_NO
-import android.os.Build
-import android.os.LocaleList
-import android.provider.Settings
-import android.text.Editable
-import android.util.Base64
-import android.util.Log
-import android.util.Patterns
-import android.webkit.URLUtil
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import com.v2ray.ang.AppConfig
-import com.v2ray.ang.AppConfig.LOOPBACK
-import com.v2ray.ang.BuildConfig
-import java.io.IOException
-import java.net.InetAddress
-import java.net.ServerSocket
-import java.net.URI
-import java.net.URLDecoder
-import java.net.URLEncoder
-import java.util.Locale
-import java.util.UUID
-
-object Utils {
-
-    private val IPV4_REGEX =
-        Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$")
-    private val IPV6_REGEX = Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$")
-
-    /**
-     * Convert string to editable for Kotlin.
-     *
-     * @param text The string to convert.
-     * @return An Editable instance containing the text.
-     */
-    fun getEditable(text: String?): Editable {
-        return Editable.Factory.getInstance().newEditable(text.orEmpty())
-    }
-
-    /**
-     * Find the position of a value in an array.
-     *
-     * @param array The array to search.
-     * @param value The value to find.
-     * @return The index of the value in the array, or -1 if not found.
-     */
-    fun arrayFind(array: Array<out String>, value: String): Int {
-        return array.indexOf(value)
-    }
-
-    /**
-     * Parse a string to an integer with a default value.
-     *
-     * @param str The string to parse.
-     * @param default The default value if parsing fails.
-     * @return The parsed integer, or the default value if parsing fails.
-     */
-    fun parseInt(str: String?, default: Int = 0): Int {
-        return str?.toIntOrNull() ?: default
-    }
-
-    /**
-     * Get text from the clipboard.
-     *
-     * @param context The context to use.
-     * @return The text from the clipboard, or an empty string if an error occurs.
-     */
-    fun getClipboard(context: Context): String {
-        return try {
-            val cmb = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            cmb.primaryClip?.getItemAt(0)?.text.toString()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to get clipboard content", e)
-            ""
-        }
-    }
-
-    /**
-     * Set text to the clipboard.
-     *
-     * @param context The context to use.
-     * @param content The text to set to the clipboard.
-     */
-    fun setClipboard(context: Context, content: String) {
-        try {
-            val cmb = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val clipData = ClipData.newPlainText(null, content)
-            cmb.setPrimaryClip(clipData)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to set clipboard content", e)
-        }
-    }
-
-    /**
-     * Decode a base64 encoded string.
-     *
-     * @param text The base64 encoded string.
-     * @return The decoded string, or an empty string if decoding fails.
-     */
-    fun decode(text: String?): String {
-        return tryDecodeBase64(text) ?: text?.trimEnd('=')?.let { tryDecodeBase64(it) }.orEmpty()
-    }
-
-    /**
-     * Try to decode a base64 encoded string.
-     *
-     * @param text The base64 encoded string.
-     * @return The decoded string, or null if decoding fails.
-     */
-    fun tryDecodeBase64(text: String?): String? {
-        if (text.isNullOrEmpty()) return null
-
-        try {
-            return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to decode standard base64", e)
-        }
-        try {
-            return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(Charsets.UTF_8)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to decode URL-safe base64", e)
-        }
-        return null
-    }
-
-    /**
-     * Encode a string to base64.
-     *
-     * @param text The string to encode.
-     * @return The base64 encoded string, or an empty string if encoding fails.
-     */
-    fun encode(text: String): String {
-        return try {
-            Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to encode text to base64", e)
-            ""
-        }
-    }
-
-    /**
-     * Check if a string is a valid IP address.
-     *
-     * @param value The string to check.
-     * @return True if the string is a valid IP address, false otherwise.
-     */
-    fun isIpAddress(value: String?): Boolean {
-        if (value.isNullOrEmpty()) return false
-
-        try {
-            var addr = value.trim()
-            if (addr.isEmpty()) return false
-
-            //CIDR
-            if (addr.contains("/")) {
-                val arr = addr.split("/")
-                if (arr.size == 2 && arr[1].toIntOrNull() != null && arr[1].toInt() > -1) {
-                    addr = arr[0]
-                }
-            }
-
-            // Handle IPv4-mapped IPv6 addresses
-            if (addr.startsWith("::ffff:") && '.' in addr) {
-                addr = addr.drop(7)
-            } else if (addr.startsWith("[::ffff:") && '.' in addr) {
-                addr = addr.drop(8).replace("]", "")
-            }
-
-            val octets = addr.split('.')
-            if (octets.size == 4) {
-                if (octets[3].contains(":")) {
-                    addr = addr.substring(0, addr.indexOf(":"))
-                }
-                return isIpv4Address(addr)
-            }
-
-            return isIpv6Address(addr)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to validate IP address", e)
-            return false
-        }
-    }
-
-    /**
-     * Check if a string is a pure IP address (IPv4 or IPv6).
-     *
-     * @param value The string to check.
-     * @return True if the string is a pure IP address, false otherwise.
-     */
-    fun isPureIpAddress(value: String): Boolean {
-        return isIpv4Address(value) || isIpv6Address(value)
-    }
-
-    /**
-     * Check if a string is a valid domain name.
-     *
-     * A valid domain name must not be an IP address and must be a valid URL format.
-     *
-     * @param input The string to check.
-     * @return True if the string is a valid domain name, false otherwise.
-     */
-    fun isDomainName(input: String?): Boolean {
-        if (input.isNullOrEmpty()) return false
-
-        // Must not be an IP address and must be a valid URL format
-        return !isPureIpAddress(input) && isValidUrl(input)
-    }
-
-    /**
-     * Check if a string is a valid IPv4 address.
-     *
-     * @param value The string to check.
-     * @return True if the string is a valid IPv4 address, false otherwise.
-     */
-    private fun isIpv4Address(value: String): Boolean {
-        return IPV4_REGEX.matches(value)
-    }
-
-    /**
-     * Check if a string is a valid IPv6 address.
-     *
-     * @param value The string to check.
-     * @return True if the string is a valid IPv6 address, false otherwise.
-     */
-    private fun isIpv6Address(value: String): Boolean {
-        var addr = value
-        if (addr.startsWith("[") && addr.endsWith("]")) {
-            addr = addr.drop(1).dropLast(1)
-        }
-        return IPV6_REGEX.matches(addr)
-    }
-
-    /**
-     * Check if a string is a CoreDNS address.
-     *
-     * @param s The string to check.
-     * @return True if the string is a CoreDNS address, false otherwise.
-     */
-    fun isCoreDNSAddress(s: String): Boolean {
-        return s.startsWith("https") ||
-                s.startsWith("tcp") ||
-                s.startsWith("quic") ||
-                s == "localhost"
-    }
-
-    /**
-     * Check if a string is a valid URL.
-     *
-     * @param value The string to check.
-     * @return True if the string is a valid URL, false otherwise.
-     */
-    fun isValidUrl(value: String?): Boolean {
-        if (value.isNullOrEmpty()) return false
-
-        return try {
-            Patterns.WEB_URL.matcher(value).matches() ||
-                    Patterns.DOMAIN_NAME.matcher(value).matches() ||
-                    URLUtil.isValidUrl(value)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to validate URL", e)
-            false
-        }
-    }
-
-    /**
-     * Open a URI in a browser.
-     *
-     * @param context The context to use.
-     * @param uriString The URI string to open.
-     */
-    fun openUri(context: Context, uriString: String) {
-        try {
-            val uri = uriString.toUri()
-            context.startActivity(Intent(Intent.ACTION_VIEW, uri))
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to open URI", e)
-        }
-    }
-
-    /**
-     * Generate a UUID.
-     *
-     * @return A UUID string without dashes.
-     */
-    fun getUuid(): String {
-        return try {
-            UUID.randomUUID().toString().replace("-", "")
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to generate UUID", e)
-            ""
-        }
-    }
-
-    /**
-     * Decode a URL-encoded string.
-     *
-     * @param url The URL-encoded string.
-     * @return The decoded string, or the original string if decoding fails.
-     */
-    fun urlDecode(url: String): String {
-        return try {
-            URLDecoder.decode(url, Charsets.UTF_8.toString())
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to decode URL", e)
-            url
-        }
-    }
-
-    /**
-     * Encode a string to URL-encoded format.
-     *
-     * @param url The string to encode.
-     * @return The URL-encoded string, or the original string if encoding fails.
-     */
-    fun urlEncode(url: String): String {
-        return try {
-            URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20")
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to encode URL", e)
-            url
-        }
-    }
-
-    /**
-     * Read text from an asset file.
-     *
-     * @param context The context to use.
-     * @param fileName The name of the asset file.
-     * @return The content of the asset file as a string.
-     */
-    fun readTextFromAssets(context: Context?, fileName: String): String {
-        if (context == null) return ""
-
-        return try {
-            context.assets.open(fileName).use { inputStream ->
-                inputStream.bufferedReader().use { reader ->
-                    reader.readText()
-                }
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to read asset file: $fileName", e)
-            ""
-        }
-    }
-
-    /**
-     * Get the path to the user asset directory.
-     *
-     * @param context The context to use.
-     * @return The path to the user asset directory.
-     */
-    fun userAssetPath(context: Context?): String {
-        if (context == null) return ""
-
-        return try {
-            context.getExternalFilesDir(AppConfig.DIR_ASSETS)?.absolutePath
-                ?: context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to get user asset path", e)
-            ""
-        }
-    }
-
-    /**
-     * Get the path to the backup directory.
-     *
-     * @param context The context to use.
-     * @return The path to the backup directory.
-     */
-    fun backupPath(context: Context?): String {
-        if (context == null) return ""
-
-        return try {
-            context.getExternalFilesDir(AppConfig.DIR_BACKUPS)?.absolutePath
-                ?: context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to get backup path", e)
-            ""
-        }
-    }
-
-    /**
-     * Get the device ID for XUDP base key.
-     *
-     * @return The device ID for XUDP base key.
-     */
-    fun getDeviceIdForXUDPBaseKey(): String {
-        return try {
-            val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8)
-            Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE))
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to generate device ID", e)
-            ""
-        }
-    }
-
-    /**
-     * Get the dark mode status.
-     *
-     * @param context The context to use.
-     * @return True if dark mode is enabled, false otherwise.
-     */
-    fun getDarkModeStatus(context: Context): Boolean {
-        return context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK != UI_MODE_NIGHT_NO
-    }
-
-    /**
-     * Get the IPv6 address in a formatted string.
-     *
-     * @param address The IPv6 address.
-     * @return The formatted IPv6 address, or the original address if not valid.
-     */
-    fun getIpv6Address(address: String?): String {
-        if (address.isNullOrEmpty()) return ""
-
-        return if (isIpv6Address(address) && !address.contains('[') && !address.contains(']')) {
-            "[$address]"
-        } else {
-            address
-        }
-    }
-
-    /**
-     * Get the system locale.
-     *
-     * @return The system locale.
-     */
-    fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        LocaleList.getDefault()[0]
-    } else {
-        Locale.getDefault()
-    }
-
-    /**
-     * Fix illegal characters in a URL.
-     *
-     * @param str The URL string.
-     * @return The URL string with illegal characters replaced.
-     */
-    fun fixIllegalUrl(str: String): String {
-        return str.replace(" ", "%20")
-            .replace("|", "%7C")
-    }
-
-    /**
-     * Find a free port from a list of ports.
-     *
-     * @param ports The list of ports to check.
-     * @return The first free port found.
-     * @throws IOException If no free port is found.
-     */
-    fun findFreePort(ports: List<Int>): Int {
-        for (port in ports) {
-            try {
-                return ServerSocket(port).use { it.localPort }
-            } catch (ex: IOException) {
-                continue  // try next port
-            }
-        }
-
-        // if the program gets here, no port in the range was found
-        throw IOException("no free port found")
-    }
-
-    /**
-     * Check if a string is a valid subscription URL.
-     *
-     * @param value The string to check.
-     * @return True if the string is a valid subscription URL, false otherwise.
-     */
-    fun isValidSubUrl(value: String?): Boolean {
-        if (value.isNullOrEmpty()) return false
-
-        try {
-            if (URLUtil.isHttpsUrl(value)) return true
-            if (URLUtil.isHttpUrl(value)) {
-                if (value.contains(LOOPBACK)) return true
-
-                //Check private ip address
-                val uri = URI(fixIllegalUrl(value))
-                if (isIpAddress(uri.host)) {
-                    AppConfig.PRIVATE_IP_LIST.forEach {
-                        if (isIpInCidr(uri.host, it)) return true
-                    }
-                }
-            }
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to validate subscription URL", e)
-        }
-        return false
-    }
-
-    /**
-     * Get the receiver flags based on the Android version.
-     *
-     * @return The receiver flags.
-     */
-    fun receiverFlags(): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        ContextCompat.RECEIVER_EXPORTED
-    } else {
-        ContextCompat.RECEIVER_NOT_EXPORTED
-    }
-
-    /**
-     * Check if the package is Xray.
-     *
-     * @return True if the package is Xray, false otherwise.
-     */
-    fun isXray(): Boolean = BuildConfig.APPLICATION_ID.startsWith("com.v2ray.ang")
-
-    /**
-     * Check if it is the Google Play version.
-     *
-     * @return True if the package is Google Play, false otherwise.
-     */
-    fun isGoogleFlavor(): Boolean = BuildConfig.FLAVOR == "playstore"
-
-    /**
-     * Converts an InetAddress to its long representation
-     *
-     * @param ip The InetAddress to convert
-     * @return The long representation of the IP address
-     */
-    private fun inetAddressToLong(ip: InetAddress): Long {
-        val bytes = ip.address
-        var result: Long = 0
-        for (i in bytes.indices) {
-            result = result shl 8 or (bytes[i].toInt() and 0xff).toLong()
-        }
-        return result
-    }
-
-    /**
-     * Check if an IP address is within a CIDR range
-     *
-     * @param ip The IP address to check
-     * @param cidr The CIDR notation range (e.g., "192.168.1.0/24")
-     * @return True if the IP is within the CIDR range, false otherwise
-     */
-    fun isIpInCidr(ip: String, cidr: String): Boolean {
-        try {
-            if (!isIpAddress(ip)) return false
-
-            // Parse CIDR (e.g., "192.168.1.0/24")
-            val (cidrIp, prefixLen) = cidr.split("/")
-            val prefixLength = prefixLen.toInt()
-
-            // Convert IP and CIDR's IP portion to Long
-            val ipLong = inetAddressToLong(InetAddress.getByName(ip))
-            val cidrIpLong = inetAddressToLong(InetAddress.getByName(cidrIp))
-
-            // Calculate subnet mask (e.g., /24 → 0xFFFFFF00)
-            val mask = if (prefixLength == 0) 0L else (-1L shl (32 - prefixLength))
-
-            // Check if they're in the same subnet
-            return (ipLong and mask) == (cidrIpLong and mask)
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to check if IP is in CIDR", e)
-            return false
-        }
-    }
-}
-

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

@@ -0,0 +1,52 @@
+package com.v2ray.ang
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.multidex.MultiDexApplication
+import androidx.work.Configuration
+import androidx.work.WorkManager
+import com.tencent.mmkv.MMKV
+import com.v2ray.ang.util.SettingsManager
+import com.v2ray.ang.util.Utils
+
+class AngApplication : MultiDexApplication() {
+    companion object {
+        //const val PREF_LAST_VERSION = "pref_last_version"
+        lateinit var application: AngApplication
+    }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+        application = this
+    }
+
+    private val workManagerConfiguration: Configuration = Configuration.Builder()
+        .setDefaultProcessName("${BuildConfig.APPLICATION_ID}:bg")
+        .build()
+
+    override fun onCreate() {
+        super.onCreate()
+
+//        LeakCanary.install(this)
+
+//        val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+//        firstRun = defaultSharedPreferences.getInt(PREF_LAST_VERSION, 0) != BuildConfig.VERSION_CODE
+//        if (firstRun)
+//            defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
+
+        MMKV.initialize(this)
+
+        Utils.setNightMode(application)
+        // 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/kotlin/com/v2ray/ang/AppConfig.kt

@@ -5,7 +5,6 @@ object AppConfig {
 
     /** The application's package name. */
     const val ANG_PACKAGE = BuildConfig.APPLICATION_ID
-    const val TAG = BuildConfig.APPLICATION_ID
 
     /** Directory names used in the app's file system. */
     const val DIR_ASSETS = "assets"
@@ -13,6 +12,7 @@ object AppConfig {
 
     /** Legacy configuration keys. */
     const val ANG_CONFIG = "ang_config"
+    const val PREF_INAPP_BUY_IS_PREMIUM = "pref_inapp_buy_is_premium"
 
     /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
@@ -22,11 +22,8 @@ object AppConfig {
     const val PREF_BYPASS_APPS = "pref_bypass_apps"
     const val PREF_LOCAL_DNS_ENABLED = "pref_local_dns_enabled"
     const val PREF_FAKE_DNS_ENABLED = "pref_fake_dns_enabled"
-    const val PREF_APPEND_HTTP_PROXY = "pref_append_http_proxy"
     const val PREF_LOCAL_DNS_PORT = "pref_local_dns_port"
     const val PREF_VPN_DNS = "pref_vpn_dns"
-    const val PREF_VPN_BYPASS_LAN = "pref_vpn_bypass_lan"
-    const val PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX = "pref_vpn_interface_address_config_index"
     const val PREF_ROUTING_DOMAIN_STRATEGY = "pref_routing_domain_strategy"
     const val PREF_ROUTING_RULESET = "pref_routing_ruleset"
     const val PREF_MUX_ENABLED = "pref_mux_enabled"
@@ -44,30 +41,28 @@ object AppConfig {
     const val PREF_SPEED_ENABLED = "pref_speed_enabled"
     const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
     const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"
-    const val PREF_DOUBLE_COLUMN_DISPLAY = "pref_double_column_display"
     const val PREF_LANGUAGE = "pref_language"
     const val PREF_UI_MODE_NIGHT = "pref_ui_mode_night"
     const val PREF_PREFER_IPV6 = "pref_prefer_ipv6"
     const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled"
     const val PREF_ALLOW_INSECURE = "pref_allow_insecure"
     const val PREF_SOCKS_PORT = "pref_socks_port"
+    const val PREF_HTTP_PORT = "pref_http_port"
     const val PREF_REMOTE_DNS = "pref_remote_dns"
     const val PREF_DOMESTIC_DNS = "pref_domestic_dns"
-    const val PREF_DNS_HOSTS = "pref_dns_hosts"
     const val PREF_DELAY_TEST_URL = "pref_delay_test_url"
     const val PREF_LOGLEVEL = "pref_core_loglevel"
-    const val PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD = "pref_outbound_domain_resolve_method"
     const val PREF_MODE = "pref_mode"
     const val PREF_IS_BOOTED = "pref_is_booted"
-    const val PREF_CHECK_UPDATE_PRE_RELEASE = "pref_check_update_pre_release"
-    const val PREF_GEO_FILES_SOURCES = "pref_geo_files_sources"
 
     /** Cache keys. */
     const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
     const val CACHE_KEYWORD_FILTER = "cache_keyword_filter"
 
     /** Protocol identifiers. */
-    const val PROTOCOL_FREEDOM = "freedom"
+    const val PROTOCOL_HTTP: String = "http://"
+    const val PROTOCOL_HTTPS: String = "https://"
+    const val PROTOCOL_FREEDOM: String = "freedom"
 
     /** Broadcast actions. */
     const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
@@ -92,20 +87,19 @@ object AppConfig {
     const val DOWNLINK = "downlink"
 
     /** URLs for various resources. */
-    const val GITHUB_URL = "https://github.com"
+    const val androidpackagenamelistUrl =
-    const val GITHUB_RAW_URL = "https://raw.githubusercontent.com"
+        "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
-    const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download"
+    const val v2rayCustomRoutingListUrl =
-    const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt"
+        "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
-    const val APP_URL = "$GITHUB_URL/2dust/v2rayNG"
+    const val v2rayNGUrl = "https://github.com/2dust/v2rayNG"
-    const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases"
+    const val v2rayNGIssues = "$v2rayNGUrl/issues"
-    const val APP_ISSUES_URL = "$APP_URL/issues"
+    const val v2rayNGWikiMode = "$v2rayNGUrl/wiki/Mode"
-    const val APP_WIKI_MODE = "$APP_URL/wiki/Mode"
+    const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md"
-    const val APP_PRIVACY_POLICY = "$GITHUB_RAW_URL/2dust/v2rayNG/master/CR.md"
+    const val PromotionUrl = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
-    const val APP_PROMOTION_URL = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw="
+    const val GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/"
-    const val TG_CHANNEL_URL = "https://t.me/github_2dust"
+    const val TgChannelUrl = "https://t.me/github_2dust"
-    const val DELAY_TEST_URL = "https://www.gstatic.com/generate_204"
+    const val DelayTestUrl = "https://www.gstatic.com/generate_204"
-    const val DELAY_TEST_URL2 = "https://www.google.com/generate_204"
+    const val DelayTestUrl2 = "https://www.google.com/generate_204"
-    const val IP_API_URL = "https://speed.cloudflare.com/meta"
 
     /** DNS server addresses. */
     const val DNS_PROXY = "1.1.1.1"
@@ -119,6 +113,7 @@ 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"
@@ -163,86 +158,4 @@ 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_ONE_DOMAIN = "one.one.one.one"
-    const val DNS_CLOUDFLARE_DNS_COM_DOMAIN = "dns.cloudflare.com"
-    const val DNS_CLOUDFLARE_DNS_DOMAIN = "cloudflare-dns.com"
-    const val DNS_GOOGLE_DOMAIN = "dns.google"
-    const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
-    const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
-
-    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"
-
-    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-    val DNS_CLOUDFLARE_DNS_COM_ADDRESSES = arrayListOf("104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5")
-    val DNS_CLOUDFLARE_DNS_ADDRESSES = arrayListOf("104.16.248.249", "104.16.249.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9")
-    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
-    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
-    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
-    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
-
-    //minimum list https://serverfault.com/a/304791
-    val ROUTED_IP_LIST = arrayListOf(
-        "0.0.0.0/5",
-        "8.0.0.0/7",
-        "11.0.0.0/8",
-        "12.0.0.0/6",
-        "16.0.0.0/4",
-        "32.0.0.0/3",
-        "64.0.0.0/2",
-        "128.0.0.0/3",
-        "160.0.0.0/5",
-        "168.0.0.0/6",
-        "172.0.0.0/12",
-        "172.32.0.0/11",
-        "172.64.0.0/10",
-        "172.128.0.0/9",
-        "173.0.0.0/8",
-        "174.0.0.0/7",
-        "176.0.0.0/4",
-        "192.0.0.0/9",
-        "192.128.0.0/11",
-        "192.160.0.0/13",
-        "192.169.0.0/16",
-        "192.170.0.0/15",
-        "192.172.0.0/14",
-        "192.176.0.0/12",
-        "192.192.0.0/10",
-        "193.0.0.0/8",
-        "194.0.0.0/7",
-        "196.0.0.0/6",
-        "200.0.0.0/5",
-        "208.0.0.0/4",
-        "240.0.0.0/4"
-    )
-
-    val PRIVATE_IP_LIST = arrayListOf(
-        "0.0.0.0/8",
-        "10.0.0.0/8",
-        "127.0.0.0/8",
-        "172.16.0.0/12",
-        "192.168.0.0/16",
-        "169.254.0.0/16",
-        "224.0.0.0/4"
-    )
-
-    val GEO_FILES_SOURCES = arrayListOf(
-        "Loyalsoldier/v2ray-rules-dat",
-        "runetfreedom/russia-v2ray-rules-dat",
-        "Chocolate4U/Iran-v2ray-rules"
-    )
-
 }

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

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

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

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

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

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

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

@@ -8,8 +8,6 @@ data class Hysteria2Bean(
     val socks5: Socks5Bean? = null,
     val http: Socks5Bean? = null,
     val tls: TlsBean? = null,
-    val transport: TransportBean? = null,
-    val bandwidth: BandwidthBean? = null,
 ) {
     data class ObfsBean(
         val type: String?,
@@ -27,20 +25,5 @@ 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?,
-        )
-    }
-
-    data class BandwidthBean(
-        val down: String?,
-        val up: String?,
     )
 }

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

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

V2rayNG/app/src/main/kotlin/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 locked: Boolean? = false,
+    var looked: Boolean? = false,
 )

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

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

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

@@ -1,17 +1,23 @@
 package com.v2ray.ang.dto
 
+import android.text.TextUtils
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
-import com.v2ray.ang.AppConfig
+import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.util.Utils
+import java.lang.reflect.Type
 
 data class V2rayConfig(
     var remarks: String? = null,
     var stats: Any? = null,
     val log: LogBean,
-    var policy: PolicyBean? = null,
+    var policy: PolicyBean?,
     val inbounds: ArrayList<InboundBean>,
     var outbounds: ArrayList<OutboundBean>,
-    var dns: DnsBean? = null,
+    var dns: DnsBean,
     val routing: RoutingBean,
     val api: Any? = null,
     val transport: Any? = null,
@@ -21,11 +27,21 @@ 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? = null,
+        val access: String,
-        val error: String? = null,
+        val error: String,
-        var loglevel: String? = null,
+        var loglevel: String?,
         val dnsLog: Boolean? = null
     )
 
@@ -35,7 +51,7 @@ data class V2rayConfig(
         var protocol: String,
         var listen: String? = null,
         val settings: Any? = null,
-        val sniffing: SniffingBean? = null,
+        val sniffing: SniffingBean?,
         val streamSettings: Any? = null,
         val allocate: Any? = null
     ) {
@@ -66,6 +82,7 @@ data class V2rayConfig(
         val sendThrough: String? = null,
         var mux: MuxBean? = MuxBean(false)
     ) {
+
         data class OutSettingsBean(
             var vnext: List<VnextBean>? = null,
             var fragment: FragmentBean? = null,
@@ -93,17 +110,17 @@ data class V2rayConfig(
 
             data class VnextBean(
                 var address: String = "",
-                var port: Int = AppConfig.DEFAULT_PORT,
+                var port: Int = DEFAULT_PORT,
                 var users: List<UsersBean>
             ) {
 
                 data class UsersBean(
                     var id: String = "",
                     var alterId: Int? = null,
-                    var security: String? = null,
+                    var security: String = DEFAULT_SECURITY,
-                    var level: Int = AppConfig.DEFAULT_LEVEL,
+                    var level: Int = DEFAULT_LEVEL,
-                    var encryption: String? = null,
+                    var encryption: String = "",
-                    var flow: String? = null
+                    var flow: String = ""
                 )
             }
 
@@ -124,8 +141,8 @@ data class V2rayConfig(
                 var method: String? = null,
                 var ota: Boolean = false,
                 var password: String? = null,
-                var port: Int = AppConfig.DEFAULT_PORT,
+                var port: Int = DEFAULT_PORT,
-                var level: Int = AppConfig.DEFAULT_LEVEL,
+                var level: Int = DEFAULT_LEVEL,
                 val email: String? = null,
                 var flow: String? = null,
                 val ivCheck: Boolean? = null,
@@ -134,7 +151,7 @@ data class V2rayConfig(
                 data class SocksUsersBean(
                     var user: String = "",
                     var pass: String = "",
-                    var level: Int = AppConfig.DEFAULT_LEVEL
+                    var level: Int = DEFAULT_LEVEL
                 )
             }
 
@@ -142,19 +159,18 @@ data class V2rayConfig(
 
             data class WireGuardBean(
                 var publicKey: String = "",
-                var preSharedKey: String? = null,
                 var endpoint: String = ""
             )
         }
 
         data class StreamSettingsBean(
-            var network: String = AppConfig.DEFAULT_NETWORK,
+            var network: String = DEFAULT_NETWORK,
-            var security: String? = null,
+            var security: String = "",
             var tcpSettings: TcpSettingsBean? = null,
             var kcpSettings: KcpSettingsBean? = null,
             var wsSettings: WsSettingsBean? = null,
             var httpupgradeSettings: HttpupgradeSettingsBean? = null,
-            var xhttpSettings: XhttpSettingsBean? = null,
+            var splithttpSettings: SplithttpSettingsBean? = null,
             var httpSettings: HttpSettingsBean? = null,
             var tlsSettings: TlsSettingsBean? = null,
             var quicSettings: QuicSettingBean? = null,
@@ -204,14 +220,11 @@ data class V2rayConfig(
                 var header: HeaderBean = HeaderBean(),
                 var seed: String? = null
             ) {
-                data class HeaderBean(
+                data class HeaderBean(var type: String = "none")
-                    var type: String = "none",
-                    var domain: String? = null
-                )
             }
 
             data class WsSettingsBean(
-                var path: String? = null,
+                var path: String = "",
                 var headers: HeadersBean = HeadersBean(),
                 val maxEarlyData: Int? = null,
                 val useBrowserForwarding: Boolean? = null,
@@ -221,21 +234,21 @@ data class V2rayConfig(
             }
 
             data class HttpupgradeSettingsBean(
-                var path: String? = null,
+                var path: String = "",
-                var host: String? = null,
+                var host: String = "",
                 val acceptProxyProtocol: Boolean? = null
             )
 
-            data class XhttpSettingsBean(
+            data class SplithttpSettingsBean(
-                var path: String? = null,
+                var path: String = "",
-                var host: String? = null,
+                var host: String = "",
-                var mode: String? = null,
+                val maxUploadSize: Int? = null,
-                var extra: Any? = null,
+                val maxConcurrentUploads: Int? = null
             )
 
             data class HttpSettingsBean(
                 var host: List<String> = ArrayList(),
-                var path: String? = null
+                var path: String = ""
             )
 
             data class SockoptBean(
@@ -244,13 +257,12 @@ data class V2rayConfig(
                 var tcpFastOpen: Boolean? = null,
                 var tproxy: String? = null,
                 var mark: Int? = null,
-                var dialerProxy: String? = null,
+                var dialerProxy: String? = null
-                var domainStrategy: String? = null
             )
 
             data class TlsSettingsBean(
                 var allowInsecure: Boolean = false,
-                var serverName: String? = null,
+                var serverName: String = "",
                 val alpn: List<String>? = null,
                 val minVersion: String? = null,
                 val maxVersion: String? = null,
@@ -295,29 +307,143 @@ data class V2rayConfig(
                 )
             }
 
+            fun populateTransportSettings(
+                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
+                when (network) {
+                    "tcp" -> {
+                        val tcpSetting = TcpSettingsBean()
+                        if (headerType == HTTP) {
+                            tcpSetting.header.type = HTTP
+                            if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
+                                val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
+                                requestObj.headers.Host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                requestObj.path = (path.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                tcpSetting.header.request = requestObj
+                                sni = requestObj.headers.Host?.getOrNull(0) ?: sni
+                            }
+                        } else {
+                            tcpSetting.header.type = "none"
+                            sni = host.orEmpty()
+                        }
+                        tcpSettings = tcpSetting
+                    }
+
+                    "kcp" -> {
+                        val kcpsetting = KcpSettingsBean()
+                        kcpsetting.header.type = headerType ?: "none"
+                        if (seed.isNullOrEmpty()) {
+                            kcpsetting.seed = null
+                        } else {
+                            kcpsetting.seed = seed
+                        }
+                        kcpSettings = kcpsetting
+                    }
+
+                    "ws" -> {
+                        val wssetting = WsSettingsBean()
+                        wssetting.headers.Host = host.orEmpty()
+                        sni = wssetting.headers.Host
+                        wssetting.path = path ?: "/"
+                        wsSettings = wssetting
+                    }
+
+                    "httpupgrade" -> {
+                        val httpupgradeSetting = HttpupgradeSettingsBean()
+                        httpupgradeSetting.host = host.orEmpty()
+                        sni = httpupgradeSetting.host
+                        httpupgradeSetting.path = path ?: "/"
+                        httpupgradeSettings = httpupgradeSetting
+                    }
+
+                    "splithttp" -> {
+                        val splithttpSetting = SplithttpSettingsBean()
+                        splithttpSetting.host = host.orEmpty()
+                        sni = splithttpSetting.host
+                        splithttpSetting.path = path ?: "/"
+                        splithttpSettings = splithttpSetting
+                    }
+
+                    "h2", "http" -> {
+                        network = "h2"
+                        val h2Setting = HttpSettingsBean()
+                        h2Setting.host = (host.orEmpty()).split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                        sni = h2Setting.host.getOrNull(0) ?: sni
+                        h2Setting.path = path ?: "/"
+                        httpSettings = h2Setting
+                    }
+
+                    "quic" -> {
+                        val quicsetting = QuicSettingBean()
+                        quicsetting.security = quicSecurity ?: "none"
+                        quicsetting.key = key.orEmpty()
+                        quicsetting.header.type = headerType ?: "none"
+                        quicSettings = quicsetting
+                    }
+
+                    "grpc" -> {
+                        val grpcSetting = GrpcSettingsBean()
+                        grpcSetting.multiMode = mode == "multi"
+                        grpcSetting.serviceName = serviceName.orEmpty()
+                        grpcSetting.authority = authority.orEmpty()
+                        grpcSetting.idle_timeout = 60
+                        grpcSetting.health_check_timeout = 20
+                        sni = authority.orEmpty()
+                        grpcSettings = grpcSetting
+                    }
+                }
+                return sni
+            }
+
+            fun populateTlsSettings(
+                streamSecurity: String, allowInsecure: Boolean, sni: String, fingerprint: String?, alpns: String?,
+                publicKey: String?, shortId: String?, spiderX: String?
+            ) {
+                security = streamSecurity
+                val tlsSetting = TlsSettingsBean(
+                    allowInsecure = allowInsecure,
+                    serverName = sni,
+                    fingerprint = fingerprint,
+                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+                    publicKey = publicKey,
+                    shortId = shortId,
+                    spiderX = spiderX
+                )
+                if (security == TLS) {
+                    tlsSettings = tlsSetting
+                    realitySettings = null
+                } else if (security == REALITY) {
+                    tlsSettings = null
+                    realitySettings = tlsSetting
+                }
+            }
         }
 
         data class MuxBean(
             var enabled: Boolean,
-            var concurrency: Int? = null,
+            var concurrency: Int = 8,
-            var xudpConcurrency: Int? = null,
+            var xudpConcurrency: Int = 8,
-            var xudpProxyUDP443: String? = null,
+            var xudpProxyUDP443: String = "",
         )
 
         fun getServerAddress(): String? {
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.first()?.address
+                return settings?.vnext?.get(0)?.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?.first()?.address
+                return settings?.servers?.get(0)?.address
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.first()?.endpoint?.substringBeforeLast(":")
+                return settings?.peers?.get(0)?.endpoint?.substringBeforeLast(":")
             }
             return null
         }
@@ -326,16 +452,16 @@ data class V2rayConfig(
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.first()?.port
+                return settings?.vnext?.get(0)?.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?.first()?.port
+                return settings?.servers?.get(0)?.port
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
-                return settings?.peers?.first()?.endpoint?.substringAfterLast(":")?.toInt()
+                return settings?.peers?.get(0)?.endpoint?.substringAfterLast(":")?.toInt()
             }
             return null
         }
@@ -350,16 +476,16 @@ data class V2rayConfig(
             if (protocol.equals(EConfigType.VMESS.name, true)
                 || protocol.equals(EConfigType.VLESS.name, true)
             ) {
-                return settings?.vnext?.first()?.users?.first()?.id
+                return settings?.vnext?.get(0)?.users?.get(0)?.id
             } else if (protocol.equals(EConfigType.SHADOWSOCKS.name, true)
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
             ) {
-                return settings?.servers?.first()?.password
+                return settings?.servers?.get(0)?.password
             } else if (protocol.equals(EConfigType.SOCKS.name, true)
                 || protocol.equals(EConfigType.HTTP.name, true)
             ) {
-                return settings?.servers?.first()?.users?.first()?.pass
+                return settings?.servers?.get(0)?.users?.get(0)?.pass
             } else if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 return settings?.secretKey
             }
@@ -368,14 +494,14 @@ data class V2rayConfig(
 
         fun getSecurityEncryption(): String? {
             return when {
-                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.first()?.users?.first()?.security
+                protocol.equals(EConfigType.VMESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.security
-                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.first()?.users?.first()?.encryption
+                protocol.equals(EConfigType.VLESS.name, true) -> settings?.vnext?.get(0)?.users?.get(0)?.encryption
-                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.first()?.method
+                protocol.equals(EConfigType.SHADOWSOCKS.name, true) -> settings?.servers?.get(0)?.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)
@@ -383,7 +509,7 @@ data class V2rayConfig(
             ) {
                 val transport = streamSettings?.network ?: return null
                 return when (transport) {
-                    NetworkType.TCP.type -> {
+                    "tcp" -> {
                         val tcpSetting = streamSettings?.tcpSettings ?: return null
                         listOf(
                             tcpSetting.header.type,
@@ -392,7 +518,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    NetworkType.KCP.type -> {
+                    "kcp" -> {
                         val kcpSetting = streamSettings?.kcpSettings ?: return null
                         listOf(
                             kcpSetting.header.type,
@@ -401,7 +527,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    NetworkType.WS.type -> {
+                    "ws" -> {
                         val wsSetting = streamSettings?.wsSettings ?: return null
                         listOf(
                             "",
@@ -410,7 +536,7 @@ data class V2rayConfig(
                         )
                     }
 
-                    NetworkType.HTTP_UPGRADE.type -> {
+                    "httpupgrade" -> {
                         val httpupgradeSetting = streamSettings?.httpupgradeSettings ?: return null
                         listOf(
                             "",
@@ -419,16 +545,16 @@ data class V2rayConfig(
                         )
                     }
 
-                    NetworkType.XHTTP.type -> {
+                    "splithttp" -> {
-                        val xhttpSettings = streamSettings?.xhttpSettings ?: return null
+                        val splithttpSetting = streamSettings?.splithttpSettings ?: return null
                         listOf(
                             "",
-                            xhttpSettings.host,
+                            splithttpSetting.host,
-                            xhttpSettings.path
+                            splithttpSetting.path
                         )
                     }
 
-                    NetworkType.H2.type -> {
+                    "h2" -> {
                         val h2Setting = streamSettings?.httpSettings ?: return null
                         listOf(
                             "",
@@ -437,16 +563,16 @@ data class V2rayConfig(
                         )
                     }
 
-//                    "quic" -> {
+                    "quic" -> {
-//                        val quicSetting = streamSettings?.quicSettings ?: return null
+                        val quicSetting = streamSettings?.quicSettings ?: return null
-//                        listOf(
+                        listOf(
-//                            quicSetting.header.type,
+                            quicSetting.header.type,
-//                            quicSetting.security,
+                            quicSetting.security,
-//                            quicSetting.key
+                            quicSetting.key
-//                        )
+                        )
-//                    }
+                    }
 
-                    NetworkType.GRPC.type -> {
+                    "grpc" -> {
                         val grpcSetting = streamSettings?.grpcSettings ?: return null
                         listOf(
                             if (grpcSetting.multiMode == true) "multi" else "gun",
@@ -460,18 +586,6 @@ data class V2rayConfig(
             }
             return null
         }
-
-        fun ensureSockopt(): V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean {
-            val stream = streamSettings ?: V2rayConfig.OutboundBean.StreamSettingsBean().also {
-                streamSettings = it
-            }
-
-            val sockopt = stream.sockopt ?: V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean().also {
-                stream.sockopt = it
-            }
-
-            return sockopt
-        }
     }
 
     data class DnsBean(
@@ -487,8 +601,7 @@ 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,
         )
     }
 
@@ -548,9 +661,15 @@ data class V2rayConfig(
         return null
     }
 
-    fun getAllProxyOutbound(): List<OutboundBean> {
+    fun toPrettyPrinting(): String {
-        return outbounds.filter { outbound ->
+        return GsonBuilder()
-            EConfigType.entries.any { it.name.equals(outbound.protocol, ignoreCase = true) }
+            .setPrettyPrinting()
-        }
+            .disableHtmlEscaping()
+            .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start
+                object : TypeToken<Double>() {}.type,
+                JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) }
+            )
+            .create()
+            .toJson(this)
     }
 }

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

@@ -0,0 +1,96 @@
+package com.v2ray.ang.extension
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Build
+import android.os.Bundle
+import android.widget.Toast
+import com.v2ray.ang.AngApplication
+import me.drakeet.support.toast.ToastCompat
+import org.json.JSONObject
+import java.io.Serializable
+import java.net.URI
+import java.net.URLConnection
+
+val Context.v2RayApplication: AngApplication?
+    get() = applicationContext as? AngApplication
+
+fun Context.toast(message: Int) {
+    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
+}
+
+fun Context.toast(message: CharSequence) {
+    ToastCompat.makeText(this, message, Toast.LENGTH_SHORT).show()
+}
+
+fun JSONObject.putOpt(pair: Pair<String, Any?>) {
+    put(pair.first, pair.second)
+}
+
+fun JSONObject.putOpt(pairs: Map<String, Any?>) {
+    pairs.forEach { put(it.key, it.value) }
+}
+
+const val THRESHOLD = 1000L
+const val DIVISOR = 1024.0
+
+fun Long.toSpeedString(): String = this.toTrafficString() + "/s"
+
+fun Long.toTrafficString(): String {
+    val units = arrayOf("B", "KB", "MB", "GB", "TB", "PB")
+    var size = this.toDouble()
+    var unitIndex = 0
+    while (size >= THRESHOLD && unitIndex < units.size - 1) {
+        size /= DIVISOR
+        unitIndex++
+    }
+    return String.format("%.1f %s", size, units[unitIndex])
+}
+
+val URLConnection.responseLength: Long
+    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        contentLengthLong
+    } else {
+        contentLength.toLong()
+    }
+
+val URI.idnHost: String
+    get() = host?.replace("[", "")?.replace("]", "").orEmpty()
+
+fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "")
+
+fun String.toLongEx(): Long = toLongOrNull() ?: 0
+
+fun Context.listenForPackageChanges(onetime: Boolean = true, callback: () -> Unit) =
+    object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            callback()
+            if (onetime) context.unregisterReceiver(this)
+        }
+    }.apply {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(this, IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addDataScheme("package")
+            }, Context.RECEIVER_EXPORTED)
+        } else {
+            registerReceiver(this, IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addDataScheme("package")
+            })
+        }
+    }
+
+inline fun <reified T : Serializable> Bundle.serializable(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as? T
+}
+
+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
+}

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

@@ -29,8 +29,7 @@ class PluginList : ArrayList<Plugin>() {
     init {
         addAll(
             AngApplication.application.packageManager.queryIntentContentProviders(
-                Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN), PackageManager.GET_META_DATA)
-            )
             .filter { it.providerInfo.exported }.map { NativePlugin(it) })
     }
 

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

@@ -32,10 +32,10 @@ import android.database.Cursor
 import android.net.Uri
 import android.os.Build
 import android.system.Os
+import android.widget.Toast
 import androidx.core.os.bundleOf
 import com.v2ray.ang.AngApplication
 import com.v2ray.ang.extension.listenForPackageChanges
-import com.v2ray.ang.extension.toast
 import com.v2ray.ang.plugin.PluginContract.METADATA_KEY_ID
 import java.io.File
 import java.io.FileNotFoundException
@@ -43,7 +43,6 @@ 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) {
@@ -89,25 +88,21 @@ 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
+            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
+            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
+            Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(pluginId, "fr.husi")), flags)
-            )
             .filter { it.providerInfo.exported }
         }
         if (providers.isEmpty()) {
@@ -126,7 +121,7 @@ object PluginManager {
         if (providers.size > 1) {
             val message =
                 "Conflicting plugins found from: ${providers.joinToString { it.providerInfo.packageName }}"
-            AngApplication.application.toast(message)
+            Toast.makeText(AngApplication.application, message, Toast.LENGTH_LONG).show()
             throw IllegalStateException(message)
         }
         val provider = providers.single().providerInfo
@@ -143,11 +138,9 @@ object PluginManager {
             authority(provider.authority)
         }.build()
         try {
-            return initNativeFast(
+            return initNativeFast(AngApplication.application.contentResolver,
-                AngApplication.application.contentResolver,
                 pluginId,
-                uri
+                uri)?.let { InitResult(it) }
-            )?.let { InitResult(it) }
         } catch (t: Throwable) {
           //  Logs.w("Initializing native plugin fast mode failed")
             failure?.also { t.addSuppressed(it) }
@@ -155,11 +148,9 @@ object PluginManager {
         }
 
         try {
-            return initNativeSlow(
+            return initNativeSlow(AngApplication.application.contentResolver,
-                AngApplication.application.contentResolver,
                 pluginId,
-                uri
+                uri)?.let { InitResult(it) }
-            )?.let { InitResult(it) }
         } catch (t: Throwable) {
             failure?.also { t.addSuppressed(it) }
             throw t
@@ -189,13 +180,11 @@ object PluginManager {
             throw IndexOutOfBoundsException("Plugin entry binary not found")
 
         val pluginDir = File(AngApplication.application.noBackupFilesDir, "plugin")
-        (cr.query(
+        (cr.query(uri,
-            uri,
             arrayOf(PluginContract.COLUMN_PATH, PluginContract.COLUMN_MODE),
             null,
             null,
-            null
+            null)
-        )
             ?: return null).use { cursor ->
             if (!cursor.moveToFirst()) entryNotFound()
             pluginDir.deleteRecursively()
@@ -208,13 +197,11 @@ object PluginManager {
                 cr.openInputStream(uri.buildUpon().path(path).build())!!.use { inStream ->
                     file.outputStream().use { outStream -> inStream.copyTo(outStream) }
                 }
-                Os.chmod(
+                Os.chmod(file.absolutePath, when (cursor.getType(1)) {
-                    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())
         }
@@ -222,11 +209,10 @@ object PluginManager {
         return File(pluginDir, pluginId).absolutePath
     }
 
-    fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(key)) {
+    fun ComponentInfo.loadString(key: String) = when (val value = metaData.get(key)) {
         is String -> value
-//        is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo)
+        is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo)
-//            .getString(value)
+            .getString(value)
-
         null -> null
         else -> error("meta-data $key has invalid type ${value.javaClass}")
     }

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

@@ -22,7 +22,6 @@
 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
@@ -34,18 +33,13 @@ abstract class ResolvedPlugin(protected val resolveInfo: ResolveInfo) : Plugin()
 
     override val id by lazy { componentInfo.loadString(PluginContract.METADATA_KEY_ID)!! }
     override val version by lazy {
-        getPackageInfo(componentInfo.packageName).versionCode
+        AngApplication.application.getPackageInfo(componentInfo.packageName).versionCode
     }
     override val versionName: String by lazy {
-        getPackageInfo(componentInfo.packageName).versionName!!
+        AngApplication.application.getPackageInfo(componentInfo.packageName).versionName!!
     }
     override val label: CharSequence get() = resolveInfo.loadLabel(AngApplication.application.packageManager)
     override val icon: Drawable get() = resolveInfo.loadIcon(AngApplication.application.packageManager)
     override val packageName: String get() = componentInfo.packageName
     override val directBootAware get() = Build.VERSION.SDK_INT < 24 || componentInfo.directBootAware
-
-    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/kotlin/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.service.V2RayServiceManager
+import com.v2ray.ang.util.MmkvManager
+
+class BootReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if (Intent.ACTION_BOOT_COMPLETED == intent?.action && MmkvManager.decodeStartOnBoot()) {
+            if (MmkvManager.getSelectServer().isNullOrEmpty()) {
+                return
+            }
+            V2RayServiceManager.startV2Ray(context!!)
+        }
+    }
+}

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.v2ray.ang.service
 
+import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -8,80 +9,58 @@ import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import android.util.Log
-import androidx.annotation.RequiresApi
-import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.Utils
 import java.lang.ref.SoftReference
 
-@RequiresApi(Build.VERSION_CODES.N)
+@TargetApi(Build.VERSION_CODES.N)
 class QSTileService : TileService() {
 
-    /**
-     * Sets the state of the tile.
-     * @param state The state to set.
-     */
     fun setState(state: Int) {
-        qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         if (state == Tile.STATE_INACTIVE) {
             qsTile?.state = Tile.STATE_INACTIVE
             qsTile?.label = getString(R.string.app_name)
+            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         } else if (state == Tile.STATE_ACTIVE) {
             qsTile?.state = Tile.STATE_ACTIVE
-            qsTile?.label = V2RayServiceManager.getRunningServerName()
+            qsTile?.label = V2RayServiceManager.currentConfig?.remarks
+            qsTile?.icon = Icon.createWithResource(applicationContext, R.drawable.ic_stat_name)
         }
 
         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()
-
-        if (V2RayServiceManager.isRunning()) {
-            setState(Tile.STATE_ACTIVE)
-        } else {
         setState(Tile.STATE_INACTIVE)
-        }
         mMsgReceive = ReceiveMessageHandler(this)
-        val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        ContextCompat.registerReceiver(applicationContext, mMsgReceive, mFilter, Utils.receiverFlags())
+            registerReceiver(mMsgReceive, IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY), Context.RECEIVER_EXPORTED)
+        } else {
+            registerReceiver(mMsgReceive, IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY))
+        }
+
         MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")
     }
 
-    /**
-     * Called when the tile stops listening.
-     */
     override fun onStopListening() {
         super.onStopListening()
 
-        try {
+        unregisterReceiver(mMsgReceive)
-            applicationContext.unregisterReceiver(mMsgReceive)
         mMsgReceive = null
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to unregister receiver", e)
     }
 
-    }
-
-    /**
-     * Called when the tile is clicked.
-     */
     override fun onClick() {
         super.onClick()
         when (qsTile.state) {
             Tile.STATE_INACTIVE -> {
-                V2RayServiceManager.startVServiceFromToggle(this)
+                Utils.startVServiceFromToggle(this)
             }
 
             Tile.STATE_ACTIVE -> {
-                V2RayServiceManager.stopVService(this)
+                Utils.stopVService(this)
             }
         }
     }

V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/ServiceControl.kt

@@ -0,0 +1,13 @@
+package com.v2ray.ang.service
+
+import android.app.Service
+
+interface ServiceControl {
+    fun getService(): Service
+
+    fun startService()
+
+    fun stopService()
+
+    fun vpnProtect(socket: Int): Boolean
+}

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

@@ -14,11 +14,14 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL
 import com.v2ray.ang.AppConfig.SUBSCRIPTION_UPDATE_CHANNEL_NAME
 import com.v2ray.ang.R
-import com.v2ray.ang.handler.AngConfigManager.updateConfigViaSub
+import com.v2ray.ang.util.AngConfigManager
-import com.v2ray.ang.handler.MmkvManager
+import com.v2ray.ang.util.AngConfigManager.updateConfigViaSub
+import com.v2ray.ang.util.MmkvManager
+import com.v2ray.ang.util.Utils
 
 object SubscriptionUpdater {
 
+
     class UpdateTask(context: Context, params: WorkerParameters) :
         CoroutineWorker(context, params) {
 
@@ -32,13 +35,9 @@ object SubscriptionUpdater {
                 .setCategory(NotificationCompat.CATEGORY_SERVICE)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
-        /**
-         * Performs the subscription update work.
-         * @return The result of the work.
-         */
         @SuppressLint("MissingPermission")
         override suspend fun doWork(): Result {
-            Log.i(AppConfig.TAG, "subscription automatic update starting")
+            Log.d(AppConfig.ANG_PACKAGE, "subscription automatic update starting")
 
             val subs = MmkvManager.decodeSubscriptions().filter { it.second.autoUpdate }
 
@@ -56,7 +55,10 @@ object SubscriptionUpdater {
                     notificationManager.createNotificationChannel(channel)
                 }
                 notificationManager.notify(3, notification.build())
-                Log.i(AppConfig.TAG, "subscription automatic update: ---${subItem.remarks}")
+                Log.d(
+                    AppConfig.ANG_PACKAGE,
+                    "subscription automatic update: ---${subItem.remarks}"
+                )
                 updateConfigViaSub(Pair(sub.first, subItem))
                 notification.setContentText("Updating ${subItem.remarks}")
             }

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

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

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

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