.github/workflows/build.yml

@@ -16,105 +16,117 @@ 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
+    - name: Prepare build dir
-      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 \
+        mkdir ${{ github.workspace }}/build
-          --channel=3 \
+
-          --install "ndk;29.0.13113456"
+    - name: Fetch AndroidLibV2rayLite
-        echo "NDK_HOME=$ANDROID_HOME/ndk/29.0.13113456" >> $GITHUB_ENV
+      run: |
-        sed -i '10i\
+        cd ${{ github.workspace }}/build
-        \
+        git clone --depth=1 -b master https://github.com/2dust/AndroidLibV2rayLite.git
-            ndkVersion = "29.0.13113456"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts
+        cd AndroidLibV2rayLite
+        git submodule update --init
 
     - name: Restore cached libtun2socks
       id: cache-libtun2socks-restore
       uses: actions/cache/restore@v4
       with:
-        path: ${{ github.workspace }}/libs
+        path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }}
+
+    - name: Setup Android NDK
+      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
+      uses: nttld/setup-ndk@v1
+      id: setup-ndk
+      # Same version as https://gitlab.com/fdroid/fdroiddata/metadata/com.v2ray.ang.yml
+      with:
+        ndk-version: r27
 
     - name: Build libtun2socks
       if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
       run: |
+        cd ${{ github.workspace }}/build/AndroidLibV2rayLite
         bash compile-tun2socks.sh
+        tar -xvzf libtun2socks.so.tgz
+        cp -r libs/* ${{ github.workspace }}/V2rayNG/app/libs/
+      env:
+        NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
 
     - name: Save libtun2socks
       if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
-        path: ${{ github.workspace }}/libs
+        path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }}
 
     - name: Copy libtun2socks
       run: |
-        cp -r ${{ github.workspace }}/libs ${{ github.workspace }}/V2rayNG/app
+        cp -r ${{ github.workspace }}/build/AndroidLibV2rayLite/libs/* ${{ github.workspace }}/V2rayNG/app/libs/
 
-    - name: Fetch AndroidLibXrayLite tag
+    - name: Fetch AndroidLibXrayLite
       run: |
-        pushd AndroidLibXrayLite
+        cd ${{ github.workspace }}/build
-        CURRENT_TAG=$(git describe --tags --abbrev=0)
+        git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git
-        echo "Current tag in this repo: $CURRENT_TAG"
-        echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_ENV
-        popd
 
-    - name: Download libv2ray
+    - name: Restore cached libv2ray
-      uses: robinraju/release-downloader@v1.12
+      id: cache-libv2ray-restore
-      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
+        path: ${{ github.workspace }}/build/AndroidLibXrayLite/
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
+        key: libv2ray-${{ runner.os }}-${{ hashFiles('build/AndroidLibXrayLite/.git/refs/heads/main') }}
 
     - name: Setup Golang
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
-      uses: actions/setup-go@v5.4.0
+      uses: actions/setup-go@v5
       with:
-        go-version-file: 'AndroidLibXrayLite/go.mod'
+        go-version: '1.23.4'
         cache: false
 
-    - name: Build libhysteria2
+    - name: Patch Go use 600296
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
+      #https://go-review.googlesource.com/c/go/+/600296
       run: |
-        bash libhysteria2.sh
+        cd "$(go env GOROOT)"
+        curl "https://go-review.googlesource.com/changes/go~600296/revisions/5/patch" | base64 -d | patch --verbose -p 1
 
-    - name: Save libhysteria2
+    - name: Install gomobile
-      if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true'
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
+      run: |
+        go install golang.org/x/mobile/cmd/gomobile@v0.0.0-20240806205939-81131f6468ab
+        echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+
+    - name: Build libv2ray
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
+      run: |
+        cd ${{ github.workspace }}/build/AndroidLibXrayLite
+        gomobile init
+        go mod tidy -v
+        gomobile bind -v -androidapi 21 -ldflags='-s -w' ./
+
+    - name: Save libv2ray
+      if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
-        path: ${{ github.workspace }}/hysteria/libs
+        path: ${{ github.workspace }}/build/AndroidLibXrayLite/
-        key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }}
+        key: libv2ray-${{ runner.os }}-${{ hashFiles('build/AndroidLibXrayLite/.git/refs/heads/main') }}
 
-    - name: Copy libhysteria2
+    - name: Copy libv2ray
       run: |
-        cp -r ${{ github.workspace }}/hysteria/libs ${{ github.workspace }}/V2rayNG/app
+        cp -r ${{ github.workspace }}/build/AndroidLibXrayLite/*.aar ${{ github.workspace }}/V2rayNG/app/libs/
 
     - name: Setup Java
-      uses: actions/setup-java@v4.7.0
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '21'
 
+    - name: Setup Android environment
+      uses: android-actions/setup-android@v3
+
     - name: Decode Keystore
-      uses: timheuer/base64-to-file@v1.2.4
+      uses: timheuer/base64-to-file@v1
       id: android_keystore
       with:
         fileName: "android_keystore.jks"
@@ -123,37 +135,35 @@ jobs:
     - name: Build APK
       run: |
         cd ${{ github.workspace }}/V2rayNG
-        echo "sdk.dir=${ANDROID_HOME}" > local.properties
         chmod 755 gradlew
         ./gradlew licenseFdroidReleaseReport
         ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }} -Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}
-    
+
     - name: Upload arm64-v8a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v4
       if: ${{  success() }}
       with:
         name: arm64-v8a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*arm64-v8a*.apk
 
     - name: Upload armeabi-v7a APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v4
       if: ${{  success() }}
       with:
         name: armeabi-v7a
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*armeabi-v7a*.apk
 
     - name: Upload x86 APK
-      uses: actions/upload-artifact@v4.6.2
+      uses: actions/upload-artifact@v4
       if: ${{  success() }}
       with:
         name: x86-apk
         path: ${{ github.workspace }}/V2rayNG/app/build/outputs/apk/*/release/*x86*.apk
 
-    - name: Upload to release
+    - name: Upload AndroidLibXrayLite 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
+        file_glob: true
-        prerelease: true

.github/workflows/fastlane.yml

@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Validate Fastlane Supply Metadata
-        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.1.0
+        uses: ashutoshgngwr/validate-fastlane-supply-metadata@v2.0.0

.gitignore

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

@@ -12,8 +12,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 21
         targetSdk = 35
-        versionCode = 658
+        versionCode = 623
-        versionName = "1.10.8"
+        versionName = "1.9.27"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
@@ -82,9 +82,8 @@ android {
         val isFdroid = variant.productFlavors.any { it.name == "fdroid" }
         if (isFdroid) {
             val versionCodes =
-                mapOf(
+                mapOf("armeabi-v7a" to 2, "arm64-v8a" to 1, "x86" to 4, "x86_64" to 3, "universal" to 0
-                    "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 }
@@ -145,11 +144,10 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.preference.ktx)
     implementation(libs.recyclerview)
-    implementation(libs.androidx.swiperefreshlayout)
 
     // UI Libraries
     implementation(libs.material)
-    implementation(libs.toasty)
+    implementation(libs.toastcompat)
     implementation(libs.editorkit)
     implementation(libs.flexbox)
 
@@ -158,8 +156,9 @@ dependencies {
     implementation(libs.gson)
 
     // Reactive and Utility Libraries
-    implementation(libs.kotlinx.coroutines.android)
+    implementation(libs.rxjava)
-    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.rxandroid)
+    implementation(libs.rxpermissions)
 
     // Language and Processing Libraries
     implementation(libs.language.base)

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>

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",

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",
@@ -92,5 +99,10 @@
     "domain": [
       "geosite:cn"
     ]
+  },
+  {
+    "remarks": "最终代理",
+    "port": "0-65535",
+    "outboundTag": "proxy"
   }
 ]

V2rayNG/app/src/main/assets/custom_routing_white_iran

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

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,22 +1,22 @@
 package com.v2ray.ang
 
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import androidx.multidex.MultiDexApplication
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.handler.SettingsManager
+import com.v2ray.ang.util.Utils
 
 class AngApplication : MultiDexApplication() {
     companion object {
+        //const val PREF_LAST_VERSION = "pref_last_version"
         lateinit var application: AngApplication
     }
 
-    /**
-     * Attaches the base context to the application.
-     * @param base The base context.
-     */
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         application = this
@@ -26,22 +26,23 @@ class AngApplication : MultiDexApplication() {
         .setDefaultProcessName("${ANG_PACKAGE}:bg")
         .build()
 
-    /**
-     * Initializes the application.
-     */
     override fun onCreate() {
         super.onCreate()
 
+//        LeakCanary.install(this)
+
+//        val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
+//        firstRun = defaultSharedPreferences.getInt(PREF_LAST_VERSION, 0) != BuildConfig.VERSION_CODE
+//        if (firstRun)
+//            defaultSharedPreferences.edit().putInt(PREF_LAST_VERSION, BuildConfig.VERSION_CODE).apply()
+
         MMKV.initialize(this)
 
-        SettingsManager.setNightMode()
+        Utils.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/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"
@@ -25,8 +25,6 @@ object AppConfig {
     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,7 +42,6 @@ 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"
@@ -56,18 +53,15 @@ object AppConfig {
     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_FREEDOM: String = "freedom"
 
     /** Broadcast actions. */
     const val BROADCAST_ACTION_SERVICE = "com.v2ray.ang.action.service"
@@ -92,20 +86,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"
@@ -170,13 +163,19 @@ object AppConfig {
     // Android Private DNS constants
     const val DNS_DNSPOD_DOMAIN = "dot.pub"
     const val DNS_ALIDNS_DOMAIN = "dns.alidns.com"
-    const val DNS_CLOUDFLARE_ONE_DOMAIN = "one.one.one.one"
+    const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one"
-    const val DNS_CLOUDFLARE_DNS_COM_DOMAIN = "dns.cloudflare.com"
-    const val DNS_CLOUDFLARE_DNS_DOMAIN = "cloudflare-dns.com"
     const val DNS_GOOGLE_DOMAIN = "dns.google"
     const val DNS_QUAD9_DOMAIN = "dns.quad9.net"
     const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net"
 
+    
+    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
+    val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
+    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
+    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
+    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
+    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
+
     const val DEFAULT_PORT = 443
     const val DEFAULT_SECURITY = "auto"
     const val DEFAULT_LEVEL = 8
@@ -185,64 +184,4 @@ object AppConfig {
     const val REALITY = "reality"
     const val HEADER_TYPE_HTTP = "http"
 
-    val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1")
-    val DNS_CLOUDFLARE_ONE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001")
-    val DNS_CLOUDFLARE_DNS_COM_ADDRESSES = arrayListOf("104.16.132.229", "104.16.133.229", "2606:4700::6810:84e5", "2606:4700::6810:85e5")
-    val DNS_CLOUDFLARE_DNS_ADDRESSES = arrayListOf("104.16.248.249", "104.16.249.249", "2606:4700::6810:f8f9", "2606:4700::6810:f9f9")
-    val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53")
-    val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844")
-    val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9")
-    val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff")
-
-    //minimum list https://serverfault.com/a/304791
-    val ROUTED_IP_LIST = arrayListOf(
-        "0.0.0.0/5",
-        "8.0.0.0/7",
-        "11.0.0.0/8",
-        "12.0.0.0/6",
-        "16.0.0.0/4",
-        "32.0.0.0/3",
-        "64.0.0.0/2",
-        "128.0.0.0/3",
-        "160.0.0.0/5",
-        "168.0.0.0/6",
-        "172.0.0.0/12",
-        "172.32.0.0/11",
-        "172.64.0.0/10",
-        "172.128.0.0/9",
-        "173.0.0.0/8",
-        "174.0.0.0/7",
-        "176.0.0.0/4",
-        "192.0.0.0/9",
-        "192.128.0.0/11",
-        "192.160.0.0/13",
-        "192.169.0.0/16",
-        "192.170.0.0/15",
-        "192.172.0.0/14",
-        "192.176.0.0/12",
-        "192.192.0.0/10",
-        "193.0.0.0/8",
-        "194.0.0.0/7",
-        "196.0.0.0/6",
-        "200.0.0.0/5",
-        "208.0.0.0/4",
-        "240.0.0.0/4"
-    )
-
-    val PRIVATE_IP_LIST = arrayListOf(
-        "0.0.0.0/8",
-        "10.0.0.0/8",
-        "127.0.0.0/8",
-        "172.16.0.0/12",
-        "192.168.0.0/16",
-        "169.254.0.0/16",
-        "224.0.0.0/4"
-    )
-
-    val GEO_FILES_SOURCES = arrayListOf(
-        "Loyalsoldier/v2ray-rules-dat",
-        "runetfreedom/russia-v2ray-rules-dat",
-        "Chocolate4U/Iran-v2ray-rules"
-    )
-
 }

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

@@ -4,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/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/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/java/com/v2ray/ang/dto/EConfigType.kt

@@ -11,8 +11,7 @@ enum class EConfigType(val value: Int, val protocolScheme: String) {
     VLESS(5, AppConfig.VLESS),
     TROJAN(6, AppConfig.TROJAN),
     WIREGUARD(7, AppConfig.WIREGUARD),
-
+//    TUIC(8, AppConfig.TUIC),
-    //    TUIC(8, AppConfig.TUIC),
     HYSTERIA2(9, AppConfig.HYSTERIA2),
     HTTP(10, AppConfig.HTTP);
 

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

@@ -9,7 +9,6 @@ data class Hysteria2Bean(
     val http: Socks5Bean? = null,
     val tls: TlsBean? = null,
     val transport: TransportBean? = null,
-    val bandwidth: BandwidthBean? = null,
 ) {
     data class ObfsBean(
         val type: String?,
@@ -38,9 +37,4 @@ data class Hysteria2Bean(
             val hopInterval: String?,
         )
     }
-
+}
-    data class BandwidthBean(
-        val down: String?,
-        val up: 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

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

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

@@ -8,7 +8,6 @@ enum class NetworkType(val type: String) {
     XHTTP("xhttp"),
     HTTP("http"),
     H2("h2"),
-
     //QUIC("quic"),
     GRPC("grpc");
 

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

@@ -1,7 +1,5 @@
 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
@@ -55,8 +53,6 @@ data class ProfileItem(
     var portHopping: String? = null,
     var portHoppingInterval: String? = null,
     var pinSHA256: String? = null,
-    var bandwidthDown: String? = null,
-    var bandwidthUp: String? = null,
 
     ) {
     companion object {
@@ -70,9 +66,6 @@ data class ProfileItem(
     }
 
     fun getServerAddressAndPort(): String {
-        if (server.isNullOrEmpty() && configType == EConfigType.CUSTOM) {
-            return "$LOOPBACK:$PORT_SOCKS"
-        }
         return Utils.getIpv6Address(server) + ":" + serverPort
     }
 

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

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

V2rayNG/app/src/main/java/com/v2ray/ang/dto/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/java/com/v2ray/ang/dto/V2rayConfig.kt

@@ -1,17 +1,26 @@
 package com.v2ray.ang.dto
 
+import android.text.TextUtils
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonPrimitive
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
 import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.*
+import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean.VnextBean.*
 import com.v2ray.ang.util.Utils
+import java.lang.reflect.Type
 
 data class V2rayConfig(
     var remarks: String? = null,
     var stats: Any? = null,
     val log: LogBean,
-    var policy: PolicyBean? = 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,
@@ -23,9 +32,9 @@ data class V2rayConfig(
 ) {
 
     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 +44,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 +75,50 @@ data class V2rayConfig(
         val sendThrough: String? = null,
         var mux: MuxBean? = MuxBean(false)
     ) {
+        companion object {
+            fun create(configType: EConfigType): OutboundBean? {
+                return when (configType) {
+                    EConfigType.VMESS,
+                    EConfigType.VLESS ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                vnext = listOf(
+                                    VnextBean(
+                                        users = listOf(UsersBean())
+                                    )
+                                )
+                            ),
+                            streamSettings = StreamSettingsBean()
+                        )
+
+                    EConfigType.SHADOWSOCKS,
+                    EConfigType.SOCKS,
+                    EConfigType.HTTP,
+                    EConfigType.TROJAN,
+                    EConfigType.HYSTERIA2 ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                servers = listOf(ServersBean())
+                            ),
+                            streamSettings = StreamSettingsBean()
+                        )
+
+                    EConfigType.WIREGUARD ->
+                        return OutboundBean(
+                            protocol = configType.name.lowercase(),
+                            settings = OutSettingsBean(
+                                secretKey = "",
+                                peers = listOf(WireGuardBean())
+                            )
+                        )
+
+                    EConfigType.CUSTOM -> null
+                }
+            }
+        }
+
         data class OutSettingsBean(
             var vnext: List<VnextBean>? = null,
             var fragment: FragmentBean? = null,
@@ -142,7 +195,7 @@ data class V2rayConfig(
 
             data class WireGuardBean(
                 var publicKey: String = "",
-                var preSharedKey: String? = null,
+                var preSharedKey: String = "",
                 var endpoint: String = ""
             )
         }
@@ -204,10 +257,7 @@ 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(
@@ -244,8 +294,7 @@ 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(
@@ -295,13 +344,141 @@ 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: String? = null
+                network = if (transport.isEmpty()) NetworkType.TCP.type else transport
+                when (network) {
+                    NetworkType.TCP.type -> {
+                        val tcpSetting = TcpSettingsBean()
+                        if (headerType == AppConfig.HEADER_TYPE_HTTP) {
+                            tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP
+                            if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) {
+                                val requestObj = TcpSettingsBean.HeaderBean.RequestBean()
+                                requestObj.headers.Host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                requestObj.path = path.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                                tcpSetting.header.request = requestObj
+                                sni = requestObj.headers.Host?.getOrNull(0)
+                            }
+                        } else {
+                            tcpSetting.header.type = "none"
+                            sni = host
+                        }
+                        tcpSettings = tcpSetting
+                    }
+
+                    NetworkType.KCP.type -> {
+                        val kcpsetting = KcpSettingsBean()
+                        kcpsetting.header.type = headerType ?: "none"
+                        if (seed.isNullOrEmpty()) {
+                            kcpsetting.seed = null
+                        } else {
+                            kcpsetting.seed = seed
+                        }
+                        kcpSettings = kcpsetting
+                    }
+
+                    NetworkType.WS.type -> {
+                        val wssetting = WsSettingsBean()
+                        wssetting.headers.Host = host.orEmpty()
+                        sni = host
+                        wssetting.path = path ?: "/"
+                        wsSettings = wssetting
+                    }
+
+                    NetworkType.HTTP_UPGRADE.type -> {
+                        val httpupgradeSetting = HttpupgradeSettingsBean()
+                        httpupgradeSetting.host = host.orEmpty()
+                        sni = host
+                        httpupgradeSetting.path = path ?: "/"
+                        httpupgradeSettings = httpupgradeSetting
+                    }
+
+                    NetworkType.XHTTP.type -> {
+                        val xhttpSetting = XhttpSettingsBean()
+                        xhttpSetting.host = host.orEmpty()
+                        sni = host
+                        xhttpSetting.path = path ?: "/"
+                        xhttpSettings = xhttpSetting
+                    }
+
+                    NetworkType.H2.type, NetworkType.HTTP.type -> {
+                        network = NetworkType.H2.type
+                        val h2Setting = HttpSettingsBean()
+                        h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() }
+                        sni = h2Setting.host.getOrNull(0)
+                        h2Setting.path = path ?: "/"
+                        httpSettings = h2Setting
+                    }
+
+//                    "quic" -> {
+//                        val quicsetting = QuicSettingBean()
+//                        quicsetting.security = quicSecurity ?: "none"
+//                        quicsetting.key = key.orEmpty()
+//                        quicsetting.header.type = headerType ?: "none"
+//                        quicSettings = quicsetting
+//                    }
+
+                    NetworkType.GRPC.type -> {
+                        val grpcSetting = GrpcSettingsBean()
+                        grpcSetting.multiMode = mode == "multi"
+                        grpcSetting.serviceName = serviceName.orEmpty()
+                        grpcSetting.authority = authority.orEmpty()
+                        grpcSetting.idle_timeout = 60
+                        grpcSetting.health_check_timeout = 20
+                        sni = authority
+                        grpcSettings = grpcSetting
+                    }
+                }
+                return sni
+            }
+
+            fun populateTlsSettings(
+                streamSecurity: String,
+                allowInsecure: Boolean,
+                sni: String?,
+                fingerprint: String?,
+                alpns: String?,
+                publicKey: String?,
+                shortId: String?,
+                spiderX: String?
+            ) {
+                security = if (streamSecurity.isEmpty()) null else streamSecurity
+                if (security == null) return
+                val tlsSetting = TlsSettingsBean(
+                    allowInsecure = allowInsecure,
+                    serverName = if (sni.isNullOrEmpty()) null else sni,
+                    fingerprint = if (fingerprint.isNullOrEmpty()) null else fingerprint,
+                    alpn = if (alpns.isNullOrEmpty()) null else alpns.split(",").map { it.trim() }.filter { it.isNotEmpty() },
+                    publicKey = if (publicKey.isNullOrEmpty()) null else publicKey,
+                    shortId = if (shortId.isNullOrEmpty()) null else shortId,
+                    spiderX = if (spiderX.isNullOrEmpty()) null else spiderX,
+                )
+                if (security == AppConfig.TLS) {
+                    tlsSettings = tlsSetting
+                    realitySettings = null
+                } else if (security == AppConfig.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? {
@@ -460,18 +637,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(
@@ -548,9 +713,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/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

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

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

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

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

@@ -4,55 +4,32 @@ import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import java.net.URI
 
 open class FmtBase {
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @param userInfo the user information to include in the URI
-     * @param dicQuery the query parameters to include in the URI
-     * @return the converted URI string
-     */
     fun toUri(config: ProfileItem, userInfo: String?, dicQuery: HashMap<String, String>?): String {
         val query = if (dicQuery != null)
-            "?" + dicQuery.toList().joinToString(
+            ("?" + dicQuery.toList().joinToString(
                 separator = "&",
-                transform = { it.first + "=" + Utils.urlEncode(it.second) })
+                transform = { it.first + "=" + Utils.urlEncode(it.second) }))
         else ""
 
         val url = String.format(
             "%s@%s:%s",
             Utils.urlEncode(userInfo ?: ""),
-            Utils.getIpv6Address(HttpUtil.toIdnDomain(config.server.orEmpty())),
+            Utils.getIpv6Address(config.server),
             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"]
@@ -86,12 +63,6 @@ open class FmtBase {
         config.flow = queryParam["flow"]
     }
 
-    /**
-     * Creates a map of query parameters from a ProfileItem object.
-     *
-     * @param config the ProfileItem object to create query parameters from
-     * @return a map of query parameters
-     */
     fun getQueryDic(config: ProfileItem): HashMap<String, String> {
         val dicQuery = HashMap<String, String>()
         dicQuery["security"] = config.security?.ifEmpty { "none" }.orEmpty()
@@ -122,7 +93,7 @@ open class FmtBase {
                 config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
             }
 
-            NetworkType.XHTTP -> {
+             NetworkType.XHTTP -> {
                 config.host.let { if (it.isNotNullEmpty()) dicQuery["host"] = it.orEmpty() }
                 config.path.let { if (it.isNotNullEmpty()) dicQuery["path"] = it.orEmpty() }
                 config.xhttpMode.let { if (it.isNotNullEmpty()) dicQuery["mode"] = it.orEmpty() }
@@ -151,20 +122,4 @@ open class FmtBase {
         return dicQuery
     }
 
-    fun getServerAddress(profileItem: ProfileItem): String {
+}
-        if (Utils.isPureIpAddress(profileItem.server.orEmpty())) {
-            return profileItem.server.orEmpty()
-        }
-
-        val domain = HttpUtil.toIdnDomain(profileItem.server.orEmpty())
-        if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") != "2") {
-            return domain
-        }
-        //Resolve and replace domain
-        val resolvedIps = HttpUtil.resolveHostToIP(domain, MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
-        if (resolvedIps.isNullOrEmpty()) {
-            return domain
-        }
-        return resolvedIps.first()
-    }
-}

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

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

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

@@ -9,23 +9,16 @@ 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.remarks = Utils.urlDecode(uri.fragment.orEmpty())
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
@@ -52,12 +45,6 @@ object Hysteria2Fmt : FmtBase() {
         return config
     }
 
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = HashMap<String, String>()
 
@@ -80,13 +67,6 @@ object Hysteria2Fmt : FmtBase() {
         return toUri(config, config.password, dicQuery)
     }
 
-    /**
-     * Converts a ProfileItem object to a Hysteria2Bean object.
-     *
-     * @param config the ProfileItem object to convert
-     * @param socksPort the port number for the socks5 proxy
-     * @return the converted Hysteria2Bean object, or null if conversion fails
-     */
     fun toNativeConfig(config: ProfileItem, socksPort: Int): Hysteria2Bean? {
 
         val obfs = if (config.obfsPassword.isNullOrEmpty()) null else
@@ -105,12 +85,6 @@ object Hysteria2Fmt : FmtBase() {
                 )
             )
 
-        val bandwidth = if (config.bandwidthDown.isNullOrEmpty() || config.bandwidthUp.isNullOrEmpty()) null else
-            Hysteria2Bean.BandwidthBean(
-                down = config.bandwidthDown,
-                up = config.bandwidthUp,
-            )
-
         val server =
             if (config.portHopping.isNullOrEmpty())
                 config.getServerAddressAndPort()
@@ -122,7 +96,6 @@ object Hysteria2Fmt : FmtBase() {
             auth = config.password,
             obfs = obfs,
             transport = transport,
-            bandwidth = bandwidth,
             socks5 = Hysteria2Bean.Socks5Bean(
                 listen = "$LOOPBACK:${socksPort}",
             ),
@@ -138,14 +111,10 @@ object Hysteria2Fmt : FmtBase() {
         return bean
     }
 
-    /**
+
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.HYSTERIA2)
+        val outboundBean = OutboundBean.create(EConfigType.HYSTERIA2)
         return outboundBean
     }
+
 }

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

@@ -1,33 +1,18 @@
 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)
 
@@ -36,7 +21,7 @@ object ShadowsocksFmt : FmtBase() {
         if (uri.port <= 0) return null
         if (uri.userInfo.isNullOrEmpty()) return null
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
 
@@ -70,12 +55,6 @@ object ShadowsocksFmt : FmtBase() {
         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, "")
@@ -85,7 +64,7 @@ object ShadowsocksFmt : FmtBase() {
                 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)
+                e.printStackTrace()
             }
 
             result = result.substring(0, indexSplit)
@@ -113,42 +92,48 @@ object ShadowsocksFmt : FmtBase() {
         return config
     }
 
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
     fun toUri(config: ProfileItem): String {
         val pw = "${config.method}:${config.password}"
 
         return toUri(config, Utils.encode(pw), null)
     }
 
-    /**
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.SHADOWSOCKS)
+        val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
 
         outboundBean?.settings?.servers?.first()?.let { server ->
-            server.address = getServerAddress(profileItem)
+            server.address = profileItem.server.orEmpty()
             server.port = profileItem.serverPort.orEmpty().toInt()
             server.password = profileItem.password
             server.method = profileItem.method
         }
 
-        val sni = outboundBean?.streamSettings?.let {
+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
+            profileItem.network.orEmpty(),
-        }
+            profileItem.headerType,
+            profileItem.host,
+            profileItem.path,
+            profileItem.seed,
+            profileItem.quicSecurity,
+            profileItem.quicKey,
+            profileItem.mode,
+            profileItem.serviceName,
+            profileItem.authority,
+        )
 
-        outboundBean?.streamSettings?.let {
+        outboundBean?.streamSettings?.populateTlsSettings(
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+            profileItem.security.orEmpty(),
-        }
+            profileItem.insecure == true,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
+            profileItem.fingerPrint,
+            profileItem.alpn,
+            profileItem.publicKey,
+            profileItem.shortId,
+            profileItem.spiderX,
+        )
 
         return outboundBean
     }
+
+
 }

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

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

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

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

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

@@ -6,18 +6,12 @@ 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.JsonUtil
 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)
@@ -26,7 +20,7 @@ object VlessFmt : FmtBase() {
         if (uri.rawQuery.isNullOrEmpty()) return null
         val queryParam = getQueryParam(uri)
 
-        config.remarks = Utils.urlDecode(uri.fragment.orEmpty()).let { if (it.isEmpty()) "none" else it }
+        config.remarks = Utils.urlDecode(uri.fragment.orEmpty())
         config.server = uri.idnHost
         config.serverPort = uri.port.toString()
         config.password = uri.userInfo
@@ -37,12 +31,6 @@ object VlessFmt : FmtBase() {
         return config
     }
 
-    /**
-     * Converts a ProfileItem object to a URI string.
-     *
-     * @param config the ProfileItem object to convert
-     * @return the converted URI string
-     */
     fun toUri(config: ProfileItem): String {
         val dicQuery = getQueryDic(config)
         dicQuery["encryption"] = config.method ?: "none"
@@ -50,31 +38,46 @@ object VlessFmt : FmtBase() {
         return toUri(config, config.password, dicQuery)
     }
 
-    /**
+
-     * Converts a ProfileItem object to an OutboundBean object.
-     *
-     * @param profileItem the ProfileItem object to convert
-     * @return the converted OutboundBean object, or null if conversion fails
-     */
     fun toOutbound(profileItem: ProfileItem): OutboundBean? {
-        val outboundBean = V2rayConfigManager.createInitOutbound(EConfigType.VLESS)
+        val outboundBean = OutboundBean.create(EConfigType.VLESS)
 
         outboundBean?.settings?.vnext?.first()?.let { vnext ->
-            vnext.address = getServerAddress(profileItem)
+            vnext.address = profileItem.server.orEmpty()
             vnext.port = profileItem.serverPort.orEmpty().toInt()
             vnext.users[0].id = profileItem.password.orEmpty()
             vnext.users[0].encryption = profileItem.method
             vnext.users[0].flow = profileItem.flow
         }
 
-        val sni = outboundBean?.streamSettings?.let {
+        val sni = outboundBean?.streamSettings?.populateTransportSettings(
-            V2rayConfigManager.populateTransportSettings(it, profileItem)
+            profileItem.network.orEmpty(),
-        }
+            profileItem.headerType,
+            profileItem.host,
+            profileItem.path,
+            profileItem.seed,
+            profileItem.quicSecurity,
+            profileItem.quicKey,
+            profileItem.mode,
+            profileItem.serviceName,
+            profileItem.authority,
+        )
+        outboundBean?.streamSettings?.xhttpSettings?.mode = profileItem.xhttpMode
+        outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra)
 
-        outboundBean?.streamSettings?.let {
+        outboundBean?.streamSettings?.populateTlsSettings(
-            V2rayConfigManager.populateTlsSettings(it, profileItem, sni)
+            profileItem.security.orEmpty(),
-        }
+            profileItem.insecure == true,
+            if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni,
+            profileItem.fingerPrint,
+            profileItem.alpn,
+            profileItem.publicKey,
+            profileItem.shortId,
+            profileItem.spiderX,
+        )
 
         return outboundBean
     }
+
+
 }

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

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

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

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

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

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

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

@@ -3,29 +3,25 @@ package com.v2ray.ang.handler
 import android.util.Log
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.ServerConfig
-import com.v2ray.ang.extension.removeWhiteSpace
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.util.JsonUtil
+import com.v2ray.ang.util.Utils
 
 object MigrateManager {
     private const val ID_SERVER_CONFIG = "SERVER_CONFIG"
     private val serverStorage by lazy { MMKV.mmkvWithID(ID_SERVER_CONFIG, MMKV.MULTI_PROCESS_MODE) }
 
-    /**
-     * Migrates server configurations to profile items.
-     *
-     * @return True if migration was successful, false otherwise.
-     */
     fun migrateServerConfig2Profile(): Boolean {
         if (serverStorage.count().toInt() == 0) {
             return false
         }
         val serverList = serverStorage.allKeys() ?: return false
-        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + serverList.count())
+        Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + serverList.count())
 
         for (guid in serverList) {
             var configOld = decodeServerConfigOld(guid) ?: continue
@@ -42,18 +38,12 @@ object MigrateManager {
             //check and remove old
             decodeServerConfig(guid) ?: continue
             serverStorage.remove(guid)
-            Log.i(AppConfig.TAG, "migrateServerConfig2Profile-" + config.remarks)
+            Log.d(ANG_PACKAGE, "migrateServerConfig2Profile-" + config.remarks)
         }
-        Log.i(AppConfig.TAG, "migrateServerConfig2Profile-end")
+        Log.d(ANG_PACKAGE, "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)
@@ -72,12 +62,6 @@ object MigrateManager {
         }
     }
 
-    /**
-     * Migrates a common server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
     private fun migrate2ProfileCommon(configOld: ServerConfig): ProfileItem? {
         val config = ProfileItem.create(configOld.configType)
 
@@ -108,7 +92,7 @@ object MigrateManager {
         config.insecure = tlsSettings?.allowInsecure
         config.sni = tlsSettings?.serverName
         config.fingerPrint = tlsSettings?.fingerprint
-        config.alpn = tlsSettings?.alpn?.joinToString(",").removeWhiteSpace().toString()
+        config.alpn = Utils.removeWhiteSpace(tlsSettings?.alpn?.joinToString(",")).toString()
 
         config.publicKey = tlsSettings?.publicKey
         config.shortId = tlsSettings?.shortId
@@ -117,12 +101,6 @@ object MigrateManager {
         return config
     }
 
-    /**
-     * Migrates a SOCKS server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
     private fun migrate2ProfileSocks(configOld: ServerConfig): ProfileItem? {
         val config = ProfileItem.create(EConfigType.SOCKS)
 
@@ -136,12 +114,6 @@ object MigrateManager {
         return config
     }
 
-    /**
-     * Migrates an HTTP server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
     private fun migrate2ProfileHttp(configOld: ServerConfig): ProfileItem? {
         val config = ProfileItem.create(EConfigType.HTTP)
 
@@ -155,12 +127,6 @@ object MigrateManager {
         return config
     }
 
-    /**
-     * Migrates a WireGuard server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
     private fun migrate2ProfileWireguard(configOld: ServerConfig): ProfileItem? {
         val config = ProfileItem.create(EConfigType.WIREGUARD)
 
@@ -171,20 +137,14 @@ object MigrateManager {
 
         outbound.settings?.let { wireguard ->
             config.secretKey = wireguard.secretKey
-            config.localAddress = (wireguard.address as List<*>).joinToString(",").removeWhiteSpace().toString()
+            config.localAddress = Utils.removeWhiteSpace((wireguard.address as List<*>).joinToString(",")).toString()
             config.publicKey = wireguard.peers?.getOrNull(0)?.publicKey
             config.mtu = wireguard.mtu
-            config.reserved = wireguard.reserved?.joinToString(",").removeWhiteSpace().toString()
+            config.reserved = Utils.removeWhiteSpace(wireguard.reserved?.joinToString(",")).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)
 
@@ -198,7 +158,7 @@ object MigrateManager {
         outbound.streamSettings?.tlsSettings?.let { tlsSetting ->
             config.insecure = tlsSetting.allowInsecure
             config.sni = tlsSetting.serverName
-            config.alpn = tlsSetting.alpn?.joinToString(",").removeWhiteSpace().orEmpty()
+            config.alpn = Utils.removeWhiteSpace(tlsSetting.alpn?.joinToString(",")).orEmpty()
 
         }
         config.obfsPassword = outbound.settings?.obfsPassword
@@ -206,12 +166,6 @@ object MigrateManager {
         return config
     }
 
-    /**
-     * Migrates a custom server configuration to a profile item.
-     *
-     * @param configOld The old server configuration.
-     * @return The profile item.
-     */
     private fun migrate2ProfileCustom(configOld: ServerConfig): ProfileItem? {
         val config = ProfileItem.create(EConfigType.CUSTOM)
 
@@ -223,12 +177,7 @@ object MigrateManager {
         return config
     }
 
-    /**
+
-     * Decodes the old server configuration.
-     *
-     * @param guid The server GUID.
-     * @return The old server configuration.
-     */
     private fun decodeServerConfigOld(guid: String): ServerConfig? {
         if (guid.isBlank()) {
             return null

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

@@ -1,5 +1,6 @@
 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
@@ -40,38 +41,18 @@ object MmkvManager {
 
     //region Server
 
-    /**
-     * Gets the selected server GUID.
-     *
-     * @return The selected server GUID.
-     */
     fun getSelectServer(): String? {
         return mainStorage.decodeString(KEY_SELECTED_SERVER)
     }
 
-    /**
-     * Sets the selected server GUID.
-     *
-     * @param guid The server GUID.
-     */
     fun setSelectServer(guid: String) {
         mainStorage.encode(KEY_SELECTED_SERVER, guid)
     }
 
-    /**
-     * Encodes the server list.
-     *
-     * @param serverList The list of server GUIDs.
-     */
     fun encodeServerList(serverList: MutableList<String>) {
         mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
     }
 
-    /**
-     * Decodes the server list.
-     *
-     * @return The list of server GUIDs.
-     */
     fun decodeServerList(): MutableList<String> {
         val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
         return if (json.isNullOrBlank()) {
@@ -81,12 +62,7 @@ object MmkvManager {
         }
     }
 
-    /**
+
-     * Decodes the server configuration.
-     *
-     * @param guid The server GUID.
-     * @return The server configuration.
-     */
     fun decodeServerConfig(guid: String): ProfileItem? {
         if (guid.isBlank()) {
             return null
@@ -109,13 +85,6 @@ object MmkvManager {
 //        return JsonUtil.fromJson(json, ProfileLiteItem::class.java)
 //    }
 
-    /**
-     * Encodes the server configuration.
-     *
-     * @param guid The server GUID.
-     * @param config The server configuration.
-     * @return The server GUID.
-     */
     fun encodeServerConfig(guid: String, config: ProfileItem): String {
         val key = guid.ifBlank { Utils.getUuid() }
         profileFullStorage.encode(key, JsonUtil.toJson(config))
@@ -138,11 +107,6 @@ object MmkvManager {
         return key
     }
 
-    /**
-     * Removes the server configuration.
-     *
-     * @param guid The server GUID.
-     */
     fun removeServer(guid: String) {
         if (guid.isBlank()) {
             return
@@ -158,11 +122,6 @@ object MmkvManager {
         serverAffStorage.remove(guid)
     }
 
-    /**
-     * Removes the server configurations via subscription ID.
-     *
-     * @param subid The subscription ID.
-     */
     fun removeServerViaSubid(subid: String) {
         if (subid.isBlank()) {
             return
@@ -176,12 +135,6 @@ object MmkvManager {
         }
     }
 
-    /**
-     * Decodes the server affiliation information.
-     *
-     * @param guid The server GUID.
-     * @return The server affiliation information.
-     */
     fun decodeServerAffiliationInfo(guid: String): ServerAffiliationInfo? {
         if (guid.isBlank()) {
             return null
@@ -193,12 +146,6 @@ object MmkvManager {
         return JsonUtil.fromJson(json, ServerAffiliationInfo::class.java)
     }
 
-    /**
-     * Encodes the server test delay in milliseconds.
-     *
-     * @param guid The server GUID.
-     * @param testResult The test delay in milliseconds.
-     */
     fun encodeServerTestDelayMillis(guid: String, testResult: Long) {
         if (guid.isBlank()) {
             return
@@ -208,11 +155,6 @@ object MmkvManager {
         serverAffStorage.encode(guid, JsonUtil.toJson(aff))
     }
 
-    /**
-     * Clears all test delay results.
-     *
-     * @param keys The list of server GUIDs.
-     */
     fun clearAllTestDelayResults(keys: List<String>?) {
         keys?.forEach { key ->
             decodeServerAffiliationInfo(key)?.let { aff ->
@@ -222,11 +164,6 @@ object MmkvManager {
         }
     }
 
-    /**
-     * Removes all server configurations.
-     *
-     * @return The number of server configurations removed.
-     */
     fun removeAllServer(): Int {
         val count = profileFullStorage.allKeys()?.count() ?: 0
         mainStorage.clearAll()
@@ -236,12 +173,6 @@ object MmkvManager {
         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()) {
@@ -264,22 +195,10 @@ object MmkvManager {
         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)
     }
@@ -288,9 +207,6 @@ object MmkvManager {
 
     //region Subscriptions
 
-    /**
-     * Initializes the subscription list.
-     */
     private fun initSubsList() {
         val subsList = decodeSubsList()
         if (subsList.isNotEmpty()) {
@@ -302,11 +218,6 @@ object MmkvManager {
         encodeSubsList(subsList)
     }
 
-    /**
-     * Decodes the subscriptions.
-     *
-     * @return The list of subscriptions.
-     */
     fun decodeSubscriptions(): List<Pair<String, SubscriptionItem>> {
         initSubsList()
 
@@ -320,11 +231,6 @@ object MmkvManager {
         return subscriptions
     }
 
-    /**
-     * Removes the subscription.
-     *
-     * @param subid The subscription ID.
-     */
     fun removeSubscription(subid: String) {
         subStorage.remove(subid)
         val subsList = decodeSubsList()
@@ -334,12 +240,6 @@ object MmkvManager {
         removeServerViaSubid(subid)
     }
 
-    /**
-     * Encodes the subscription.
-     *
-     * @param guid The subscription GUID.
-     * @param subItem The subscription item.
-     */
     fun encodeSubscription(guid: String, subItem: SubscriptionItem) {
         val key = guid.ifBlank { Utils.getUuid() }
         subStorage.encode(key, JsonUtil.toJson(subItem))
@@ -351,31 +251,15 @@ object MmkvManager {
         }
     }
 
-    /**
-     * Decodes the subscription.
-     *
-     * @param subscriptionId The subscription ID.
-     * @return The subscription item.
-     */
     fun decodeSubscription(subscriptionId: String): SubscriptionItem? {
         val json = subStorage.decodeString(subscriptionId) ?: return null
         return JsonUtil.fromJson(json, SubscriptionItem::class.java)
     }
 
-    /**
-     * Encodes the subscription list.
-     *
-     * @param subsList The list of subscription IDs.
-     */
     fun encodeSubsList(subsList: MutableList<String>) {
         mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList))
     }
 
-    /**
-     * Decodes the subscription list.
-     *
-     * @return The list of subscription IDs.
-     */
     fun decodeSubsList(): MutableList<String> {
         val json = mainStorage.decodeString(KEY_SUB_IDS)
         return if (json.isNullOrBlank()) {
@@ -389,11 +273,6 @@ object MmkvManager {
 
     //region Asset
 
-    /**
-     * Decodes the asset URLs.
-     *
-     * @return The list of asset URLs.
-     */
     fun decodeAssetUrls(): List<Pair<String, AssetUrlItem>> {
         val assetUrlItems = mutableListOf<Pair<String, AssetUrlItem>>()
         assetStorage.allKeys()?.forEach { key ->
@@ -405,32 +284,15 @@ object MmkvManager {
         return assetUrlItems.sortedBy { (_, value) -> value.addedTime }
     }
 
-    /**
-     * Removes the asset URL.
-     *
-     * @param assetid The asset ID.
-     */
     fun removeAssetUrl(assetid: String) {
         assetStorage.remove(assetid)
     }
 
-    /**
-     * Encodes the asset.
-     *
-     * @param assetid The asset ID.
-     * @param assetItem The asset item.
-     */
     fun encodeAsset(assetid: String, assetItem: AssetUrlItem) {
         val key = assetid.ifBlank { Utils.getUuid() }
         assetStorage.encode(key, JsonUtil.toJson(assetItem))
     }
 
-    /**
-     * Decodes the asset.
-     *
-     * @param assetid The asset ID.
-     * @return The asset item.
-     */
     fun decodeAsset(assetid: String): AssetUrlItem? {
         val json = assetStorage.decodeString(assetid) ?: return null
         return JsonUtil.fromJson(json, AssetUrlItem::class.java)
@@ -440,22 +302,12 @@ object MmkvManager {
 
     //region Routing
 
-    /**
-     * Decodes the routing rulesets.
-     *
-     * @return The list of routing rulesets.
-     */
     fun decodeRoutingRulesets(): MutableList<RulesetItem>? {
         val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET)
         if (ruleset.isNullOrEmpty()) return null
         return JsonUtil.fromJson(ruleset, Array<RulesetItem>::class.java).toMutableList()
     }
 
-    /**
-     * Encodes the routing rulesets.
-     *
-     * @param rulesetList The list of routing rulesets.
-     */
     fun encodeRoutingRulesets(rulesetList: MutableList<RulesetItem>?) {
         if (rulesetList.isNullOrEmpty())
             encodeSettings(PREF_ROUTING_RULESET, "")
@@ -464,99 +316,43 @@ object MmkvManager {
     }
 
     //endregion
-
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
     fun encodeSettings(key: String, value: String?): Boolean {
         return settingsStorage.encode(key, value)
     }
 
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
     fun encodeSettings(key: String, value: Int): Boolean {
         return settingsStorage.encode(key, value)
     }
 
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
     fun encodeSettings(key: String, value: Boolean): Boolean {
         return settingsStorage.encode(key, value)
     }
 
-    /**
-     * Encodes the settings.
-     *
-     * @param key The settings key.
-     * @param value The settings value.
-     * @return Whether the encoding was successful.
-     */
     fun encodeSettings(key: String, value: MutableSet<String>): Boolean {
         return settingsStorage.encode(key, value)
     }
 
-    /**
+
-     * Decodes the settings string.
-     *
-     * @param key The settings key.
-     * @return The settings value.
-     */
     fun decodeSettingsString(key: String): String? {
         return settingsStorage.decodeString(key)
     }
 
-    /**
-     * Decodes the settings string.
-     *
-     * @param key The settings key.
-     * @param defaultValue The default value.
-     * @return The settings value.
-     */
     fun decodeSettingsString(key: String, defaultValue: String?): String? {
         return settingsStorage.decodeString(key, defaultValue)
     }
 
-    /**
-     * Decodes the settings boolean.
-     *
-     * @param key The settings key.
-     * @return The settings value.
-     */
     fun decodeSettingsBool(key: String): Boolean {
         return settingsStorage.decodeBool(key, false)
     }
 
-    /**
-     * Decodes the settings boolean.
-     *
-     * @param key The settings key.
-     * @param defaultValue The default value.
-     * @return The settings value.
-     */
     fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean {
         return settingsStorage.decodeBool(key, defaultValue)
     }
 
-    /**
+    fun decodeSettingsInt(key: String, defaultValue: Int): Int {
-     * Decodes the settings string set.
+        return settingsStorage.decodeInt(key, defaultValue)
-     *
+    }
-     * @param key The settings key.
+
-     * @return The settings value.
-     */
     fun decodeSettingsStringSet(key: String): MutableSet<String>? {
         return settingsStorage.decodeStringSet(key)
     }
@@ -565,20 +361,10 @@ object MmkvManager {
 
     //region Others
 
-    /**
-     * Encodes the start on boot setting.
-     *
-     * @param startOnBoot Whether to start on boot.
-     */
     fun encodeStartOnBoot(startOnBoot: Boolean) {
-        encodeSettings(PREF_IS_BOOTED, startOnBoot)
+        MmkvManager.encodeSettings(PREF_IS_BOOTED, startOnBoot)
     }
 
-    /**
-     * Decodes the start on boot setting.
-     *
-     * @return Whether to start on boot.
-     */
     fun decodeStartOnBoot(): Boolean {
         return decodeSettingsBool(PREF_IS_BOOTED, false)
     }

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

@@ -4,34 +4,26 @@ import android.content.Context
 import android.content.res.AssetManager
 import android.text.TextUtils
 import android.util.Log
-import androidx.appcompat.app.AppCompatDelegate
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
-import com.v2ray.ang.dto.EConfigType
-import com.v2ray.ang.dto.Language
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RoutingType
 import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.V2rayConfig
-import com.v2ray.ang.dto.VpnInterfaceAddressConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
 import com.v2ray.ang.handler.MmkvManager.decodeServerList
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
+import com.v2ray.ang.util.Utils.parseInt
 import java.io.File
 import java.io.FileOutputStream
 import java.util.Collections
-import java.util.Locale
+import kotlin.Int
 
 object SettingsManager {
 
-    /**
-     * Initialize routing rulesets.
-     * @param context The application context.
-     */
     fun initRoutingRulesets(context: Context) {
         val exist = MmkvManager.decodeRoutingRulesets()
         if (exist.isNullOrEmpty()) {
@@ -40,12 +32,6 @@ object SettingsManager {
         }
     }
 
-    /**
-     * Get preset routing rulesets.
-     * @param context The application context.
-     * @param index The index of the routing type.
-     * @return A mutable list of RulesetItem.
-     */
     private fun getPresetRoutingRulesets(context: Context, index: Int = 0): MutableList<RulesetItem>? {
         val fileName = RoutingType.fromIndex(index).fileName
         val assets = Utils.readTextFromAssets(context, fileName)
@@ -56,21 +42,12 @@ object SettingsManager {
         return JsonUtil.fromJson(assets, Array<RulesetItem>::class.java).toMutableList()
     }
 
-    /**
+
-     * Reset routing rulesets from presets.
-     * @param context The application context.
-     * @param index The index of the routing type.
-     */
     fun resetRoutingRulesetsFromPresets(context: Context, index: Int) {
         val rulesetList = getPresetRoutingRulesets(context, index) ?: return
         resetRoutingRulesetsCommon(rulesetList)
     }
 
-    /**
-     * Reset routing rulesets.
-     * @param content The content of the rulesets.
-     * @return True if successful, false otherwise.
-     */
     fun resetRoutingRulesets(content: String?): Boolean {
         if (content.isNullOrEmpty()) {
             return false
@@ -85,15 +62,11 @@ object SettingsManager {
             resetRoutingRulesetsCommon(rulesetList)
             return true
         } catch (e: Exception) {
-            Log.e(ANG_PACKAGE, "Failed to reset routing rulesets", e)
+            e.printStackTrace()
             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 ->
@@ -106,11 +79,6 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetNew)
     }
 
-    /**
-     * Get a routing ruleset by index.
-     * @param index The index of the ruleset.
-     * @return The RulesetItem.
-     */
     fun getRoutingRuleset(index: Int): RulesetItem? {
         if (index < 0) return null
 
@@ -120,18 +88,11 @@ object SettingsManager {
         return rulesetList[index]
     }
 
-    /**
-     * Save a routing ruleset.
-     * @param index The index of the ruleset.
-     * @param ruleset The RulesetItem to save.
-     */
     fun saveRoutingRuleset(index: Int, ruleset: RulesetItem?) {
         if (ruleset == null) return
 
-        var rulesetList = MmkvManager.decodeRoutingRulesets()
+        val rulesetList = MmkvManager.decodeRoutingRulesets()
-        if (rulesetList.isNullOrEmpty()) {
+        if (rulesetList.isNullOrEmpty()) return
-            rulesetList = mutableListOf()
-        }
 
         if (index < 0 || index >= rulesetList.count()) {
             rulesetList.add(0, ruleset)
@@ -141,10 +102,6 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
-    /**
-     * Remove a routing ruleset by index.
-     * @param index The index of the ruleset.
-     */
     fun removeRoutingRuleset(index: Int) {
         if (index < 0) return
 
@@ -155,29 +112,7 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
-    /**
-     * Check if routing rulesets bypass LAN.
-     * @return True if bypassing LAN, false otherwise.
-     */
     fun routingRulesetsBypassLan(): Boolean {
-        val vpnBypassLan = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_BYPASS_LAN) ?: "1"
-        if (vpnBypassLan == "1") {
-            return true
-        } else if (vpnBypassLan == "2") {
-            return false
-        }
-
-        val guid = MmkvManager.getSelectServer() ?: return false
-        val config = decodeServerConfig(guid) ?: return false
-        if (config.configType == EConfigType.CUSTOM) {
-            val raw = MmkvManager.decodeServerRaw(guid) ?: return false
-            val v2rayConfig = JsonUtil.fromJson(raw, V2rayConfig::class.java)
-            val exist = v2rayConfig.routing.rules.filter { it.outboundTag == TAG_DIRECT }.any {
-                it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
-            }
-            return exist == true
-        }
-
         val rulesetItems = MmkvManager.decodeRoutingRulesets()
         val exist = rulesetItems?.filter { it.enabled && it.outboundTag == TAG_DIRECT }?.any {
             it.domain?.contains(GEOSITE_PRIVATE) == true || it.ip?.contains(GEOIP_PRIVATE) == true
@@ -185,11 +120,6 @@ object SettingsManager {
         return exist == true
     }
 
-    /**
-     * Swap routing rulesets.
-     * @param fromPosition The position to swap from.
-     * @param toPosition The position to swap to.
-     */
     fun swapRoutingRuleset(fromPosition: Int, toPosition: Int) {
         val rulesetList = MmkvManager.decodeRoutingRulesets()
         if (rulesetList.isNullOrEmpty()) return
@@ -198,11 +128,6 @@ object SettingsManager {
         MmkvManager.encodeRoutingRulesets(rulesetList)
     }
 
-    /**
-     * Swap subscriptions.
-     * @param fromPosition The position to swap from.
-     * @param toPosition The position to swap to.
-     */
     fun swapSubscriptions(fromPosition: Int, toPosition: Int) {
         val subsList = MmkvManager.decodeSubsList()
         if (subsList.isNullOrEmpty()) return
@@ -211,13 +136,8 @@ object SettingsManager {
         MmkvManager.encodeSubsList(subsList)
     }
 
-    /**
-     * Get server via remarks.
-     * @param remarks The remarks of the server.
-     * @return The ProfileItem.
-     */
     fun getServerViaRemarks(remarks: String?): ProfileItem? {
-        if (remarks.isNullOrEmpty()) {
+        if (remarks == null) {
             return null
         }
         val serverList = decodeServerList()
@@ -230,27 +150,14 @@ object SettingsManager {
         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())
+        return 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
+        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)
 
@@ -266,108 +173,14 @@ object SettingsManager {
                             input.copyTo(output)
                         }
                     }
-                    Log.i(AppConfig.TAG, "Copied from apk assets folder to ${target.absolutePath}")
+                    Log.i(
+                        ANG_PACKAGE,
+                        "Copied from apk assets folder to ${target.absolutePath}"
+                    )
                 }
         } catch (e: Exception) {
             Log.e(ANG_PACKAGE, "asset copy failed", e)
         }
-    }
 
-    /**
-     * Get domestic DNS servers from preference.
-     * @return A list of domestic DNS servers.
-     */
-    fun getDomesticDnsServers(): List<String> {
-        val domesticDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS) ?: AppConfig.DNS_DIRECT
-        val ret = domesticDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_DIRECT)
-        }
-        return ret
-    }
-
-    /**
-     * Get remote DNS servers from preference.
-     * @return A list of remote DNS servers.
-     */
-    fun getRemoteDnsServers(): List<String> {
-        val remoteDns =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS) ?: AppConfig.DNS_PROXY
-        val ret = remoteDns.split(",").filter { Utils.isPureIpAddress(it) || Utils.isCoreDNSAddress(it) }
-        if (ret.isEmpty()) {
-            return listOf(AppConfig.DNS_PROXY)
-        }
-        return ret
-    }
-
-    /**
-     * Get VPN DNS servers from preference.
-     * @return A list of VPN DNS servers.
-     */
-    fun getVpnDnsServers(): List<String> {
-        val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN
-        return vpnDns.split(",").filter { Utils.isPureIpAddress(it) }
-    }
-
-    /**
-     * Get delay test URL.
-     * @param second Whether to use the second URL.
-     * @return The delay test URL.
-     */
-    fun getDelayTestUrl(second: Boolean = false): String {
-        return if (second) {
-            AppConfig.DELAY_TEST_URL2
-        } else {
-            MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL)
-                ?: AppConfig.DELAY_TEST_URL
-        }
-    }
-
-    /**
-     * Get the locale.
-     * @return The locale.
-     */
-    fun getLocale(): Locale {
-        val langCode =
-            MmkvManager.decodeSettingsString(AppConfig.PREF_LANGUAGE) ?: Language.AUTO.code
-        val language = Language.fromCode(langCode)
-
-        return when (language) {
-            Language.AUTO -> Utils.getSysLocale()
-            Language.ENGLISH -> Locale.ENGLISH
-            Language.CHINA -> Locale.CHINA
-            Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE
-            Language.VIETNAMESE -> Locale("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/SimpleItemTouchHelperCallback.kt

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

V2rayNG/app/src/main/java/com/v2ray/ang/plugin/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
@@ -126,7 +126,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
@@ -224,8 +224,8 @@ object PluginManager {
 
     fun ComponentInfo.loadString(key: String) = when (val value = metaData.getString(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/java/com/v2ray/ang/receiver/BootReceiver.kt

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

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

@@ -5,19 +5,14 @@ import android.content.Context
 import android.content.Intent
 import android.text.TextUtils
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.util.Utils
 
 class TaskerReceiver : BroadcastReceiver() {
 
-    /**
-     * This method is called when the BroadcastReceiver is receiving an Intent broadcast.
-     * It retrieves the bundle from the intent and checks the switch and guid values.
-     * Depending on the switch value, it starts or stops the V2Ray service.
-     *
-     * @param context The Context in which the receiver is running.
-     * @param intent The Intent being received.
-     */
     override fun onReceive(context: Context, intent: Intent?) {
+
         try {
             val bundle = intent?.getBundleExtra(AppConfig.TASKER_EXTRA_BUNDLE)
             val switch = bundle?.getBoolean(AppConfig.TASKER_EXTRA_BUNDLE_SWITCH, false)
@@ -27,15 +22,16 @@ class TaskerReceiver : BroadcastReceiver() {
                 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/java/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/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/ProcessService.kt

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

V2rayNG/app/src/main/java/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,8 +9,6 @@ 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
@@ -17,21 +16,18 @@ 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()
@@ -41,23 +37,17 @@ class QSTileService : TileService() {
      * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
      * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
      */
+
     override fun onStartListening() {
         super.onStartListening()
 
-        if (V2RayServiceManager.isRunning()) {
+        setState(Tile.STATE_INACTIVE)
-            setState(Tile.STATE_ACTIVE)
-        } else {
-            setState(Tile.STATE_INACTIVE)
-        }
         mMsgReceive = ReceiveMessageHandler(this)
         val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY)
         ContextCompat.registerReceiver(applicationContext, mMsgReceive, mFilter, Utils.receiverFlags())
         MessageUtil.sendMsg2Service(this, AppConfig.MSG_REGISTER_CLIENT, "")
     }
 
-    /**
-     * Called when the tile stops listening.
-     */
     override fun onStopListening() {
         super.onStopListening()
 
@@ -65,23 +55,20 @@ class QSTileService : TileService() {
             applicationContext.unregisterReceiver(mMsgReceive)
             mMsgReceive = null
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to unregister receiver", e)
+            e.printStackTrace()
         }
 
     }
 
-    /**
-     * 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/java/com/v2ray/ang/service/ServiceControl.kt

@@ -3,26 +3,11 @@ 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/SubscriptionUpdater.kt

@@ -19,6 +19,7 @@ import com.v2ray.ang.handler.MmkvManager
 
 object SubscriptionUpdater {
 
+
     class UpdateTask(context: Context, params: WorkerParameters) :
         CoroutineWorker(context, params) {
 
@@ -32,13 +33,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 +53,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/java/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/java/com/v2ray/ang/service/V2RayServiceManager.kt

@@ -1,109 +1,74 @@
 package com.v2ray.ang.service
 
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.app.Service
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.graphics.Color
 import android.os.Build
 import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.TAG_DIRECT
+import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
-import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.extension.toSpeedString
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.V2rayConfigManager
+import com.v2ray.ang.ui.MainActivity
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.PluginUtil
 import com.v2ray.ang.util.Utils
 import go.Seq
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import libv2ray.CoreCallbackHandler
-import libv2ray.CoreController
 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_PENDING_INTENT_RESTART_V2RAY = 2
+    private const val NOTIFICATION_ICON_THRESHOLD = 3000
 
-    private val coreController: CoreController = Libv2ray.newCoreController(CoreCallback())
+    val v2rayPoint: V2RayPoint = Libv2ray.newV2RayPoint(V2RayCallback(), Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
     private val mMsgReceive = ReceiveMessageHandler()
-    private var currentConfig: ProfileItem? = null
 
     var serviceControl: SoftReference<ServiceControl>? = null
         set(value) {
             field = value
             Seq.setContext(value?.get()?.getService()?.applicationContext)
-            Libv2ray.initCoreEnv(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
+            Libv2ray.initV2Env(Utils.userAssetPath(value?.get()?.getService()), Utils.getDeviceIdForXUDPBaseKey())
         }
+    var currentConfig: ProfileItem? = null
 
-    /**
+    private var lastQueryTime = 0L
-     * Starts the V2Ray service from a toggle action.
+    private var mBuilder: NotificationCompat.Builder? = null
-     * @param context The context from which the service is started.
+    private var mDisposable: Disposable? = null
-     * @return True if the service was started successfully, false otherwise.
+    private var mNotificationManager: NotificationManager? = null
-     */
-    fun startVServiceFromToggle(context: Context): Boolean {
-        if (MmkvManager.getSelectServer().isNullOrEmpty()) {
-            context.toast(R.string.app_tile_first_use)
-            return false
-        }
-        startContextService(context)
-        return true
-    }
 
-    /**
+    fun startV2Ray(context: Context) {
-     * Starts the V2Ray service.
+        if (v2rayPoint.isRunning) return
-     * @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
+        if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) return
-            && !Utils.isValidUrl(config.server)
-            && !Utils.isPureIpAddress(config.server.orEmpty())
-        ) return
 //        val result = V2rayConfigUtil.getV2rayConfig(context, guid)
 //        if (!result.status) return
 
@@ -112,7 +77,7 @@ object V2RayServiceManager {
         } else {
             context.toast(R.string.toast_services_start)
         }
-        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: AppConfig.VPN) == AppConfig.VPN) {
+        val intent = if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
             Intent(context.applicationContext, V2RayVpnService::class.java)
         } else {
             Intent(context.applicationContext, V2RayProxyOnlyService::class.java)
@@ -124,22 +89,61 @@ object V2RayServiceManager {
         }
     }
 
+    private class V2RayCallback : V2RayVPNServiceSupportsSet {
+        override fun shutdown(): Long {
+            val serviceControl = serviceControl?.get() ?: return -1
+            // called by go
+            return try {
+                serviceControl.stopService()
+                0
+            } catch (e: Exception) {
+                Log.d(ANG_PACKAGE, e.toString())
+                -1
+            }
+        }
+
+        override fun prepare(): Long {
+            return 0
+        }
+
+        override fun protect(l: Long): Boolean {
+            val serviceControl = serviceControl?.get() ?: return true
+            return serviceControl.vpnProtect(l.toInt())
+        }
+
+        override fun onEmitStatus(l: Long, s: String?): Long {
+            return 0
+        }
+
+        override fun setup(s: String): Long {
+            val serviceControl = serviceControl?.get() ?: return -1
+            return try {
+                serviceControl.startService()
+                lastQueryTime = System.currentTimeMillis()
+                startSpeedNotification()
+                0
+            } catch (e: Exception) {
+                Log.d(ANG_PACKAGE, e.toString())
+                -1
+            }
+        }
+    }
+
     /**
      * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int):
      * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`.
-     * Starts the V2Ray core service.
      */
-    fun startCoreLoop(): Boolean {
-        if (coreController.isRunning) {
-            return false
-        }
 
-        val service = getService() ?: return false
+    fun startV2rayPoint() {
-        val guid = MmkvManager.getSelectServer() ?: return false
+        val service = serviceControl?.get()?.getService() ?: return
-        val config = MmkvManager.decodeServerConfig(guid) ?: return false
+        val guid = MmkvManager.getSelectServer() ?: return
+        val config = MmkvManager.decodeServerConfig(guid) ?: return
+        if (v2rayPoint.isRunning) {
+            return
+        }
         val result = V2rayConfigManager.getV2rayConfig(service, guid)
         if (!result.status)
-            return false
+            return
 
         try {
             val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
@@ -148,188 +152,60 @@ object V2RayServiceManager {
             mFilter.addAction(Intent.ACTION_USER_PRESENT)
             ContextCompat.registerReceiver(service, mMsgReceive, mFilter, Utils.receiverFlags())
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to register broadcast receiver", e)
+            Log.d(ANG_PACKAGE, e.toString())
-            return false
         }
 
+        v2rayPoint.configureFileContent = result.content
+        v2rayPoint.domainName = result.domainPort
         currentConfig = config
 
         try {
-            coreController.startLoop(result.content)
+            v2rayPoint.runLoop(MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6))
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to start Core loop", e)
+            Log.d(ANG_PACKAGE, e.toString())
-            return false
         }
 
-        if (coreController.isRunning == false) {
+        if (v2rayPoint.isRunning) {
-            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
-            NotificationService.cancelNotification()
-            return false
-        }
-
-        try {
             MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "")
-            NotificationService.showNotification(currentConfig)
+            showNotification()
-            NotificationService.startSpeedNotification(currentConfig)
 
-            PluginUtil.runPlugin(service, config, result.socksPort)
+            PluginUtil.runPlugin(service, config, result.domainPort)
-        } catch (e: Exception) {
+        } else {
-            Log.e(AppConfig.TAG, "Failed to startup service", e)
+            MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "")
-            return false
+            cancelNotification()
         }
-        return true
     }
 
-    /**
+    fun stopV2rayPoint() {
-     * Stops the V2Ray core service.
+        val service = serviceControl?.get()?.getService() ?: return
-     * 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) {
+        if (v2rayPoint.isRunning) {
             CoroutineScope(Dispatchers.IO).launch {
                 try {
-                    coreController.stopLoop()
+                    v2rayPoint.stopLoop()
                 } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to stop V2Ray loop", e)
+                    Log.d(ANG_PACKAGE, e.toString())
                 }
             }
         }
 
         MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_STOP_SUCCESS, "")
-        NotificationService.cancelNotification()
+        cancelNotification()
 
         try {
             service.unregisterReceiver(mMsgReceive)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to unregister broadcast receiver", e)
+            Log.d(ANG_PACKAGE, e.toString())
         }
         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) {
+                    if (v2rayPoint.isRunning) {
                         MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_RUNNING, "")
                     } else {
                         MessageUtil.sendMsg2UI(serviceControl.getService(), AppConfig.MSG_STATE_NOT_RUNNING, "")
@@ -345,15 +221,15 @@ object V2RayServiceManager {
                 }
 
                 AppConfig.MSG_STATE_STOP -> {
-                    Log.i(AppConfig.TAG, "Stop Service")
+                    Log.d(ANG_PACKAGE, "Stop Service")
                     serviceControl.stopService()
                 }
 
                 AppConfig.MSG_STATE_RESTART -> {
-                    Log.i(AppConfig.TAG, "Restart Service")
+                    Log.d(ANG_PACKAGE, "Restart Service")
                     serviceControl.stopService()
                     Thread.sleep(500L)
-                    startVService(serviceControl.getService())
+                    startV2Ray(serviceControl.getService())
                 }
 
                 AppConfig.MSG_MEASURE_DELAY -> {
@@ -363,15 +239,213 @@ object V2RayServiceManager {
 
             when (intent?.action) {
                 Intent.ACTION_SCREEN_OFF -> {
-                    Log.i(AppConfig.TAG, "SCREEN_OFF, stop querying stats")
+                    Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats")
-                    NotificationService.stopSpeedNotification(currentConfig)
+                    stopSpeedNotification()
                 }
 
                 Intent.ACTION_SCREEN_ON -> {
-                    Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats")
+                    Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats")
-                    NotificationService.startSpeedNotification(currentConfig)
+                    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 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
+            )
+        //.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
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            service.stopForeground(Service.STOP_FOREGROUND_REMOVE)
+        } else {
+            service.stopForeground(true)
+        }
+
+        mBuilder = null
+        mDisposable?.dispose()
+        mDisposable = null
+    }
+
+    private fun updateNotification(contentText: String?, proxyTraffic: Long, directTraffic: Long) {
+        if (mBuilder != null) {
+            if (proxyTraffic < NOTIFICATION_ICON_THRESHOLD && directTraffic < NOTIFICATION_ICON_THRESHOLD) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_name)
+            } else if (proxyTraffic > directTraffic) {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_proxy)
+            } else {
+                mBuilder?.setSmallIcon(R.drawable.ic_stat_direct)
+            }
+            mBuilder?.setStyle(NotificationCompat.BigTextStyle().bigText(contentText))
+            mBuilder?.setContentText(contentText) // Emui4.1 need content text even if style is set as BigTextStyle
+            getNotificationManager()?.notify(NOTIFICATION_ID, mBuilder?.build())
+        }
+    }
+
+    private fun getNotificationManager(): NotificationManager? {
+        if (mNotificationManager == null) {
+            val service = serviceControl?.get()?.getService() ?: return null
+            mNotificationManager = service.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        }
+        return mNotificationManager
+    }
+
+    private fun startSpeedNotification() {
+        if (mDisposable == null &&
+            v2rayPoint.isRunning &&
+            MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) == true
+        ) {
+            var lastZeroSpeed = false
+            val outboundTags = currentConfig?.getAllOutboundTags()
+            outboundTags?.remove(TAG_DIRECT)
+
+            mDisposable = Observable.interval(3, java.util.concurrent.TimeUnit.SECONDS)
+                .subscribe {
+                    val queryTime = System.currentTimeMillis()
+                    val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                    var proxyTotal = 0L
+                    val text = StringBuilder()
+                    outboundTags?.forEach {
+                        val up = v2rayPoint.queryStats(it, AppConfig.UPLINK)
+                        val down = v2rayPoint.queryStats(it, AppConfig.DOWNLINK)
+                        if (up + down > 0) {
+                            appendSpeedString(text, it, up / sinceLastQueryInSeconds, down / sinceLastQueryInSeconds)
+                            proxyTotal += up + down
+                        }
+                    }
+                    val directUplink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.UPLINK)
+                    val directDownlink = v2rayPoint.queryStats(TAG_DIRECT, AppConfig.DOWNLINK)
+                    val zeroSpeed = proxyTotal == 0L && directUplink == 0L && directDownlink == 0L
+                    if (!zeroSpeed || !lastZeroSpeed) {
+                        if (proxyTotal == 0L) {
+                            appendSpeedString(text, outboundTags?.firstOrNull(), 0.0, 0.0)
+                        }
+                        appendSpeedString(
+                            text, TAG_DIRECT, directUplink / sinceLastQueryInSeconds,
+                            directDownlink / sinceLastQueryInSeconds
+                        )
+                        updateNotification(text.toString(), proxyTotal, directDownlink + directUplink)
+                    }
+                    lastZeroSpeed = zeroSpeed
+                    lastQueryTime = queryTime
+                }
+        }
+    }
+
+    private fun appendSpeedString(text: StringBuilder, name: String?, up: Double, down: Double) {
+        var n = name ?: "no tag"
+        n = n.substring(0, min(n.length, 6))
+        text.append(n)
+        for (i in n.length..6 step 2) {
+            text.append("\t")
+        }
+        text.append("•  ${up.toLong().toSpeedString()}↑  ${down.toLong().toSpeedString()}↓\n")
+    }
+
+    private fun stopSpeedNotification() {
+        mDisposable?.let {
+            it.dispose() //stop queryStats
+            mDisposable = null
+            updateNotification(currentConfig?.remarks, 0, 0)
+        }
+    }
+
 }

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

@@ -9,10 +9,10 @@ import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.MessageUtil
 import com.v2ray.ang.util.PluginUtil
+import com.v2ray.ang.util.SpeedtestUtil
 import com.v2ray.ang.util.Utils
 import go.Seq
 import kotlinx.coroutines.CoroutineScope
@@ -26,22 +26,12 @@ import java.util.concurrent.Executors
 class V2RayTestService : Service() {
     private val realTestScope by lazy { CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()).asCoroutineDispatcher()) }
 
-    /**
-     * Initializes the V2Ray environment.
-     */
     override fun onCreate() {
         super.onCreate()
         Seq.setContext(this)
-        Libv2ray.initCoreEnv(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
+        Libv2ray.initV2Env(Utils.userAssetPath(this), Utils.getDeviceIdForXUDPBaseKey())
     }
 
-    /**
-     * Handles the start command for the service.
-     * @param intent The intent.
-     * @param flags The flags.
-     * @param startId The start ID.
-     * @return The start mode.
-     */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         when (intent?.getIntExtra("key", 0)) {
             MSG_MEASURE_CONFIG -> {
@@ -59,20 +49,10 @@ class V2RayTestService : Service() {
         return super.onStartCommand(intent, flags, startId)
     }
 
-    /**
-     * Binds the service.
-     * @param intent The intent.
-     * @return The binder.
-     */
     override fun onBind(intent: Intent?): IBinder? {
         return null
     }
 
-    /**
-     * Starts the real ping test.
-     * @param guid The GUID of the configuration.
-     * @return The ping result.
-     */
     private fun startRealPing(guid: String): Long {
         val retFailure = -1L
 
@@ -81,11 +61,11 @@ class V2RayTestService : Service() {
             val delay = PluginUtil.realPingHy2(this, config)
             return delay
         } else {
-            val configResult = V2rayConfigManager.getV2rayConfig4Speedtest(this, guid)
+            val config = V2rayConfigManager.getV2rayConfig(this, guid)
-            if (!configResult.status) {
+            if (!config.status) {
                 return retFailure
             }
-            return SpeedtestManager.realPing(configResult.content)
+            return SpeedtestUtil.realPing(config.content)
         }
     }
 }

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

@@ -18,8 +18,10 @@ import android.os.StrictMode
 import android.util.Log
 import androidx.annotation.RequiresApi
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.BuildConfig
+import com.v2ray.ang.R
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.MyContextWrapper
@@ -33,11 +35,18 @@ import java.lang.ref.SoftReference
 class V2RayVpnService : VpnService(), ServiceControl {
     companion object {
         private const val VPN_MTU = 1500
+        private const val PRIVATE_VLAN4_CLIENT = "10.10.10.1"
+        private const val PRIVATE_VLAN4_ROUTER = "10.10.10.2"
+        private const val PRIVATE_VLAN6_CLIENT = "fc00::10:10:10:1"
+        private const val PRIVATE_VLAN6_ROUTER = "fc00::10:10:10:2"
         private const val TUN2SOCKS = "libtun2socks.so"
     }
 
+
     private lateinit var mInterface: ParcelFileDescriptor
     private var isRunning = false
+
+    //val fd: Int get() = mInterface.fd
     private lateinit var process: Process
 
     /**destroy
@@ -79,6 +88,7 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onCreate() {
         super.onCreate()
+
         val policy = StrictMode.ThreadPolicy.Builder().permitAll().build()
         StrictMode.setThreadPolicy(policy)
         V2RayServiceManager.serviceControl = SoftReference(this)
@@ -95,17 +105,225 @@ class V2RayVpnService : VpnService(), ServiceControl {
 
     override fun onDestroy() {
         super.onDestroy()
-        NotificationService.cancelNotification()
+        V2RayServiceManager.cancelNotification()
+    }
+
+    private fun setup() {
+        val prepare = prepare(this)
+        if (prepare != null) {
+            return
+        }
+
+        // If the old interface has exactly the same parameters, use it!
+        // Configure a builder while parsing the parameters.
+        val builder = Builder()
+        //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
+
+        builder.setMtu(VPN_MTU)
+        builder.addAddress(PRIVATE_VLAN4_CLIENT, 30)
+        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+        val bypassLan = SettingsManager.routingRulesetsBypassLan()
+        if (bypassLan) {
+            resources.getStringArray(R.array.bypass_private_ip_address).forEach {
+                val addr = it.split('/')
+                builder.addRoute(addr[0], addr[1].toInt())
+            }
+        } else {
+            builder.addRoute("0.0.0.0", 0)
+        }
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
+            builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)
+            if (bypassLan) {
+                builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
+            } else {
+                builder.addRoute("::", 0)
+            }
+        }
+
+//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
+//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
+//        } else {
+        Utils.getVpnDnsServers()
+            .forEach {
+                if (Utils.isPureIpAddress(it)) {
+                    builder.addDnsServer(it)
+                }
+            }
+//        }
+
+        builder.setSession(V2RayServiceManager.currentConfig?.remarks.orEmpty())
+
+        val selfPackageName = BuildConfig.APPLICATION_ID
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
+            val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+            val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
+            //process self package
+            if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
+            apps?.forEach {
+                try {
+                    if (bypassApps)
+                        builder.addDisallowedApplication(it)
+                    else
+                        builder.addAllowedApplication(it)
+                } catch (e: PackageManager.NameNotFoundException) {
+                    Log.d(ANG_PACKAGE, "setup error : --${e.localizedMessage}")
+                }
+            }
+        } else {
+            builder.addDisallowedApplication(selfPackageName)
+        }
+
+        // Close the old interface since the parameters have been changed.
+        try {
+            mInterface.close()
+        } catch (ignored: Exception) {
+            // ignored
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            builder.setMetered(false)
+            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
+                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
+            }
+        }
+
+        // Create a new interface using the builder and save the parameters.
+        try {
+            mInterface = builder.establish()!!
+            isRunning = true
+            runTun2socks()
+        } catch (e: Exception) {
+            // non-nullable lateinit var
+            e.printStackTrace()
+            stopV2Ray()
+        }
+    }
+
+    private fun runTun2socks() {
+        val socksPort = SettingsManager.getSocksPort()
+        val cmd = arrayListOf(
+            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
+            "--netif-ipaddr", PRIVATE_VLAN4_ROUTER,
+            "--netif-netmask", "255.255.255.252",
+            "--socks-server-addr", "$LOOPBACK:${socksPort}",
+            "--tunmtu", VPN_MTU.toString(),
+            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
+            "--enable-udprelay",
+            "--loglevel", "notice"
+        )
+
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
+            cmd.add("--netif-ip6addr")
+            cmd.add(PRIVATE_VLAN6_ROUTER)
+        }
+        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
+            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
+            cmd.add("--dnsgw")
+            cmd.add("$LOOPBACK:${localDnsPort}")
+        }
+        Log.d(packageName, cmd.toString())
+
+        try {
+            val proBuilder = ProcessBuilder(cmd)
+            proBuilder.redirectErrorStream(true)
+            process = proBuilder
+                .directory(applicationContext.filesDir)
+                .start()
+            Thread {
+                Log.d(packageName, "$TUN2SOCKS check")
+                process.waitFor()
+                Log.d(packageName, "$TUN2SOCKS exited")
+                if (isRunning) {
+                    Log.d(packageName, "$TUN2SOCKS restart")
+                    runTun2socks()
+                }
+            }.start()
+            Log.d(packageName, process.toString())
+
+            sendFd()
+        } catch (e: Exception) {
+            Log.d(packageName, e.toString())
+        }
+    }
+
+    private fun sendFd() {
+        val fd = mInterface.fileDescriptor
+        val path = File(applicationContext.filesDir, "sock_path").absolutePath
+        Log.d(packageName, path)
+
+        CoroutineScope(Dispatchers.IO).launch {
+            var tries = 0
+            while (true) try {
+                Thread.sleep(50L shl tries)
+                Log.d(packageName, "sendFd tries: $tries")
+                LocalSocket().use { localSocket ->
+                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
+                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
+                    localSocket.outputStream.write(42)
+                }
+                break
+            } catch (e: Exception) {
+                Log.d(packageName, e.toString())
+                if (tries > 5) break
+                tries += 1
+            }
+        }
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (V2RayServiceManager.startCoreLoop()) {
+        V2RayServiceManager.startV2rayPoint()
-            startService()
-        }
         return START_STICKY
         //return super.onStartCommand(intent, flags, startId)
     }
 
+    private fun stopV2Ray(isForced: Boolean = true) {
+//        val configName = defaultDPreference.getPrefString(PREF_CURR_CONFIG_GUID, "")
+//        val emptyInfo = VpnNetworkInfo()
+//        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
+//        saveVpnNetworkInfo(configName, info)
+        isRunning = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            try {
+                connectivity.unregisterNetworkCallback(defaultNetworkCallback)
+            } catch (ignored: Exception) {
+                // ignored
+            }
+        }
+
+        try {
+            Log.d(packageName, "tun2socks destroy")
+            process.destroy()
+        } catch (e: Exception) {
+            Log.d(packageName, e.toString())
+        }
+
+        V2RayServiceManager.stopV2rayPoint()
+
+        if (isForced) {
+            //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
+            //It's strage but true.
+            //This can be verified by putting stopself() behind and call stopLoop and startLoop
+            //in a row for several times. You will find that later created v2ray core report port in use
+            //which means the first v2ray core somehow failed to stop and release the port.
+            stopSelf()
+
+            try {
+                mInterface.close()
+            } catch (ignored: Exception) {
+                // ignored
+            }
+        }
+    }
+
     override fun getService(): Service {
         return this
     }
@@ -125,251 +343,8 @@ class V2RayVpnService : VpnService(), ServiceControl {
     @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)
     }
-
-    /**
-     * Sets up the VPN service.
-     * Prepares the VPN and configures it if preparation is successful.
-     */
-    private fun setup() {
-        val prepare = prepare(this)
-        if (prepare != null) {
-            return
-        }
-
-        if (setupVpnService() != true) {
-            return
-        }
-
-        runTun2socks()
-    }
-
-    /**
-     * Configures the VPN service.
-     * @return True if the VPN service was configured successfully, false otherwise.
-     */
-    private fun setupVpnService(): Boolean {
-        // If the old interface has exactly the same parameters, use it!
-        // Configure a builder while parsing the parameters.
-        val builder = Builder()
-        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
-        //val enableLocalDns = defaultDPreference.getPrefBoolean(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
-
-        builder.setMtu(VPN_MTU)
-        builder.addAddress(vpnConfig.ipv4Client, 30)
-        //builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-        val bypassLan = SettingsManager.routingRulesetsBypassLan()
-        if (bypassLan) {
-            AppConfig.ROUTED_IP_LIST.forEach {
-                val addr = it.split('/')
-                builder.addRoute(addr[0], addr[1].toInt())
-            }
-        } else {
-            builder.addRoute("0.0.0.0", 0)
-        }
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true) {
-            builder.addAddress(vpnConfig.ipv6Client, 126)
-            if (bypassLan) {
-                builder.addRoute("2000::", 3) //currently only 1/8 of total ipV6 is in use
-                builder.addRoute("fc00::", 18) //Xray-core default FakeIPv6 Pool
-            } else {
-                builder.addRoute("::", 0)
-            }
-        }
-
-//        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) {
-//            builder.addDnsServer(PRIVATE_VLAN4_ROUTER)
-//        } else {
-        SettingsManager.getVpnDnsServers()
-            .forEach {
-                if (Utils.isPureIpAddress(it)) {
-                    builder.addDnsServer(it)
-                }
-            }
-//        }
-
-        builder.setSession(V2RayServiceManager.getRunningServerName())
-
-        val selfPackageName = BuildConfig.APPLICATION_ID
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY)) {
-            val apps = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
-            val bypassApps = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS)
-            //process self package
-            if (bypassApps) apps?.add(selfPackageName) else apps?.remove(selfPackageName)
-            apps?.forEach {
-                try {
-                    if (bypassApps)
-                        builder.addDisallowedApplication(it)
-                    else
-                        builder.addAllowedApplication(it)
-                } catch (e: PackageManager.NameNotFoundException) {
-                    Log.e(AppConfig.TAG, "Failed to configure app in VPN: ${e.localizedMessage}", e)
-                }
-            }
-        } else {
-            builder.addDisallowedApplication(selfPackageName)
-        }
-
-        // Close the old interface since the parameters have been changed.
-        try {
-            mInterface.close()
-        } catch (ignored: Exception) {
-            // ignored
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            try {
-                connectivity.requestNetwork(defaultNetworkRequest, defaultNetworkCallback)
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to request default network", e)
-            }
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            builder.setMetered(false)
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY)) {
-                builder.setHttpProxy(ProxyInfo.buildDirectProxy(LOOPBACK, SettingsManager.getHttpPort()))
-            }
-        }
-
-        // Create a new interface using the builder and save the parameters.
-        try {
-            mInterface = builder.establish()!!
-            isRunning = true
-            return true
-        } catch (e: Exception) {
-            // non-nullable lateinit var
-            Log.e(AppConfig.TAG, "Failed to establish VPN interface", e)
-            stopV2Ray()
-        }
-        return false
-    }
-
-    /**
-     * Runs the tun2socks process.
-     * Starts the tun2socks process with the appropriate parameters.
-     */
-    private fun runTun2socks() {
-        Log.i(AppConfig.TAG, "Start run $TUN2SOCKS")
-        val socksPort = SettingsManager.getSocksPort()
-        val vpnConfig = SettingsManager.getCurrentVpnInterfaceAddressConfig()
-        val cmd = arrayListOf(
-            File(applicationContext.applicationInfo.nativeLibraryDir, TUN2SOCKS).absolutePath,
-            "--netif-ipaddr", vpnConfig.ipv4Router,
-            "--netif-netmask", "255.255.255.252",
-            "--socks-server-addr", "$LOOPBACK:${socksPort}",
-            "--tunmtu", VPN_MTU.toString(),
-            "--sock-path", "sock_path",//File(applicationContext.filesDir, "sock_path").absolutePath,
-            "--enable-udprelay",
-            "--loglevel", "notice"
-        )
-
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6)) {
-            cmd.add("--netif-ip6addr")
-            cmd.add(vpnConfig.ipv6Router)
-        }
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED)) {
-            val localDnsPort = Utils.parseInt(MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT), AppConfig.PORT_LOCAL_DNS.toInt())
-            cmd.add("--dnsgw")
-            cmd.add("$LOOPBACK:${localDnsPort}")
-        }
-        Log.i(AppConfig.TAG, cmd.toString())
-
-        try {
-            val proBuilder = ProcessBuilder(cmd)
-            proBuilder.redirectErrorStream(true)
-            process = proBuilder
-                .directory(applicationContext.filesDir)
-                .start()
-            Thread {
-                Log.i(AppConfig.TAG, "$TUN2SOCKS check")
-                process.waitFor()
-                Log.i(AppConfig.TAG, "$TUN2SOCKS exited")
-                if (isRunning) {
-                    Log.i(AppConfig.TAG, "$TUN2SOCKS restart")
-                    runTun2socks()
-                }
-            }.start()
-            Log.i(AppConfig.TAG, "$TUN2SOCKS process info : ${process.toString()}")
-
-            sendFd()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to start $TUN2SOCKS process", e)
-        }
-    }
-
-    /**
-     * Sends the file descriptor to the tun2socks process.
-     * Attempts to send the file descriptor multiple times if necessary.
-     */
-    private fun sendFd() {
-        val fd = mInterface.fileDescriptor
-        val path = File(applicationContext.filesDir, "sock_path").absolutePath
-        Log.i(AppConfig.TAG, "LocalSocket path : $path")
-
-        CoroutineScope(Dispatchers.IO).launch {
-            var tries = 0
-            while (true) try {
-                Thread.sleep(50L shl tries)
-                Log.i(AppConfig.TAG, "LocalSocket sendFd tries: $tries")
-                LocalSocket().use { localSocket ->
-                    localSocket.connect(LocalSocketAddress(path, LocalSocketAddress.Namespace.FILESYSTEM))
-                    localSocket.setFileDescriptorsForSend(arrayOf(fd))
-                    localSocket.outputStream.write(42)
-                }
-                break
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to send file descriptor, try: $tries", e)
-                if (tries > 5) break
-                tries += 1
-            }
-        }
-    }
-
-    /**
-     * Stops the V2Ray service.
-     * @param isForced Whether to force stop the service.
-     */
-    private fun stopV2Ray(isForced: Boolean = true) {
-//        val configName = defaultDPreference.getPrefString(PREF_CURR_CONFIG_GUID, "")
-//        val emptyInfo = VpnNetworkInfo()
-//        val info = loadVpnNetworkInfo(configName, emptyInfo)!! + (lastNetworkInfo ?: emptyInfo)
-//        saveVpnNetworkInfo(configName, info)
-        isRunning = false
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            try {
-                connectivity.unregisterNetworkCallback(defaultNetworkCallback)
-            } catch (ignored: Exception) {
-                // ignored
-            }
-        }
-
-        try {
-            Log.i(AppConfig.TAG, "$TUN2SOCKS destroy")
-            process.destroy()
-        } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to destroy $TUN2SOCKS process", e)
-        }
-
-        V2RayServiceManager.stopCoreLoop()
-
-        if (isForced) {
-            //stopSelf has to be called ahead of mInterface.close(). otherwise v2ray core cannot be stooped
-            //It's strage but true.
-            //This can be verified by putting stopself() behind and call stopLoop and startLoop
-            //in a row for several times. You will find that later created v2ray core report port in use
-            //which means the first v2ray core somehow failed to stop and release the port.
-            stopSelf()
-
-            try {
-                mInterface.close()
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to close VPN interface", e)
-            }
-        }
-    }
 }

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

@@ -6,42 +6,26 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.BuildConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityAboutBinding
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
+import com.v2ray.ang.util.SpeedtestUtil
-import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.util.ZipUtil
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class AboutActivity : BaseActivity() {
 
+class AboutActivity : BaseActivity() {
     private val binding by lazy { ActivityAboutBinding.inflate(layoutInflater) }
     private val extDir by lazy { File(Utils.backupPath(this)) }
 
-    private val requestPermissionLauncher =
-        registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
-            if (isGranted) {
-                try {
-                    showFileChooser()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-        }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
@@ -49,13 +33,12 @@ class AboutActivity : BaseActivity() {
         title = getString(R.string.title_about)
 
         binding.tvBackupSummary.text = this.getString(R.string.summary_configuration_backup, extDir)
-
         binding.layoutBackup.setOnClickListener {
             val ret = backupConfiguration(extDir.absolutePath)
             if (ret.first) {
-                toastSuccess(R.string.toast_success)
+                toast(R.string.toast_success)
             } else {
-                toastError(R.string.toast_failure)
+                toast(R.string.toast_failure)
             }
         }
 
@@ -67,69 +50,67 @@ class AboutActivity : BaseActivity() {
                         Intent(Intent.ACTION_SEND).setType("application/zip")
                             .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                             .putExtra(
-                                Intent.EXTRA_STREAM,
+                                Intent.EXTRA_STREAM, FileProvider.getUriForFile(
-                                FileProvider.getUriForFile(
                                     this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second)
                                 )
                             ), getString(R.string.title_configuration_share)
                     )
                 )
             } else {
-                toastError(R.string.toast_failure)
+                toast(R.string.toast_failure)
             }
         }
 
         binding.layoutRestore.setOnClickListener {
-            val permission =
+            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Manifest.permission.READ_MEDIA_IMAGES
-                    Manifest.permission.READ_MEDIA_IMAGES
-                } else {
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-                }
-
-            if (ContextCompat.checkSelfPermission(this, permission) == android.content.pm.PackageManager.PERMISSION_GRANTED) {
-                try {
-                    showFileChooser()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to show file chooser", e)
-                }
             } else {
-                requestPermissionLauncher.launch(permission)
+                Manifest.permission.READ_EXTERNAL_STORAGE
             }
+            RxPermissions(this)
+                .request(permission)
+                .subscribe {
+                    if (it) {
+                        try {
+                            showFileChooser()
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+                    } else
+                        toast(R.string.toast_permission_denied)
+                }
         }
 
         binding.layoutSoureCcode.setOnClickListener {
-            Utils.openUri(this, AppConfig.APP_URL)
+            Utils.openUri(this, AppConfig.v2rayNGUrl)
         }
 
         binding.layoutFeedback.setOnClickListener {
-            Utils.openUri(this, AppConfig.APP_ISSUES_URL)
+            Utils.openUri(this, AppConfig.v2rayNGIssues)
         }
-
+        binding.layoutOssLicenses.setOnClickListener{
-        binding.layoutOssLicenses.setOnClickListener {
+            val webView = android.webkit.WebView(this);
-            val webView = android.webkit.WebView(this)
+            webView.loadUrl("file:///android_asset/open_source_licenses.html");
-            webView.loadUrl("file:///android_asset/open_source_licenses.html")
             android.app.AlertDialog.Builder(this)
                 .setTitle("Open source licenses")
                 .setView(webView)
-                .setPositiveButton("OK") { dialog, _ -> dialog.dismiss() }
+                .setPositiveButton("OK", android.content.DialogInterface.OnClickListener { dialog, whichButton -> dialog.dismiss() }).show()
-                .show()
         }
 
         binding.layoutTgChannel.setOnClickListener {
-            Utils.openUri(this, AppConfig.TG_CHANNEL_URL)
+            Utils.openUri(this, AppConfig.TgChannelUrl)
         }
 
         binding.layoutPrivacyPolicy.setOnClickListener {
-            Utils.openUri(this, AppConfig.APP_PRIVACY_POLICY)
+            Utils.openUri(this, AppConfig.v2rayNGPrivacyPolicy)
         }
 
-        "v${BuildConfig.VERSION_NAME} (${SpeedtestManager.getLibVersion()})".also {
+        "v${BuildConfig.VERSION_NAME} (${SpeedtestUtil.getLibVersion()})".also {
             binding.tvVersion.text = it
         }
     }
 
-    private fun backupConfiguration(outputZipFilePos: String): Pair<Boolean, String> {
+    fun backupConfiguration(outputZipFilePos: String): Pair<Boolean, String> {
         val dateFormated = SimpleDateFormat(
             "yyyy-MM-dd-HH-mm-ss",
             Locale.getDefault()
@@ -150,7 +131,7 @@ class AboutActivity : BaseActivity() {
         }
     }
 
-    private fun restoreConfiguration(zipFile: File): Boolean {
+    fun restoreConfiguration(zipFile: File): Boolean {
         val backupDir = this.cacheDir.absolutePath + "/${System.currentTimeMillis()}"
 
         if (!ZipUtil.unzipToFolder(zipFile, backupDir)) {
@@ -170,15 +151,15 @@ class AboutActivity : BaseActivity() {
         try {
             chooseFile.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
         } catch (ex: android.content.ActivityNotFoundException) {
-            Log.e(AppConfig.TAG, "File chooser activity not found", ex)
+            Log.e(AppConfig.ANG_PACKAGE, "File chooser activity not found: ${ex.message}", ex)
             toast(R.string.toast_require_file_manager)
         }
     }
 
     private val chooseFile =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            val uri = result.data?.data
+            val uri = it.data?.data
-            if (result.resultCode == RESULT_OK && uri != null) {
+            if (it.resultCode == RESULT_OK && uri != null) {
                 try {
                     val targetFile =
                         File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip")
@@ -188,14 +169,15 @@ class AboutActivity : BaseActivity() {
                         }
                     }
                     if (restoreConfiguration(targetFile)) {
-                        toastSuccess(R.string.toast_success)
+                        toast(R.string.toast_success)
                     } else {
-                        toastError(R.string.toast_failure)
+                        toast(R.string.toast_failure)
                     }
                 } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Error during file restore", e)
+                    Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e)
-                    toastError(R.string.toast_failure)
+                    toast(R.string.toast_failure)
                 }
             }
         }
+
 }

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

@@ -6,16 +6,10 @@ 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)
@@ -40,26 +34,6 @@ abstract class BaseActivity : AppCompatActivity() {
 
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, SettingsManager.getLocale()))
+        super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, Utils.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 +1,146 @@
 package com.v2ray.ang.ui
 
-import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
+import android.os.Handler
+import android.os.Looper
+import android.text.method.ScrollingMovementMethod
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.widget.SearchView
+import android.view.View
 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.extension.toast
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.IOException
 
-
+class LogcatActivity : BaseActivity() {
-class LogcatActivity : BaseActivity(), SwipeRefreshLayout.OnRefreshListener {
     private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) }
-
+    private val throttleManager = ThrottleManager()
-    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)
-
+        logcat(false)
-        binding.recyclerView.setHasFixedSize(true)
-        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
-        binding.recyclerView.adapter = adapter
-
-        binding.refreshLayout.setOnRefreshListener(this)
-
-        logsets.add(getString(R.string.pull_down_to_refresh))
     }
 
-    private fun getLogcat() {
+    class ThrottleManager {
+        private val throttleMap = mutableMapOf<String, Long>()
 
-        try {
+        companion object {
-            binding.refreshLayout.isRefreshing = true
+            private const val THROTTLE_DURATION = 1000L
+        }
+
+        @Synchronized
+        fun shouldProcess(key: String): Boolean {
+            val currentTime = System.currentTimeMillis()
+            val lastProcessTime = throttleMap[key] ?: 0L
+
+            return if (currentTime - lastProcessTime > THROTTLE_DURATION) {
+                throttleMap[key] = currentTime
+                true
+            } else {
+                false
+            }
+        }
+
+        @Synchronized
+        fun reset(key: String) {
+            throttleMap.remove(key)
+        }
+    }
+
+    private fun logcat(shouldFlushLog: Boolean) {
+        binding.pbWaiting.visibility = View.VISIBLE
+
+        lifecycleScope.launch(Dispatchers.Default) {
+            try {
+                if (shouldFlushLog) {
+                    val lst = linkedSetOf("logcat", "-c")
+                    withContext(Dispatchers.IO) {
+                        val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                        process.waitFor()
+                    }
+                }
+
+                val lst = linkedSetOf(
+                    "logcat", "-d", "-v", "time", "-s",
+                    "GoLog,tun2socks,$ANG_PACKAGE,AndroidRuntime,System.err"
+                )
 
-            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()
+                val allLogs = process.inputStream.bufferedReader().use { it.readLines() }
-                launch(Dispatchers.Main) {
+                val filteredLogs = processLogs(allLogs)
-                    logsetsAll = allText.toMutableList()
+
-                    logsets = allText.toMutableList()
+                withContext(Dispatchers.Main) {
-                    refreshData()
+                    updateLogDisplay(filteredLogs)
-                    binding.refreshLayout.isRefreshing = false
                 }
+
+            } catch (e: IOException) {
+                withContext(Dispatchers.Main) {
+                    binding.pbWaiting.visibility = View.GONE
+                    toast(R.string.toast_failure)
+                }
+                e.printStackTrace()
             }
-        } catch (e: IOException) {
-            Log.e(AppConfig.TAG, "Failed to get logcat", e)
         }
     }
 
-    private fun clearLogcat() {
+    private fun processLogs(logs: List<String>): List<String> {
-        try {
+        val processedLogs = mutableListOf<String>()
-            lifecycleScope.launch(Dispatchers.Default) {
+        var isNotMatch = false
-                val lst = LinkedHashSet<String>()
+
-                lst.add("logcat")
+        for (line in logs) {
-                lst.add("-c")
+            when {
-                withContext(Dispatchers.IO) {
+                line.contains("zxing.NotFoundException", ignoreCase = true) -> {
-                    val process = Runtime.getRuntime().exec(lst.toTypedArray())
+                    if (!isNotMatch) {
-                    process.waitFor()
+                        if (throttleManager.shouldProcess("NotFoundException")) {
-                }
+                            processedLogs.add(line)
-                launch(Dispatchers.Main) {
+                            isNotMatch = true
-                    logsetsAll.clear()
+                        }
-                    logsets.clear()
+                    }
-                    refreshData()
                 }
+                else -> processedLogs.add(line)
             }
-        } catch (e: IOException) {
+        }
-            Log.e(AppConfig.TAG, "Failed to clear logcat", e)
+
+        return processedLogs.take(500)
+    }
+
+    private fun updateLogDisplay(logs: List<String>) {
+        binding.tvLogcat.text = logs.joinToString("\n")
+        binding.tvLogcat.movementMethod = ScrollingMovementMethod()
+        binding.pbWaiting.visibility = View.GONE
+
+        Handler(Looper.getMainLooper()).post {
+            binding.svLogcat.fullScroll(View.FOCUS_DOWN)
         }
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_logcat, menu)
-
-        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"))
+            Utils.setClipboard(this, binding.tvLogcat.text.toString())
-            toastSuccess(R.string.toast_success)
+            toast(R.string.toast_success)
             true
         }
-
         R.id.clear_all -> {
-            clearLogcat()
+            throttleManager.reset("zxing.NotFoundException")
+            logcat(true)
             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/MainActivity.kt

@@ -1,18 +1,18 @@
 package com.v2ray.ang.ui
 
 import android.Manifest
-import android.annotation.SuppressLint
+import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
+import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -23,17 +23,17 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.tabs.TabLayout
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityMainBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MigrateManager
 import com.v2ray.ang.handler.MmkvManager
@@ -41,10 +41,14 @@ import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 import com.v2ray.ang.viewmodel.MainViewModel
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import me.drakeet.support.toast.ToastCompat
+import java.util.concurrent.TimeUnit
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
     private val binding by lazy {
@@ -77,53 +81,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     private var mItemTouchHelper: ItemTouchHelper? = null
     val mainViewModel: MainViewModel by viewModels()
 
-    // register activity result for requesting permission
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                when (pendingAction) {
-                    Action.IMPORT_QR_CODE_CONFIG ->
-                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
-
-                    Action.READ_CONTENT_FROM_URI ->
-                        chooseFileForCustomConfig.launch(Intent.createChooser(Intent(Intent.ACTION_GET_CONTENT).apply {
-                            type = "*/*"
-                            addCategory(Intent.CATEGORY_OPENABLE)
-                        }, getString(R.string.title_file_chooser)))
-
-                    Action.POST_NOTIFICATIONS -> {}
-                    else -> {}
-                }
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-            pendingAction = Action.NONE
-        }
-
-    private var pendingAction: Action = Action.NONE
-
-    enum class Action {
-        NONE,
-        IMPORT_QR_CODE_CONFIG,
-        READ_CONTENT_FROM_URI,
-        POST_NOTIFICATIONS
-    }
-
-    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            readContentFromUri(uri)
-        }
-    }
-
-    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == RESULT_OK) {
-            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
@@ -132,7 +89,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
         binding.fab.setOnClickListener {
             if (mainViewModel.isRunning.value == true) {
-                V2RayServiceManager.stopVService(this)
+                Utils.stopVService(this)
             } else if ((MmkvManager.decodeSettingsString(AppConfig.PREF_MODE) ?: VPN) == VPN) {
                 val intent = VpnService.prepare(this)
                 if (intent == null) {
@@ -154,12 +111,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         binding.recyclerView.setHasFixedSize(true)
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)) {
+        binding.recyclerView.layoutManager = LinearLayoutManager(this)
-            binding.recyclerView.layoutManager = GridLayoutManager(this, 2)
-        } else {
-            binding.recyclerView.layoutManager = GridLayoutManager(this, 1)
-        }
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
@@ -177,10 +129,12 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         migrateLegacy()
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+            RxPermissions(this)
-                pendingAction = Action.POST_NOTIFICATIONS
+                .request(Manifest.permission.POST_NOTIFICATIONS)
-                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+                .subscribe {
-            }
+                    if (!it)
+                        toast(R.string.toast_permission_denied_notification)
+                }
         }
 
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
@@ -188,15 +142,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                 if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
                     binding.drawerLayout.closeDrawer(GravityCompat.START)
                 } else {
-                    isEnabled = false
+                    //super.onBackPressed()
                     onBackPressedDispatcher.onBackPressed()
-                    isEnabled = true
                 }
             }
         })
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private fun setupViewModel() {
         mainViewModel.updateListAction.observe(this) { index ->
             if (index >= 0) {
@@ -262,22 +214,23 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         binding.tabGroup.isVisible = true
     }
 
-    private fun startV2Ray() {
+    fun startV2Ray() {
         if (MmkvManager.getSelectServer().isNullOrEmpty()) {
             toast(R.string.title_file_chooser)
             return
         }
-        V2RayServiceManager.startVService(this)
+        V2RayServiceManager.startV2Ray(this)
     }
 
-    private fun restartV2Ray() {
+    fun restartV2Ray() {
         if (mainViewModel.isRunning.value == true) {
-            V2RayServiceManager.stopVService(this)
+            Utils.stopVService(this)
-        }
-        lifecycleScope.launch {
-            delay(500)
-            startV2Ray()
         }
+        Observable.timer(500, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                startV2Ray()
+            }
     }
 
     public override fun onResume() {
@@ -314,7 +267,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
         R.id.import_qrcode -> {
-            importQRcode()
+            importQRcode(true)
             true
         }
 
@@ -323,11 +276,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
-        R.id.import_local -> {
-            importConfigLocal()
-            true
-        }
-
         R.id.import_manually_vmess -> {
             importManually(EConfigType.VMESS.value)
             true
@@ -368,8 +316,44 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
+        R.id.import_config_custom_clipboard -> {
+            importConfigCustomClipboard()
+            true
+        }
+
+        R.id.import_config_custom_local -> {
+            importConfigCustomLocal()
+            true
+        }
+
+        R.id.import_config_custom_url -> {
+            importConfigCustomUrlClipboard()
+            true
+        }
+
+        R.id.import_config_custom_url_scan -> {
+            importQRcode(false)
+            true
+        }
+
+        R.id.sub_update -> {
+            importConfigViaSub()
+            true
+        }
+
         R.id.export_all -> {
-            exportAll()
+            binding.pbWaiting.show()
+            lifecycleScope.launch(Dispatchers.IO) {
+                val ret = mainViewModel.exportAllServer()
+                launch(Dispatchers.Main) {
+                    if (ret > 0)
+                        toast(getString(R.string.title_export_config_count, ret))
+                    else
+                        toast(R.string.toast_failure)
+                    binding.pbWaiting.hide()
+                }
+            }
+
             true
         }
 
@@ -391,31 +375,77 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         }
 
         R.id.del_all_config -> {
-            delAllConfig()
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    binding.pbWaiting.show()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val ret = mainViewModel.removeAllServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            toast(getString(R.string.title_del_config_count, ret))
+                            binding.pbWaiting.hide()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
             true
         }
 
         R.id.del_duplicate_config -> {
-            delDuplicateConfig()
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    binding.pbWaiting.show()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val ret = mainViewModel.removeDuplicateServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            toast(getString(R.string.title_del_duplicate_config_count, ret))
+                            binding.pbWaiting.hide()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
             true
         }
 
         R.id.del_invalid_config -> {
-            delInvalidConfig()
+            AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    binding.pbWaiting.show()
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val ret = mainViewModel.removeInvalidServer()
+                        launch(Dispatchers.Main) {
+                            mainViewModel.reloadServerList()
+                            toast(getString(R.string.title_del_config_count, ret))
+                            binding.pbWaiting.hide()
+                        }
+                    }
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
             true
         }
 
         R.id.sort_by_test_results -> {
-            sortByTestResults()
+            binding.pbWaiting.show()
+            lifecycleScope.launch(Dispatchers.IO) {
+                mainViewModel.sortByTestResults()
+                launch(Dispatchers.Main) {
+                    mainViewModel.reloadServerList()
+                    binding.pbWaiting.hide()
+                }
+            }
             true
         }
 
-        R.id.sub_update -> {
-            importConfigViaSub()
-            true
-        }
-
-
         else -> super.onOptionsItemSelected(item)
     }
 
@@ -431,17 +461,39 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     /**
      * import config from qrcode
      */
-    private fun importQRcode(): Boolean {
+    private fun importQRcode(forConfig: Boolean): Boolean {
-        val permission = Manifest.permission.CAMERA
+//        try {
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+//            startActivityForResult(Intent("com.google.zxing.client.android.SCAN")
-            scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+//                    .addCategory(Intent.CATEGORY_DEFAULT)
-        } else {
+//                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), requestCode)
-            pendingAction = Action.IMPORT_QR_CODE_CONFIG
+//        } catch (e: Exception) {
-            requestPermissionLauncher.launch(permission)
+        RxPermissions(this)
-        }
+            .request(Manifest.permission.CAMERA)
+            .subscribe {
+                if (it)
+                    if (forConfig)
+                        scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java))
+                    else
+                        scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java))
+                else
+                    toast(R.string.toast_permission_denied)
+            }
+//        }
         return true
     }
 
+    private val scanQRCodeForConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_OK) {
+            importBatchConfig(it.data?.getStringExtra("SCAN_RESULT"))
+        }
+    }
+
+    private val scanQRCodeForUrlToCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == RESULT_OK) {
+            importConfigCustomUrl(it.data?.getStringExtra("SCAN_RESULT"))
+        }
+    }
+
     /**
      * import config from clipboard
      */
@@ -451,7 +503,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             val clipboard = Utils.getClipboard(this)
             importBatchConfig(clipboard)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to import config from clipboard", e)
+            e.printStackTrace()
             return false
         }
         return true
@@ -472,38 +524,100 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                         }
 
                         countSub > 0 -> initGroupTab()
-                        else -> toastError(R.string.toast_failure)
+                        else -> toast(R.string.toast_failure)
                     }
                     binding.pbWaiting.hide()
                 }
             } catch (e: Exception) {
                 withContext(Dispatchers.Main) {
-                    toastError(R.string.toast_failure)
+                    toast(R.string.toast_failure)
                     binding.pbWaiting.hide()
                 }
-                Log.e(AppConfig.TAG, "Failed to import batch config", e)
+                e.printStackTrace()
             }
         }
     }
 
+
+    private fun importConfigCustomClipboard()
+            : Boolean {
+        try {
+            val configText = Utils.getClipboard(this)
+            if (TextUtils.isEmpty(configText)) {
+                toast(R.string.toast_none_data_clipboard)
+                return false
+            }
+            importCustomizeConfig(configText)
+            return true
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+    }
+
     /**
      * import config from local config file
      */
-    private fun importConfigLocal(): Boolean {
+    private fun importConfigCustomLocal(): Boolean {
         try {
             showFileChooser()
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to import config from local file", e)
+            e.printStackTrace()
             return false
         }
         return true
     }
 
+    private fun importConfigCustomUrlClipboard()
+            : Boolean {
+        try {
+            val url = Utils.getClipboard(this)
+            if (TextUtils.isEmpty(url)) {
+                toast(R.string.toast_none_data_clipboard)
+                return false
+            }
+            return importConfigCustomUrl(url)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+    }
+
+    /**
+     * import config from url
+     */
+    private fun importConfigCustomUrl(url: String?): Boolean {
+        try {
+            if (!Utils.isValidUrl(url)) {
+                toast(R.string.toast_invalid_url)
+                return false
+            }
+            lifecycleScope.launch(Dispatchers.IO) {
+                val configText = try {
+                    Utils.getUrlContentWithCustomUserAgent(url)
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                    ""
+                }
+                launch(Dispatchers.Main) {
+                    importCustomizeConfig(configText)
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return false
+        }
+        return true
+    }
 
     /**
      * import config from sub
      */
     private fun importConfigViaSub(): Boolean {
+//        val dialog = AlertDialog.Builder(this)
+//            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+//            .setCancelable(false)
+//            .show()
         binding.pbWaiting.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
@@ -514,96 +628,15 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
                     toast(getString(R.string.title_update_config_count, count))
                     mainViewModel.reloadServerList()
                 } else {
-                    toastError(R.string.toast_failure)
+                    toast(R.string.toast_failure)
                 }
+                //dialog.dismiss()
                 binding.pbWaiting.hide()
             }
         }
         return true
     }
 
-    private fun exportAll() {
-        binding.pbWaiting.show()
-        lifecycleScope.launch(Dispatchers.IO) {
-            val ret = mainViewModel.exportAllServer()
-            launch(Dispatchers.Main) {
-                if (ret > 0)
-                    toast(getString(R.string.title_export_config_count, ret))
-                else
-                    toastError(R.string.toast_failure)
-                binding.pbWaiting.hide()
-            }
-        }
-    }
-
-    private fun delAllConfig() {
-        AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val ret = mainViewModel.removeAllServer()
-                    launch(Dispatchers.Main) {
-                        mainViewModel.reloadServerList()
-                        toast(getString(R.string.title_del_config_count, ret))
-                        binding.pbWaiting.hide()
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                //do noting
-            }
-            .show()
-    }
-
-    private fun delDuplicateConfig() {
-        AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val ret = mainViewModel.removeDuplicateServer()
-                    launch(Dispatchers.Main) {
-                        mainViewModel.reloadServerList()
-                        toast(getString(R.string.title_del_duplicate_config_count, ret))
-                        binding.pbWaiting.hide()
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                //do noting
-            }
-            .show()
-    }
-
-    private fun delInvalidConfig() {
-        AlertDialog.Builder(this).setMessage(R.string.del_invalid_config_comfirm)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                binding.pbWaiting.show()
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val ret = mainViewModel.removeInvalidServer()
-                    launch(Dispatchers.Main) {
-                        mainViewModel.reloadServerList()
-                        toast(getString(R.string.title_del_config_count, ret))
-                        binding.pbWaiting.hide()
-                    }
-                }
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                //do noting
-            }
-            .show()
-    }
-
-    private fun sortByTestResults() {
-        binding.pbWaiting.show()
-        lifecycleScope.launch(Dispatchers.IO) {
-            mainViewModel.sortByTestResults()
-            launch(Dispatchers.Main) {
-                mainViewModel.reloadServerList()
-                binding.pbWaiting.hide()
-            }
-        }
-    }
-
     /**
      * show file chooser
      */
@@ -612,17 +645,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         intent.type = "*/*"
         intent.addCategory(Intent.CATEGORY_OPENABLE)
 
-        val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        try {
-            Manifest.permission.READ_MEDIA_IMAGES
-        } else {
-            Manifest.permission.READ_EXTERNAL_STORAGE
-        }
-
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
-            pendingAction = Action.READ_CONTENT_FROM_URI
             chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser)))
-        } else {
+        } catch (ex: ActivityNotFoundException) {
-            requestPermissionLauncher.launch(permission)
+            toast(R.string.toast_require_file_manager)
+        }
+    }
+
+    private val chooseFileForCustomConfig = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val uri = it.data?.data
+        if (it.resultCode == RESULT_OK && uri != null) {
+            readContentFromUri(uri)
         }
     }
 
@@ -635,17 +668,42 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         } else {
             Manifest.permission.READ_EXTERNAL_STORAGE
         }
-
+        RxPermissions(this)
-        if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+            .request(permission)
-            try {
+            .subscribe {
-                contentResolver.openInputStream(uri).use { input ->
+                if (it) {
-                    importBatchConfig(input?.bufferedReader()?.readText())
+                    try {
-                }
+                        contentResolver.openInputStream(uri).use { input ->
-            } catch (e: Exception) {
+                            importCustomizeConfig(input?.bufferedReader()?.readText())
-                Log.e(AppConfig.TAG, "Failed to read content from URI", e)
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                } else
+                    toast(R.string.toast_permission_denied)
             }
-        } else {
+    }
-            requestPermissionLauncher.launch(permission)
+
+    /**
+     * import customize config
+     */
+    private fun importCustomizeConfig(server: String?) {
+        try {
+            if (server == null || TextUtils.isEmpty(server)) {
+                toast(R.string.toast_none_data)
+                return
+            }
+            if (mainViewModel.appendCustomConfigServer(server)) {
+                mainViewModel.reloadServerList()
+                toast(R.string.toast_success)
+            } else {
+                toast(R.string.toast_failure)
+            }
+            //adapter.notifyItemInserted(mainViewModel.serverList.lastIndex)
+        } catch (e: Exception) {
+            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
+            e.printStackTrace()
+            return
         }
     }
 
@@ -674,22 +732,35 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         // Handle navigation view item clicks here.
         when (item.itemId) {
-            R.id.sub_setting -> requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
+            R.id.sub_setting -> {
-            R.id.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::class.java))
+                requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java))
-            R.id.routing_setting -> requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
+            }
-            R.id.user_asset_setting -> startActivity(Intent(this, UserAssetActivity::class.java))
-            R.id.settings -> startActivity(
-                Intent(this, SettingsActivity::class.java)
-                    .putExtra("isRunning", mainViewModel.isRunning.value == true)
-            )
 
-            R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.APP_PROMOTION_URL)}?t=${System.currentTimeMillis()}")
+            R.id.settings -> {
-            R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java))
+                startActivity(
-            R.id.check_for_update -> startActivity(Intent(this, CheckUpdateActivity::class.java))
+                    Intent(this, SettingsActivity::class.java)
-            R.id.about -> startActivity(Intent(this, AboutActivity::class.java))
+                        .putExtra("isRunning", mainViewModel.isRunning.value == true)
+                )
+            }
+
+            R.id.routing_setting -> {
+                requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java))
+            }
+
+
+            R.id.promotion -> {
+                Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
+            }
+
+            R.id.logcat -> {
+                startActivity(Intent(this, LogcatActivity::class.java))
+            }
+
+            R.id.about -> {
+                startActivity(Intent(this, AboutActivity::class.java))
+            }
         }
-
         binding.drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
-}
+}

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

@@ -3,13 +3,11 @@ 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
@@ -18,18 +16,16 @@ 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 com.v2ray.ang.util.Utils
-import kotlinx.coroutines.delay
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import kotlinx.coroutines.launch
+import io.reactivex.rxjava3.core.Observable
+import java.util.concurrent.TimeUnit
 
 class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<MainRecyclerAdapter.BaseViewHolder>(), ItemTouchHelperAdapter {
     companion object {
@@ -41,278 +37,169 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
     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
+//            //filter
+//            if (mActivity.mainViewModel.subscriptionId.isNotEmpty()
+//                && mActivity.mainViewModel.subscriptionId != config.subscriptionId
+//            ) {
+//                holder.itemMainBinding.cardView.visibility = View.GONE
+//            } else {
+//                holder.itemMainBinding.cardView.visibility = View.VISIBLE
+//            }
 
-            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.tvName.text = profile.remarks
+            holder.itemView.setBackgroundColor(Color.TRANSPARENT)
             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)
             }
+            holder.itemMainBinding.tvSubscription.text = MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks ?: ""
 
-            //subscription remarks
+            var shareOptions = share_method.asList()
-            val subRemarks = getSubscriptionRemarks(profile)
+            when (profile.configType) {
-            holder.itemMainBinding.tvSubscription.text = subRemarks
+                EConfigType.CUSTOM -> {
-            holder.itemMainBinding.layoutSubscription.visibility = if (subRemarks.isEmpty()) View.GONE else View.VISIBLE
+                    holder.itemMainBinding.tvType.text = mActivity.getString(R.string.server_customize_config)
-
+                    shareOptions = shareOptions.takeLast(1)
-            //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 {
+                else -> {
-                    editServer(guid, profile)
+                    holder.itemMainBinding.tvType.text = profile.configType.name
                 }
-                holder.itemMainBinding.layoutRemove.setOnClickListener {
+            }
-                    removeServer(guid, position)
+
+            // 隐藏主页服务器地址为xxx:xxx:***/xxx.xxx.xxx.***
+            val strState = "${
+                profile.server?.let {
+                    if (it.contains(":"))
+                        it.split(":").take(2).joinToString(":", postfix = ":***")
+                    else
+                        it.split('.').dropLast(1).joinToString(".", postfix = ".***")
+                }
+            } : ${profile.serverPort}"
+
+            holder.itemMainBinding.tvStatistics.text = strState
+
+            holder.itemMainBinding.layoutShare.setOnClickListener {
+                AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i ->
+                    try {
+                        when (i) {
+                            0 -> {
+                                if (profile.configType == EConfigType.CUSTOM) {
+                                    shareFullContent(guid)
+                                } else {
+                                    val ivBinding = ItemQrcodeBinding.inflate(LayoutInflater.from(mActivity))
+                                    ivBinding.ivQcode.setImageBitmap(AngConfigManager.share2QRCode(guid))
+                                    AlertDialog.Builder(mActivity).setView(ivBinding.root).show()
+                                }
+                            }
+
+                            1 -> {
+                                if (AngConfigManager.share2Clipboard(mActivity, guid) == 0) {
+                                    mActivity.toast(R.string.toast_success)
+                                } else {
+                                    mActivity.toast(R.string.toast_failure)
+                                }
+                            }
+
+                            2 -> shareFullContent(guid)
+                            else -> mActivity.toast("else")
+                        }
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }.show()
+            }
+
+            holder.itemMainBinding.layoutEdit.setOnClickListener {
+                val intent = Intent().putExtra("guid", guid)
+                    .putExtra("isRunning", isRunning)
+                    .putExtra("createConfigType", profile.configType.value)
+                if (profile.configType == EConfigType.CUSTOM) {
+                    mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java))
+                } else {
+                    mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java))
+                }
+            }
+            holder.itemMainBinding.layoutRemove.setOnClickListener {
+                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) { _, _ ->
+                                removeServer(guid, position)
+                            }
+                            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                                //do noting
+                            }
+                            .show()
+                    } else {
+                        removeServer(guid, position)
+                    }
+                } else {
+                    application.toast(R.string.toast_action_not_allowed)
                 }
             }
 
             holder.itemMainBinding.infoContainer.setOnClickListener {
-                setSelectServer(guid)
+                val selected = MmkvManager.getSelectServer()
-            }
+                if (guid != selected) {
-        }
+                    MmkvManager.setSelectServer(guid)
-//        if (holder is FooterViewHolder) {
+                    if (!TextUtils.isEmpty(selected)) {
-//            if (true) {
+                        notifyItemChanged(mActivity.mainViewModel.getPosition(selected.orEmpty()))
-//                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
+                    }
-//            } else {
+                    notifyItemChanged(mActivity.mainViewModel.getPosition(guid))
-//                holder.itemFooterBinding.layoutEdit.setOnClickListener {
+                    if (isRunning) {
-//                    Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
+                        Utils.stopVService(mActivity)
-//                }
+                        Observable.timer(500, TimeUnit.MILLISECONDS)
-//            }
+                            .observeOn(AndroidSchedulers.mainThread())
-//        }
+                            .subscribe {
-    }
+                                V2RayServiceManager.startV2Ray(mActivity)
-
+                            }
-    /**
+                    }
-     * 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)
                 }
             }
         }
-    }
+        if (holder is FooterViewHolder) {
-
+            //if (activity?.defaultDPreference?.getPrefBoolean(AppConfig.PREF_INAPP_BUY_IS_PREMIUM, false)) {
-    /**
+            if (true) {
-     * Edits server configuration
+                holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE
-     * 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)
+                holder.itemFooterBinding.layoutEdit.setOnClickListener {
+                    Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}")
+                }
             }
-        } else {
-            application.toast(R.string.toast_action_not_allowed)
         }
     }
 
-    /**
+    private fun shareFullContent(guid: String) {
-     * Executes the actual server removal process
+        if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) {
-     * @param guid The server unique identifier
+            mActivity.toast(R.string.toast_success)
-     * @param position The position in the list
+        } else {
-     */
+            mActivity.toast(R.string.toast_failure)
-    private fun removeServerSub(guid: String, position: Int) {
+        }
+    }
+
+    private fun removeServer(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 ->
@@ -359,4 +246,4 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
 
     override fun onItemDismiss(position: Int) {
     }
-}
+}

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

@@ -1,35 +1,35 @@
 package com.v2ray.ang.ui
 
-import android.annotation.SuppressLint
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.Toast
+import android.view.View
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityBypassListBinding
 import com.v2ray.ang.dto.AppInfo
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.extension.v2RayApplication
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.AppManagerUtil
-import com.v2ray.ang.util.HttpUtil
 import com.v2ray.ang.util.Utils
-import es.dmoral.toasty.Toasty
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.text.Collator
 
 class PerAppProxyActivity : BaseActivity() {
-    private val binding by lazy { ActivityBypassListBinding.inflate(layoutInflater) }
+    private val binding by lazy {
+        ActivityBypassListBinding.inflate(layoutInflater)
+    }
 
     private var adapter: PerAppProxyAdapter? = null
     private var appsAll: List<AppInfo>? = null
@@ -38,43 +38,98 @@ class PerAppProxyActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        title = getString(R.string.per_app_proxy_settings)
+        val dividerItemDecoration = DividerItemDecoration(this, LinearLayoutManager.VERTICAL)
+        binding.recyclerView.addItemDecoration(dividerItemDecoration)
 
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
+        val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
 
-        lifecycleScope.launch {
+        AppManagerUtil.rxLoadNetworkAppList(this)
-            try {
+            .subscribeOn(Schedulers.io())
-                binding.pbWaiting.show()
+            .map {
-                val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET)
+                if (blacklist != null) {
-                val apps = withContext(Dispatchers.IO) {
+                    it.forEach { one ->
-                    val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity)
+                        if (blacklist.contains(one.packageName)) {
-
+                            one.isSelected = 1
-                    if (blacklist != null) {
+                        } else {
-                        appsList.forEach { app ->
+                            one.isSelected = 0
-                            app.isSelected = if (blacklist.contains(app.packageName)) 1 else 0
                         }
-                        appsList.sortedWith { p1, p2 ->
-                            when {
-                                p1.isSelected > p2.isSelected -> -1
-                                p1.isSelected == p2.isSelected -> 0
-                                else -> 1
-                            }
-                        }
-                    } else {
-                        val collator = Collator.getInstance()
-                        appsList.sortedWith(compareBy(collator) { it.appName })
                     }
+                    val comparator = Comparator<AppInfo> { p1, p2 ->
+                        when {
+                            p1.isSelected > p2.isSelected -> -1
+                            p1.isSelected == p2.isSelected -> 0
+                            else -> 1
+                        }
+                    }
+                    it.sortedWith(comparator)
+                } else {
+                    val comparator = object : Comparator<AppInfo> {
+                        val collator = Collator.getInstance()
+                        override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
+                    }
+                    it.sortedWith(comparator)
                 }
-
-                appsAll = apps
-                adapter = PerAppProxyAdapter(this@PerAppProxyActivity, apps, blacklist)
-                binding.recyclerView.adapter = adapter
-                binding.pbWaiting.hide()
-            } catch (e: Exception) {
-                binding.pbWaiting.hide()
-                Log.e(ANG_PACKAGE, "Error loading apps", e)
             }
+//                .map {
+//                    val comparator = object : Comparator<AppInfo> {
+//                        val collator = Collator.getInstance()
+//                        override fun compare(o1: AppInfo, o2: AppInfo) = collator.compare(o1.appName, o2.appName)
+//                    }
+//                    it.sortedWith(comparator)
+//                }
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe {
+                appsAll = it
+                adapter = PerAppProxyAdapter(this, it, blacklist)
+                binding.recyclerView.adapter = adapter
+                binding.pbWaiting.visibility = View.GONE
+            }
+        /***
+        recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        var dst = 0
+        val threshold = resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 2
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+        dst += dy
+        if (dst > threshold) {
+        header_view.hide()
+        dst = 0
+        } else if (dst < -20) {
+        header_view.show()
+        dst = 0
         }
+        }
+
+        var hiding = false
+        fun View.hide() {
+        val target = -height.toFloat()
+        if (hiding || translationY == target) return
+        animate()
+        .translationY(target)
+        .setInterpolator(AccelerateInterpolator(2F))
+        .setListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationEnd(animation: Animator?) {
+        hiding = false
+        }
+        })
+        hiding = true
+        }
+
+        var showing = false
+        fun View.show() {
+        val target = 0f
+        if (showing || translationY == target) return
+        animate()
+        .translationY(target)
+        .setInterpolator(DecelerateInterpolator(2F))
+        .setListener(object : AnimatorListenerAdapter() {
+        override fun onAnimationEnd(animation: Animator?) {
+        showing = false
+        }
+        })
+        showing = true
+        }
+        })
+         ***/
 
         binding.switchPerAppProxy.setOnCheckedChangeListener { _, isChecked ->
             MmkvManager.encodeSettings(AppConfig.PREF_PER_APP_PROXY, isChecked)
@@ -86,9 +141,35 @@ class PerAppProxyActivity : BaseActivity() {
         }
         binding.switchBypassApps.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_BYPASS_APPS, false)
 
-        binding.layoutSwitchBypassAppsTips.setOnClickListener {
+        /***
-            Toasty.info(this, R.string.summary_pref_per_app_proxy, Toast.LENGTH_LONG, true).show()
+        et_search.setOnEditorActionListener { v, actionId, event ->
+        if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+        //hide
+        var imm: InputMethodManager = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.toggleSoftInput(0, InputMethodManager.HIDE_NOT_ALWAYS)
+
+        val key = v.text.toString().toUpperCase()
+        val apps = ArrayList<AppInfo>()
+        if (TextUtils.isEmpty(key)) {
+        appsAll?.forEach {
+        apps.add(it)
         }
+        } else {
+        appsAll?.forEach {
+        if (it.appName.toUpperCase().indexOf(key) >= 0) {
+        apps.add(it)
+        }
+        }
+        }
+        adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
+        recycler_view.adapter = adapter
+        adapter?.notifyDataSetChanged()
+        true
+        } else {
+        false
+        }
+        }
+         ***/
     }
 
     override fun onPause() {
@@ -118,10 +199,8 @@ class PerAppProxyActivity : BaseActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
-
-    @SuppressLint("NotifyDataSetChanged")
     override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.select_all -> adapter?.let { it ->
+        R.id.select_all -> adapter?.let {
             val pkgNames = it.apps.map { it.packageName }
             if (it.blacklist.containsAll(pkgNames)) {
                 it.apps.forEach {
@@ -158,20 +237,13 @@ class PerAppProxyActivity : BaseActivity() {
 
     private fun selectProxyApp() {
         toast(R.string.msg_downloading_content)
-        binding.pbWaiting.show()
+        val url = AppConfig.androidpackagenamelistUrl
-
-        val url = AppConfig.ANDROID_PACKAGE_NAME_LIST_URL
         lifecycleScope.launch(Dispatchers.IO) {
-            var content = HttpUtil.getUrlContent(url, 5000)
+            val content = Utils.getUrlContext(url, 5000)
-            if (content.isNullOrEmpty()) {
-                val httpPort = SettingsManager.getHttpPort()
-                content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: ""
-            }
             launch(Dispatchers.Main) {
-                Log.i(AppConfig.TAG, content)
+                Log.d(ANG_PACKAGE, content)
                 selectProxyApp(content, true)
-                toastSuccess(R.string.toast_success)
+                toast(R.string.toast_success)
-                binding.pbWaiting.hide()
             }
         }
     }
@@ -180,7 +252,7 @@ class PerAppProxyActivity : BaseActivity() {
         val content = Utils.getClipboard(applicationContext)
         if (TextUtils.isEmpty(content)) return
         selectProxyApp(content, false)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
     }
 
     private fun exportProxyApp() {
@@ -190,10 +262,9 @@ class PerAppProxyActivity : BaseActivity() {
             lst = lst + System.getProperty("line.separator") + it
         }
         Utils.setClipboard(applicationContext, lst)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     private fun selectProxyApp(content: String, force: Boolean): Boolean {
         try {
             val proxyApps = if (TextUtils.isEmpty(content)) {
@@ -206,10 +277,10 @@ class PerAppProxyActivity : BaseActivity() {
             adapter?.blacklist?.clear()
 
             if (binding.switchBypassApps.isChecked) {
-                adapter?.let { it ->
+                adapter?.let {
                     it.apps.forEach block@{
                         val packageName = it.packageName
-                        Log.i(AppConfig.TAG, packageName)
+                        Log.d(ANG_PACKAGE, packageName)
                         if (!inProxyApps(proxyApps, packageName, force)) {
                             adapter?.blacklist?.add(packageName)
                             println(packageName)
@@ -219,10 +290,10 @@ class PerAppProxyActivity : BaseActivity() {
                     it.notifyDataSetChanged()
                 }
             } else {
-                adapter?.let { it ->
+                adapter?.let {
                     it.apps.forEach block@{
                         val packageName = it.packageName
-                        Log.i(AppConfig.TAG, packageName)
+                        Log.d(ANG_PACKAGE, packageName)
                         if (inProxyApps(proxyApps, packageName, force)) {
                             adapter?.blacklist?.add(packageName)
                             println(packageName)
@@ -233,7 +304,7 @@ class PerAppProxyActivity : BaseActivity() {
                 }
             }
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Error selecting proxy app", e)
+            e.printStackTrace()
             return false
         }
         return true
@@ -268,12 +339,7 @@ class PerAppProxyActivity : BaseActivity() {
 
         adapter = PerAppProxyAdapter(this, apps, adapter?.blacklist)
         binding.recyclerView.adapter = adapter
-        refreshData()
+        adapter?.notifyDataSetChanged()
         return true
     }
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun refreshData() {
-        adapter?.notifyDataSetChanged()
-    }
 }

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

@@ -4,6 +4,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemRecyclerBypassListBinding
 import com.v2ray.ang.dto.AppInfo
 
@@ -34,7 +35,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
                 val view = View(ctx)
                 view.layoutParams = ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    0
+                    ctx.resources.getDimensionPixelSize(R.dimen.bypass_list_header_height) * 0
                 )
                 BaseViewHolder(view)
             }

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

@@ -9,7 +9,6 @@ import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingEditBinding
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
@@ -79,7 +78,7 @@ class RoutingEditActivity : BaseActivity() {
         }
 
         SettingsManager.saveRoutingRuleset(position, rulesetItem)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
         finish()
         return true
     }

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

@@ -1,24 +1,23 @@
 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 android.view.View
+import android.widget.AdapterView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityRoutingSettingBinding
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.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
@@ -41,16 +40,6 @@ class RoutingSettingActivity : BaseActivity() {
         resources.getStringArray(R.array.preset_rulesets)
     }
 
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
@@ -59,15 +48,20 @@ class RoutingSettingActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
         mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
 
-        binding.tvDomainStrategySummary.text = getDomainStrategy()
+        val found = Utils.arrayFind(routing_domain_strategy, MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "")
-        binding.layoutDomainStrategy.setOnClickListener {
+        found.let { binding.spDomainStrategy.setSelection(if (it >= 0) it else 0) }
-            setDomainStrategy()
+        binding.spDomainStrategy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, routing_domain_strategy[position])
+            }
         }
     }
 
@@ -81,90 +75,97 @@ class RoutingSettingActivity : BaseActivity() {
         return super.onCreateOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true }
+        R.id.add_rule -> {
-        R.id.import_predefined_rulesets -> importPredefined().let { true }
+            startActivity(Intent(this, RoutingEditActivity::class.java))
-        R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true }
+            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 {
+        R.id.user_asset_setting -> {
-        return MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: routing_domain_strategy.first()
+            startActivity(Intent(this, UserAssetActivity::class.java))
-    }
+            true
+        }
 
-    private fun setDomainStrategy() {
+        R.id.import_predefined_rulesets -> {
-        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 {
+                    AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i ->
-                        lifecycleScope.launch(Dispatchers.IO) {
+                        try {
-                            SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
+                            lifecycleScope.launch(Dispatchers.IO) {
-                            launch(Dispatchers.Main) {
+                                SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i)
+                                launch(Dispatchers.Main) {
+                                    refreshData()
+                                    toast(R.string.toast_success)
+                                }
+                            }
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+                    }.show()
+
+
+                }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    //do noting
+                }
+                .show()
+            true
+        }
+
+        R.id.import_rulesets_from_clipboard -> {
+            AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
+                    val clipboard = try {
+                        Utils.getClipboard(this)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                        toast(R.string.toast_failure)
+                        return@setPositiveButton
+                    }
+                    lifecycleScope.launch(Dispatchers.IO) {
+                        val result = SettingsManager.resetRoutingRulesets(clipboard)
+                        withContext(Dispatchers.Main) {
+                            if (result) {
                                 refreshData()
-                                toastSuccess(R.string.toast_success)
+                                toast(R.string.toast_success)
+                            } else {
+                                toast(R.string.toast_failure)
                             }
                         }
-                    } catch (e: Exception) {
-                        Log.e(AppConfig.TAG, "Failed to import predefined ruleset", e)
                     }
                 }
                 .setNegativeButton(android.R.string.cancel) { _, _ ->
                     //do nothing
                 }
                 .show()
-        }.show()
+            true
-    }
-
-    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)
         }
+
+        R.id.import_rulesets_from_qrcode -> {
+            RxPermissions(this)
+                .request(Manifest.permission.CAMERA)
+                .subscribe {
+                    if (it)
+                        scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java))
+                    else
+                        toast(R.string.toast_permission_denied)
+                }
+            true
+        }
+
+
+        R.id.export_rulesets_to_clipboard -> {
+            val rulesetList = MmkvManager.decodeRoutingRulesets()
+            if (rulesetList.isNullOrEmpty()) {
+                toast(R.string.toast_failure)
+            } else {
+                Utils.setClipboard(this, JsonUtil.toJson(rulesetList))
+                toast(R.string.toast_success)
+            }
+            true
+        }
+
+        else -> super.onOptionsItemSelected(item)
     }
 
     private val scanQRcodeForRulesets = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -181,9 +182,9 @@ class RoutingSettingActivity : BaseActivity() {
                     withContext(Dispatchers.Main) {
                         if (result) {
                             refreshData()
-                            toastSuccess(R.string.toast_success)
+                            toast(R.string.toast_success)
                         } else {
-                            toastError(R.string.toast_failure)
+                            toast(R.string.toast_failure)
                         }
                     }
                 }
@@ -195,10 +196,10 @@ class RoutingSettingActivity : BaseActivity() {
         return true
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     fun refreshData() {
         rulesets.clear()
         rulesets.addAll(MmkvManager.decodeRoutingRulesets() ?: mutableListOf())
         adapter.notifyDataSetChanged()
     }
-}
+
+}

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

@@ -4,49 +4,47 @@ import android.Manifest
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 
 class ScScannerActivity : BaseActivity() {
 
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRCode.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-            finish()
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_none)
         importQRcode()
     }
 
-    private fun importQRcode(): Boolean {
+    fun importQRcode(): Boolean {
-        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        RxPermissions(this)
+            .request(Manifest.permission.CAMERA)
+            .subscribe { granted ->
+                if (granted) {
+                    scanQRCode.launch(Intent(this, ScannerActivity::class.java))
+                } else {
+                    toast(R.string.toast_permission_denied)
+                }
+            }
         return true
     }
 
+
     private val scanQRCode = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
         if (it.resultCode == RESULT_OK) {
             val scanResult = it.data?.getStringExtra("SCAN_RESULT").orEmpty()
             val (count, countSub) = AngConfigManager.importBatchConfig(scanResult, "", false)
 
             if (count + countSub > 0) {
-                toastSuccess(R.string.toast_success)
+                toast(R.string.toast_success)
             } else {
-                toastError(R.string.toast_failure)
+                toast(R.string.toast_failure)
             }
 
             startActivity(Intent(this, MainActivity::class.java))
         }
         finish()
     }
-}
+
+}

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

@@ -3,6 +3,7 @@ package com.v2ray.ang.ui
 import android.os.Bundle
 import com.v2ray.ang.R
 import com.v2ray.ang.service.V2RayServiceManager
+import com.v2ray.ang.util.Utils
 
 class ScSwitchActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -11,10 +12,10 @@ class ScSwitchActivity : BaseActivity() {
 
         setContentView(R.layout.activity_none)
 
-        if (V2RayServiceManager.isRunning()) {
+        if (V2RayServiceManager.v2rayPoint.isRunning) {
-            V2RayServiceManager.stopVService(this)
+            Utils.stopVService(this)
         } else {
-            V2RayServiceManager.startVServiceFromToggle(this)
+            Utils.startVServiceFromToggle(this)
         }
         finish()
     }

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

@@ -2,15 +2,13 @@ package com.v2ray.ang.ui
 
 import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toast
@@ -22,39 +20,7 @@ import io.github.g00fy2.quickie.config.ScannerConfig
 
 class ScannerActivity : BaseActivity() {
 
-
     private val scanQrCode = registerForActivityResult(ScanCustomCode(), ::handleResult)
-    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        val uri = it.data?.data
-        if (it.resultCode == RESULT_OK && uri != null) {
-            try {
-                val inputStream = contentResolver.openInputStream(uri)
-                val bitmap = BitmapFactory.decodeStream(inputStream)
-                inputStream?.close()
-
-                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
-                if (text.isNullOrEmpty()) {
-                    toast(R.string.toast_decoding_failed)
-                } else {
-                    finished(text)
-                }
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to decode QR code from file", e)
-                toast(R.string.toast_decoding_failed)
-            }
-        }
-    }
-
-    private val requestPermissionLauncher =
-        registerForActivityResult(
-            ActivityResultContracts.RequestPermission()
-        ) { isGranted: Boolean ->
-            if (isGranted) {
-                showFileChooser()
-            } else {
-                toast(R.string.toast_permission_denied)
-            }
-        }
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -106,12 +72,15 @@ class ScannerActivity : BaseActivity() {
             } else {
                 Manifest.permission.READ_EXTERNAL_STORAGE
             }
-
+            RxPermissions(this)
-            if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) {
+                .request(permission)
-                showFileChooser()
+                .subscribe { granted ->
-            } else {
+                    if (granted) {
-                requestPermissionLauncher.launch(permission)
+                        showFileChooser()
-            }
+                    } else {
+                        toast(R.string.toast_permission_denied)
+                    }
+                }
             true
         }
 
@@ -131,4 +100,26 @@ class ScannerActivity : BaseActivity() {
             toast(R.string.toast_require_file_manager)
         }
     }
-}
+
+    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        val uri = it.data?.data
+        if (it.resultCode == RESULT_OK && uri != null) {
+            try {
+                val inputStream = contentResolver.openInputStream(uri)
+                val bitmap = BitmapFactory.decodeStream(inputStream)
+                inputStream?.close()
+
+                val text = QRCodeDecoder.syncDecodeQRCode(bitmap)
+                if (text.isNullOrEmpty()) {
+                    toast(R.string.toast_decoding_failed)
+                } else {
+                    finished(text)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                toast(R.string.toast_decoding_failed)
+            }
+        }
+    }
+
+}

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

@@ -2,6 +2,7 @@ package com.v2ray.ang.ui
 
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -13,11 +14,13 @@ import android.widget.Spinner
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.AppConfig.DEFAULT_PORT
 import com.v2ray.ang.AppConfig.PREF_ALLOW_INSECURE
 import com.v2ray.ang.AppConfig.REALITY
 import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
+import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
 import com.v2ray.ang.dto.EConfigType
@@ -25,7 +28,6 @@ import com.v2ray.ang.dto.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
@@ -124,8 +126,6 @@ class ServerActivity : BaseActivity() {
     private val et_port_hop: EditText? by lazy { findViewById(R.id.et_port_hop) }
     private val et_port_hop_interval: EditText? by lazy { findViewById(R.id.et_port_hop_interval) }
     private val et_pinsha256: EditText? by lazy { findViewById(R.id.et_pinsha256) }
-    private val et_bandwidth_down: EditText? by lazy { findViewById(R.id.et_bandwidth_down) }
-    private val et_bandwidth_up: EditText? by lazy { findViewById(R.id.et_bandwidth_up) }
     private val et_extra: EditText? by lazy { findViewById(R.id.et_extra) }
     private val layout_extra: LinearLayout? by lazy { findViewById(R.id.layout_extra) }
 
@@ -326,7 +326,7 @@ class ServerActivity : BaseActivity() {
             et_preshared_key?.text = Utils.getEditable(config.preSharedKey.orEmpty())
             et_reserved1?.text = Utils.getEditable(config.reserved ?: "0,0,0")
             et_local_address?.text = Utils.getEditable(
-                config.localAddress ?: WIREGUARD_LOCAL_ADDRESS_V4
+                config.localAddress ?: "$WIREGUARD_LOCAL_ADDRESS_V4,$WIREGUARD_LOCAL_ADDRESS_V6"
             )
             et_local_mtu?.text = Utils.getEditable(config.mtu?.toString() ?: WIREGUARD_LOCAL_MTU)
         } else if (config.configType == EConfigType.HYSTERIA2) {
@@ -334,8 +334,6 @@ class ServerActivity : BaseActivity() {
             et_port_hop?.text = Utils.getEditable(config.portHopping)
             et_port_hop_interval?.text = Utils.getEditable(config.portHoppingInterval)
             et_pinsha256?.text = Utils.getEditable(config.pinSHA256)
-            et_bandwidth_down?.text = Utils.getEditable(config.bandwidthDown)
-            et_bandwidth_up?.text = Utils.getEditable(config.bandwidthUp)
         }
         val securityEncryptions =
             if (config.configType == EConfigType.SHADOWSOCKS) shadowsocksSecuritys else securitys
@@ -352,13 +350,13 @@ class ServerActivity : BaseActivity() {
             container_alpn?.visibility = View.VISIBLE
 
             et_sni?.text = Utils.getEditable(config.sni)
-            config.fingerPrint?.let { it ->
+            config.fingerPrint?.let {
                 val utlsIndex = Utils.arrayFind(uTlsItems, it)
-                utlsIndex.let { sp_stream_fingerprint?.setSelection(if (it >= 0) it else 0) }
+                sp_stream_fingerprint?.setSelection(utlsIndex)
             }
-            config.alpn?.let { it ->
+            config.alpn?.let {
                 val alpnIndex = Utils.arrayFind(alpns, it)
-                alpnIndex.let { sp_stream_alpn?.setSelection(if (it >= 0) it else 0) }
+                sp_stream_alpn?.setSelection(alpnIndex)
             }
             if (config.security == TLS) {
                 container_allow_insecure?.visibility = View.VISIBLE
@@ -419,7 +417,7 @@ class ServerActivity : BaseActivity() {
         et_public_key?.text = null
         et_reserved1?.text = Utils.getEditable("0,0,0")
         et_local_address?.text =
-            Utils.getEditable(WIREGUARD_LOCAL_ADDRESS_V4)
+            Utils.getEditable("${WIREGUARD_LOCAL_ADDRESS_V4},${WIREGUARD_LOCAL_ADDRESS_V6}")
         et_local_mtu?.text = Utils.getEditable(WIREGUARD_LOCAL_MTU)
         return true
     }
@@ -478,9 +476,9 @@ class ServerActivity : BaseActivity() {
         if (config.subscriptionId.isEmpty() && !subscriptionId.isNullOrEmpty()) {
             config.subscriptionId = subscriptionId.orEmpty()
         }
-        //Log.i(AppConfig.TAG, JsonUtil.toJsonPretty(config) ?: "")
+        Log.d(ANG_PACKAGE, JsonUtil.toJsonPretty(config) ?: "")
         MmkvManager.encodeServerConfig(editGuid, config)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
         finish()
         return true
     }
@@ -515,8 +513,6 @@ class ServerActivity : BaseActivity() {
             config.portHopping = et_port_hop?.text?.toString()
             config.portHoppingInterval = et_port_hop_interval?.text?.toString()
             config.pinSHA256 = et_pinsha256?.text?.toString()
-            config.bandwidthDown = et_bandwidth_down?.text?.toString()
-            config.bandwidthUp = et_bandwidth_up?.text?.toString()
         }
     }
 

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

@@ -2,22 +2,21 @@ package com.v2ray.ang.ui
 
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import com.blacksquircle.ui.editorkit.utils.EditorTheme
 import com.blacksquircle.ui.language.json.JsonLanguage
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
+import me.drakeet.support.toast.ToastCompat
 
 class ServerCustomConfigActivity : BaseActivity() {
     private val binding by lazy { ActivityServerCustomConfigBinding.inflate(layoutInflater) }
@@ -78,8 +77,8 @@ class ServerCustomConfigActivity : BaseActivity() {
         val profileItem = try {
             CustomFmt.parse(binding.editor.text.toString())
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to parse custom configuration", e)
+            e.printStackTrace()
-            toast("${getString(R.string.toast_malformed_josn)} ${e.cause?.message}")
+            ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
             return false
         }
 
@@ -92,7 +91,7 @@ class ServerCustomConfigActivity : BaseActivity() {
 
         MmkvManager.encodeServerConfig(editGuid, config)
         MmkvManager.encodeServerRaw(editGuid, binding.editor.text.toString())
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
         finish()
         return true
     }

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

@@ -43,8 +43,6 @@ class SettingsActivity : BaseActivity() {
         private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
         private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
         private val vpnDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_DNS) }
-        private val vpnBypassLan by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_BYPASS_LAN) }
-        private val vpnInterfaceAddress by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX) }
 
         private val mux by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_MUX_ENABLED) }
         private val muxConcurrency by lazy { findPreference<EditTextPreference>(AppConfig.PREF_MUX_CONCURRENCY) }
@@ -162,7 +160,7 @@ class SettingsActivity : BaseActivity() {
             }
             delayTestUrl?.setOnPreferenceChangeListener { _, any ->
                 val nval = any as String
-                delayTestUrl?.summary = if (nval == "") AppConfig.DELAY_TEST_URL else nval
+                delayTestUrl?.summary = if (nval == "") AppConfig.DelayTestUrl else nval
                 true
             }
             mode?.setOnPreferenceChangeListener { _, newValue ->
@@ -203,7 +201,7 @@ class SettingsActivity : BaseActivity() {
             remoteDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS, AppConfig.DNS_PROXY)
             domesticDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS, AppConfig.DNS_DIRECT)
             dnsHosts?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS)
-            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DELAY_TEST_URL)
+            delayTestUrl?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL, AppConfig.DelayTestUrl)
 
             initSharedPreference()
         }
@@ -239,7 +237,6 @@ class SettingsActivity : BaseActivity() {
                 AppConfig.PREF_SPEED_ENABLED,
                 AppConfig.PREF_CONFIRM_REMOVE,
                 AppConfig.PREF_START_SCAN_IMMEDIATE,
-                AppConfig.PREF_DOUBLE_COLUMN_DISPLAY,
                 AppConfig.PREF_PREFER_IPV6,
                 AppConfig.PREF_PROXY_SHARING,
                 AppConfig.PREF_ALLOW_INSECURE
@@ -249,15 +246,12 @@ class SettingsActivity : BaseActivity() {
             }
 
             listOf(
-                AppConfig.PREF_VPN_BYPASS_LAN,
-                AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX,
                 AppConfig.PREF_ROUTING_DOMAIN_STRATEGY,
                 AppConfig.PREF_MUX_XUDP_QUIC,
                 AppConfig.PREF_FRAGMENT_PACKETS,
                 AppConfig.PREF_LANGUAGE,
                 AppConfig.PREF_UI_MODE_NIGHT,
                 AppConfig.PREF_LOGLEVEL,
-                AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD,
                 AppConfig.PREF_MODE
             ).forEach { key ->
                 if (MmkvManager.decodeSettingsString(key) != null) {
@@ -275,8 +269,6 @@ class SettingsActivity : BaseActivity() {
             appendHttpProxy?.isEnabled = vpn
             localDnsPort?.isEnabled = vpn
             vpnDns?.isEnabled = vpn
-            vpnBypassLan?.isEnabled = vpn
-            vpnInterfaceAddress?.isEnabled = vpn
             if (vpn) {
                 updateLocalDns(
                     MmkvManager.decodeSettingsBool(
@@ -367,6 +359,6 @@ class SettingsActivity : BaseActivity() {
     }
 
     fun onModeHelpClicked(view: View) {
-        Utils.openUri(this, AppConfig.APP_WIKI_MODE)
+        Utils.openUri(this, AppConfig.v2rayNGWikiMode)
     }
 }

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

@@ -6,12 +6,10 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubEditBinding
 import com.v2ray.ang.dto.SubscriptionItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
@@ -20,8 +18,8 @@ import kotlinx.coroutines.launch
 class SubEditActivity : BaseActivity() {
     private val binding by lazy { ActivitySubEditBinding.inflate(layoutInflater) }
 
-    private var del_config: MenuItem? = null
+    var del_config: MenuItem? = null
-    private var save_config: MenuItem? = null
+    var save_config: MenuItem? = null
 
     private val editSubId by lazy { intent.getStringExtra("subId").orEmpty() }
 
@@ -39,7 +37,7 @@ class SubEditActivity : BaseActivity() {
     }
 
     /**
-     * binding selected server config
+     * bingding seleced server config
      */
     private fun bindingServer(subItem: SubscriptionItem): Boolean {
         binding.etRemarks.text = Utils.getEditable(subItem.remarks)
@@ -47,7 +45,6 @@ class SubEditActivity : BaseActivity() {
         binding.etFilter.text = Utils.getEditable(subItem.filter)
         binding.chkEnable.isChecked = subItem.enabled
         binding.autoUpdateCheck.isChecked = subItem.autoUpdate
-        binding.allowInsecureUrl.isChecked = subItem.allowInsecureUrl
         binding.etPreProfile.text = Utils.getEditable(subItem.prevProfile)
         binding.etNextProfile.text = Utils.getEditable(subItem.nextProfile)
         return true
@@ -79,7 +76,6 @@ class SubEditActivity : BaseActivity() {
         subItem.autoUpdate = binding.autoUpdateCheck.isChecked
         subItem.prevProfile = binding.etPreProfile.text.toString()
         subItem.nextProfile = binding.etNextProfile.text.toString()
-        subItem.allowInsecureUrl = binding.allowInsecureUrl.isChecked
 
         if (TextUtils.isEmpty(subItem.remarks)) {
             toast(R.string.sub_setting_remarks)
@@ -93,14 +89,12 @@ class SubEditActivity : BaseActivity() {
 
             if (!Utils.isValidSubUrl(subItem.url)) {
                 toast(R.string.toast_insecure_url_protocol)
-                if (!subItem.allowInsecureUrl) {
+                //return false
-                    return false
-                }
             }
         }
 
         MmkvManager.encodeSubscription(editSubId, subItem)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
         finish()
         return true
     }
@@ -110,28 +104,19 @@ class SubEditActivity : BaseActivity() {
      */
     private fun deleteServer(): Boolean {
         if (editSubId.isNotEmpty()) {
-            if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
+            AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
-                AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm)
+                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                    lifecycleScope.launch(Dispatchers.IO) {
-                        lifecycleScope.launch(Dispatchers.IO) {
+                        MmkvManager.removeSubscription(editSubId)
-                            MmkvManager.removeSubscription(editSubId)
+                        launch(Dispatchers.Main) {
-                            launch(Dispatchers.Main) {
+                            finish()
-                                finish()
-                            }
                         }
                     }
-                    .setNegativeButton(android.R.string.cancel) { _, _ ->
-                        // do nothing
-                    }
-                    .show()
-            } else {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    MmkvManager.removeSubscription(editSubId)
-                    launch(Dispatchers.Main) {
-                        finish()
-                    }
                 }
-            }
+                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                    // do nothing
+                }
+                .show()
         }
         return true
     }

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

@@ -1,18 +1,18 @@
 package com.v2ray.ang.ui
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
+import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.SubscriptionItem
-import com.v2ray.ang.extension.toastError
+import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
@@ -35,7 +35,6 @@ class SubSettingActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = adapter
 
         mItemTouchHelper = ItemTouchHelper(SimpleItemTouchHelperCallback(adapter))
@@ -59,18 +58,21 @@ class SubSettingActivity : BaseActivity() {
         }
 
         R.id.sub_update -> {
-            binding.pbWaiting.show()
+            val dialog = AlertDialog.Builder(this)
+                .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+                .setCancelable(false)
+                .show()
 
             lifecycleScope.launch(Dispatchers.IO) {
                 val count = AngConfigManager.updateConfigViaSubAll()
                 delay(500L)
                 launch(Dispatchers.Main) {
                     if (count > 0) {
-                        toastSuccess(R.string.toast_success)
+                        toast(R.string.toast_success)
                     } else {
-                        toastError(R.string.toast_failure)
+                        toast(R.string.toast_failure)
                     }
-                    binding.pbWaiting.hide()
+                    dialog.dismiss()
                 }
             }
 
@@ -81,7 +83,6 @@ class SubSettingActivity : BaseActivity() {
 
     }
 
-    @SuppressLint("NotifyDataSetChanged")
     fun refreshData() {
         subscriptions = MmkvManager.decodeSubscriptions()
         adapter.notifyDataSetChanged()

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

@@ -3,14 +3,11 @@ 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.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
@@ -21,8 +18,6 @@ import com.v2ray.ang.helper.ItemTouchHelperAdapter
 import com.v2ray.ang.helper.ItemTouchHelperViewHolder
 import com.v2ray.ang.util.QRCodeDecoder
 import com.v2ray.ang.util.Utils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView.Adapter<SubSettingRecyclerAdapter.MainViewHolder>(), ItemTouchHelperAdapter {
 
@@ -49,10 +44,6 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
             )
         }
 
-        holder.itemSubSettingBinding.layoutRemove.setOnClickListener {
-            removeSubscription(subId, position)
-        }
-
         holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
             if (!it.isPressed) return@setOnCheckedChangeListener
             subItem.enabled = isChecked
@@ -61,13 +52,8 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
         }
 
         if (TextUtils.isEmpty(subItem.url)) {
-            holder.itemSubSettingBinding.layoutUrl.visibility = View.GONE
             holder.itemSubSettingBinding.layoutShare.visibility = View.INVISIBLE
-            holder.itemSubSettingBinding.chkEnable.visibility = View.INVISIBLE
         } else {
-            holder.itemSubSettingBinding.layoutUrl.visibility = View.VISIBLE
-            holder.itemSubSettingBinding.layoutShare.visibility = View.VISIBLE
-            holder.itemSubSettingBinding.chkEnable.visibility = View.VISIBLE
             holder.itemSubSettingBinding.layoutShare.setOnClickListener {
                 AlertDialog.Builder(mActivity)
                     .setItems(share_method.asList().toTypedArray()) { _, i ->
@@ -92,39 +78,13 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView
                                 else -> mActivity.toast("else")
                             }
                         } catch (e: Exception) {
-                            Log.e(AppConfig.TAG, "Share subscription failed", e)
+                            e.printStackTrace()
                         }
                     }.show()
             }
         }
     }
 
-    private fun removeSubscription(subId: String, position: Int) {
-        if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) {
-            AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
-                    removeSubscriptionSub(subId, position)
-                }
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
-                    //do noting
-                }
-                .show()
-        } else {
-            removeSubscriptionSub(subId, position)
-        }
-    }
-
-    private fun removeSubscriptionSub(subId: String, position: Int) {
-        mActivity.lifecycleScope.launch(Dispatchers.IO) {
-            MmkvManager.removeSubscription(subId)
-            launch(Dispatchers.Main) {
-                notifyItemRemoved(position)
-                notifyItemRangeChanged(position, mActivity.subscriptions.size)
-                mActivity.refreshData()
-            }
-        }
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MainViewHolder {
         return MainViewHolder(
             ItemRecyclerSubSettingBinding.inflate(

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

@@ -3,7 +3,6 @@ package com.v2ray.ang.ui
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -29,7 +28,7 @@ class TaskerActivity : BaseActivity() {
         lstData.add("Default")
         lstGuid.add(AppConfig.TASKER_DEFAULT_GUID)
 
-        MmkvManager.decodeServerList().forEach { key ->
+        MmkvManager.decodeServerList()?.forEach { key ->
             MmkvManager.decodeServerConfig(key)?.let { config ->
                 lstData.add(config.remarks)
                 lstGuid.add(key)
@@ -61,7 +60,7 @@ class TaskerActivity : BaseActivity() {
                 }
             }
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to initialize Tasker settings", e)
+            e.printStackTrace()
 
         }
     }

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

@@ -4,16 +4,10 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
-import androidx.lifecycle.lifecycleScope
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityLogcatBinding
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.handler.AngConfigManager
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.net.URLDecoder
 
 class UrlSchemeActivity : BaseActivity() {
@@ -46,7 +40,7 @@ class UrlSchemeActivity : BaseActivity() {
                         }
 
                         else -> {
-                            toastError(R.string.toast_failure)
+                            toast(R.string.toast_failure)
                         }
                     }
                 }
@@ -55,7 +49,7 @@ class UrlSchemeActivity : BaseActivity() {
             startActivity(Intent(this, MainActivity::class.java))
             finish()
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Error processing URL scheme", e)
+            e.printStackTrace()
         }
     }
 
@@ -63,7 +57,7 @@ class UrlSchemeActivity : BaseActivity() {
         if (uriString.isNullOrEmpty()) {
             return
         }
-        Log.i(AppConfig.TAG, uriString)
+        Log.d("UrlScheme", uriString)
 
         var decodedUrl = URLDecoder.decode(uriString, "UTF-8")
         val uri = Uri.parse(decodedUrl)
@@ -71,16 +65,12 @@ class UrlSchemeActivity : BaseActivity() {
             if (uri.fragment.isNullOrEmpty() && !fragment.isNullOrEmpty()) {
                 decodedUrl += "#${fragment}"
             }
-            Log.i(AppConfig.TAG, decodedUrl)
+            Log.d("UrlScheme-decodedUrl", decodedUrl)
-            lifecycleScope.launch(Dispatchers.IO) {
+            val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
-                val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false)
+            if (count + countSub > 0) {
-                withContext(Dispatchers.Main) {
+                toast(R.string.import_subscription_success)
-                    if (count + countSub > 0) {
+            } else {
-                        toast(R.string.import_subscription_success)
+                toast(R.string.import_subscription_failure)
-                    } else {
-                        toast(R.string.import_subscription_failure)
-                    }
-                }
             }
         }
     }

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

@@ -19,19 +19,18 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.tbruyelle.rxpermissions3.RxPermissions
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.AppConfig.LOOPBACK
 import com.v2ray.ang.R
-import com.v2ray.ang.databinding.ActivityUserAssetBinding
+import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.ItemRecyclerUserAssetBinding
+import com.v2ray.ang.databinding.LayoutProgressBinding
 import com.v2ray.ang.dto.AssetUrlItem
-import com.v2ray.ang.extension.concatUrl
 import com.v2ray.ang.extension.toTrafficString
 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.util.HttpUtil
 import com.v2ray.ang.util.Utils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -39,47 +38,18 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.net.HttpURLConnection
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.net.URL
 import java.text.DateFormat
 import java.util.Date
 
 class UserAssetActivity : BaseActivity() {
-    private val binding by lazy { ActivityUserAssetBinding.inflate(layoutInflater) }
+    private val binding by lazy { ActivitySubSettingBinding.inflate(layoutInflater) }
 
     val extDir by lazy { File(Utils.userAssetPath(this)) }
     val builtInGeoFiles = arrayOf("geosite.dat", "geoip.dat")
 
-    private val requestStoragePermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            val intent = Intent(Intent.ACTION_GET_CONTENT)
-            intent.type = "*/*"
-            intent.addCategory(Intent.CATEGORY_OPENABLE)
-
-            try {
-                chooseFile.launch(
-                    Intent.createChooser(
-                        intent,
-                        getString(R.string.title_file_chooser)
-                    )
-                )
-            } catch (ex: android.content.ActivityNotFoundException) {
-                toast(R.string.toast_require_file_manager)
-            }
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
-
-    private val requestCameraPermissionLauncher = registerForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted: Boolean ->
-        if (isGranted) {
-            scanQRCodeForAssetURL.launch(Intent(this, ScannerActivity::class.java))
-        } else {
-            toast(R.string.toast_permission_denied)
-        }
-    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -88,18 +58,12 @@ class UserAssetActivity : BaseActivity() {
 
         binding.recyclerView.setHasFixedSize(true)
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
-        addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider)
         binding.recyclerView.adapter = UserAssetAdapter()
-
-        binding.tvGeoFilesSourcesSummary.text = getGeoFilesSources()
-        binding.layoutGeoFilesSources.setOnClickListener {
-            setGeoFilesSources()
-        }
     }
 
     override fun onResume() {
         super.onResume()
-        refreshData()
+        binding.recyclerView.adapter?.notifyDataSetChanged()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -116,32 +80,36 @@ class UserAssetActivity : BaseActivity() {
         else -> super.onOptionsItemSelected(item)
     }
 
-    private fun getGeoFilesSources(): String {
-        return MmkvManager.decodeSettingsString(AppConfig.PREF_GEO_FILES_SOURCES) ?: AppConfig.GEO_FILES_SOURCES.first()
-    }
-
-    private fun setGeoFilesSources() {
-        AlertDialog.Builder(this).setItems(AppConfig.GEO_FILES_SOURCES.toTypedArray()) { _, i ->
-            try {
-                val value = AppConfig.GEO_FILES_SOURCES[i]
-                MmkvManager.encodeSettings(AppConfig.PREF_GEO_FILES_SOURCES, value)
-                binding.tvGeoFilesSourcesSummary.text = value
-            } catch (e: Exception) {
-                Log.e(AppConfig.TAG, "Failed to set geo files sources", e)
-            }
-        }.show()
-    }
-
     private fun showFileChooser() {
         val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             Manifest.permission.READ_MEDIA_IMAGES
         } else {
             Manifest.permission.READ_EXTERNAL_STORAGE
         }
-        requestStoragePermissionLauncher.launch(permission)
+        RxPermissions(this)
+            .request(permission)
+            .subscribe {
+                if (it) {
+                    val intent = Intent(Intent.ACTION_GET_CONTENT)
+                    intent.type = "*/*"
+                    intent.addCategory(Intent.CATEGORY_OPENABLE)
+
+                    try {
+                        chooseFile.launch(
+                            Intent.createChooser(
+                                intent,
+                                getString(R.string.title_file_chooser)
+                            )
+                        )
+                    } catch (ex: android.content.ActivityNotFoundException) {
+                        toast(R.string.toast_require_file_manager)
+                    }
+                } else
+                    toast(R.string.toast_permission_denied)
+            }
     }
 
-    private val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+    val chooseFile = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
         val uri = result.data?.data
         if (result.resultCode == RESULT_OK && uri != null) {
             val assetId = Utils.getUuid()
@@ -159,7 +127,7 @@ class UserAssetActivity : BaseActivity() {
                     copyFile(uri)
                 }
             }.onFailure {
-                toastError(R.string.toast_asset_copy_failed)
+                toast(R.string.toast_asset_copy_failed)
                 MmkvManager.removeAssetUrl(assetId)
             }
         }
@@ -170,8 +138,8 @@ class UserAssetActivity : BaseActivity() {
         contentResolver.openInputStream(uri).use { inputStream ->
             targetFile.outputStream().use { fileOut ->
                 inputStream?.copyTo(fileOut)
-                toastSuccess(R.string.toast_success)
+                toast(R.string.toast_success)
-                refreshData()
+                binding.recyclerView.adapter?.notifyDataSetChanged()
             }
         }
         return targetFile.path
@@ -185,12 +153,19 @@ class UserAssetActivity : BaseActivity() {
             }.also { cursor.close() }
         }
     } catch (e: Exception) {
-        Log.e(AppConfig.TAG, "Failed to get cursor name", e)
+        e.printStackTrace()
         null
     }
 
     private fun importAssetFromQRcode(): Boolean {
-        requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        RxPermissions(this)
+            .request(Manifest.permission.CAMERA)
+            .subscribe {
+                if (it)
+                    scanQRCodeForAssetURL.launch(Intent(this, ScannerActivity::class.java))
+                else
+                    toast(R.string.toast_permission_denied)
+            }
         return true
     }
 
@@ -207,58 +182,65 @@ class UserAssetActivity : BaseActivity() {
                 return false
             }
             // Send URL to UserAssetUrlActivity for Processing
-            startActivity(
+            startActivity(Intent(this, UserAssetUrlActivity::class.java)
-                Intent(this, UserAssetUrlActivity::class.java)
+                .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url))
-                    .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url)
-            )
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to import asset from URL", e)
+            e.printStackTrace()
             return false
         }
         return true
     }
 
     private fun downloadGeoFiles() {
-        binding.pbWaiting.show()
+        val dialog = AlertDialog.Builder(this)
+            .setView(LayoutProgressBinding.inflate(layoutInflater).root)
+            .setCancelable(false)
+            .show()
         toast(R.string.msg_downloading_content)
 
         val httpPort = SettingsManager.getHttpPort()
         var assets = MmkvManager.decodeAssetUrls()
         assets = addBuiltInGeoItems(assets)
 
-        var resultCount = 0
+        assets.forEach {
-        lifecycleScope.launch(Dispatchers.IO) {
+            //toast(getString(R.string.msg_downloading_content) + it)
-            assets.forEach {
+            lifecycleScope.launch(Dispatchers.IO) {
-                try {
+                var result = downloadGeo(it.second, 60000, httpPort)
-                    var result = downloadGeo(it.second, 15000, httpPort)
+                if (!result) {
-                    if (!result) {
+                    result = downloadGeo(it.second, 60000, 0)
-                        result = downloadGeo(it.second, 15000, 0)
+                }
+                launch(Dispatchers.Main) {
+                    if (result) {
+                        toast(getString(R.string.toast_success) + " " + it.second.remarks)
+                        binding.recyclerView.adapter?.notifyDataSetChanged()
+                    } else {
+                        toast(getString(R.string.toast_failure) + " " + it.second.remarks)
                     }
-                    if (result)
+                    dialog.dismiss()
-                        resultCount++
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to download geo file: ${it.second.remarks}", e)
                 }
             }
-            withContext(Dispatchers.Main) {
-                if (resultCount > 0) {
-                    toast(getString(R.string.title_update_config_count, resultCount))
-                    refreshData()
-                } else {
-                    toast(getString(R.string.toast_failure))
-                }
-                binding.pbWaiting.hide()
-            }
         }
     }
 
     private fun downloadGeo(item: AssetUrlItem, timeout: Int, httpPort: Int): Boolean {
         val targetTemp = File(extDir, item.remarks + "_temp")
         val target = File(extDir, item.remarks)
-        Log.i(AppConfig.TAG, "Downloading geo file: ${item.remarks} from ${item.url}")
+        var conn: HttpURLConnection? = null
+        //Log.d(AppConfig.ANG_PACKAGE, url)
 
-        val conn = HttpUtil.createProxyConnection(item.url, httpPort, timeout, timeout, needStream = true) ?: return false
         try {
+            conn = if (httpPort == 0) {
+                URL(item.url).openConnection() as HttpURLConnection
+            } else {
+                URL(item.url).openConnection(
+                    Proxy(
+                        Proxy.Type.HTTP,
+                        InetSocketAddress(LOOPBACK, httpPort)
+                    )
+                ) as HttpURLConnection
+            }
+            conn.connectTimeout = timeout
+            conn.readTimeout = timeout
             val inputStream = conn.inputStream
             val responseCode = conn.responseCode
             if (responseCode == HttpURLConnection.HTTP_OK) {
@@ -270,10 +252,10 @@ class UserAssetActivity : BaseActivity() {
             }
             return true
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to download geo file: ${item.remarks}", e)
+            Log.e(AppConfig.ANG_PACKAGE, Log.getStackTraceString(e))
             return false
         } finally {
-            conn.disconnect()
+            conn?.disconnect()
         }
     }
 
@@ -285,8 +267,7 @@ class UserAssetActivity : BaseActivity() {
                 list.add(
                     Utils.getUuid() to AssetUrlItem(
                         it,
-                        String.format(AppConfig.GITHUB_DOWNLOAD_URL, getGeoFilesSources()).concatUrl(it),
+                        AppConfig.GeoUrl + it
-                        locked = true
                     )
                 )
             }
@@ -298,16 +279,11 @@ class UserAssetActivity : BaseActivity() {
         lifecycleScope.launch(Dispatchers.Default) {
             SettingsManager.initAssets(this@UserAssetActivity, assets)
             withContext(Dispatchers.Main) {
-                refreshData()
+                binding.recyclerView.adapter?.notifyDataSetChanged()
             }
         }
     }
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun refreshData() {
-        binding.recyclerView.adapter?.notifyDataSetChanged()
-    }
-
     inner class UserAssetAdapter : RecyclerView.Adapter<UserAssetViewHolder>() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserAssetViewHolder {
             return UserAssetViewHolder(
@@ -337,7 +313,7 @@ class UserAssetActivity : BaseActivity() {
                 holder.itemUserAssetBinding.assetProperties.text = getString(R.string.msg_file_not_found)
             }
 
-            if (item.second.locked == true) {
+            if (item.second.remarks in builtInGeoFiles && item.second.url == AppConfig.GeoUrl + item.second.remarks) {
                 holder.itemUserAssetBinding.layoutEdit.visibility = GONE
                 //holder.itemUserAssetBinding.layoutRemove.visibility = GONE
             } else {
@@ -373,4 +349,4 @@ class UserAssetActivity : BaseActivity() {
 
     class UserAssetViewHolder(val itemUserAssetBinding: ItemRecyclerUserAssetBinding) :
         RecyclerView.ViewHolder(itemUserAssetBinding.root)
-}
+}

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

@@ -2,16 +2,13 @@ package com.v2ray.ang.ui
 
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
-import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityUserAssetUrlBinding
 import com.v2ray.ang.dto.AssetUrlItem
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 import java.io.File
@@ -24,10 +21,10 @@ class UserAssetUrlActivity : BaseActivity() {
 
     private val binding by lazy { ActivityUserAssetUrlBinding.inflate(layoutInflater) }
 
-    private var del_config: MenuItem? = null
+    var del_config: MenuItem? = null
-    private var save_config: MenuItem? = null
+    var save_config: MenuItem? = null
 
-    private val extDir by lazy { File(Utils.userAssetPath(this)) }
+    val extDir by lazy { File(Utils.userAssetPath(this)) }
     private val editAssetId by lazy { intent.getStringExtra("assetId").orEmpty() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,7 +41,6 @@ class UserAssetUrlActivity : BaseActivity() {
                 binding.etRemarks.setText(assetNameQrcode)
                 binding.etUrl.setText(assetUrlQrcode)
             }
-
             else -> clearAsset()
         }
     }
@@ -77,11 +73,7 @@ class UserAssetUrlActivity : BaseActivity() {
             // remove file associated with the asset
             val file = extDir.resolve(assetItem.remarks)
             if (file.exists()) {
-                try {
+                file.delete()
-                    file.delete()
-                } catch (e: Exception) {
-                    Log.e(AppConfig.TAG, "Failed to delete asset file: ${file.path}", e)
-                }
             }
         } else {
             assetId = Utils.getUuid()
@@ -109,7 +101,7 @@ class UserAssetUrlActivity : BaseActivity() {
         }
 
         MmkvManager.encodeAsset(assetId, assetItem)
-        toastSuccess(R.string.toast_success)
+        toast(R.string.toast_success)
         finish()
         return true
     }

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

@@ -4,37 +4,36 @@ 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 io.reactivex.rxjava3.core.Observable
-import kotlinx.coroutines.withContext
 
 object AppManagerUtil {
-    /**
+    private fun loadNetworkAppList(ctx: Context): ArrayList<AppInfo> {
-     * Load the list of network applications.
+        val packageManager = ctx.packageManager
-     *
+        val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)
-     * @param context The context to use.
+        val apps = ArrayList<AppInfo>()
-     * @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) {
+        for (pkg in packages) {
-                val applicationInfo = pkg.applicationInfo ?: continue
+            val applicationInfo = pkg.applicationInfo ?: continue
 
-                val appName = applicationInfo.loadLabel(packageManager).toString()
+            val appName = applicationInfo.loadLabel(packageManager).toString()
-                val appIcon = applicationInfo.loadIcon(packageManager) ?: continue
+            val appIcon = applicationInfo.loadIcon(packageManager) ?: continue
-                val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0
+            val isSystemApp = (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) > 0
 
-                val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
+            val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0)
-                apps.add(appInfo)
+            apps.add(appInfo)
-            }
-
-            return@withContext apps
         }
 
-    fun getLastUpdateTime(context: Context): Long =
+        return apps
-        context.packageManager.getPackageInfo(context.packageName, 0).lastUpdateTime
+    }
 
+    fun rxLoadNetworkAppList(ctx: Context): Observable<ArrayList<AppInfo>> =
+        Observable.unsafeCreate {
+            it.onNext(loadNetworkAppList(ctx))
+        }
+
+//    val PackageInfo.hasInternetPermission: Boolean
+//        get() {
+//            val permissions = requestedPermissions
+//            return permissions?.any { it == Manifest.permission.INTERNET } ?: false
+//        }
 }

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,6 +1,5 @@
 package com.v2ray.ang.util
 
-import android.util.Log
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
@@ -9,39 +8,19 @@ 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
@@ -60,19 +39,13 @@ object JsonUtil {
         return gsonPre.toJson(src)
     }
 
-    /**
-     * Parses a JSON string into a JsonObject.
-     *
-     * @param src The JSON string to parse.
-     * @return The parsed JsonObject, or null if parsing fails.
-     */
     fun parseString(src: String?): JsonObject? {
         if (src == null)
             return null
         try {
             return JsonParser.parseString(src).getAsJsonObject()
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to parse JSON string", e)
+            e.printStackTrace()
             return null
         }
     }

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

@@ -3,43 +3,21 @@ package com.v2ray.ang.util
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.service.V2RayTestService
 import java.io.Serializable
 
+
 object MessageUtil {
 
-
-    /**
-     * Sends a message to the service.
-     *
-     * @param ctx The context.
-     * @param what The message identifier.
-     * @param content The message content.
-     */
     fun sendMsg2Service(ctx: Context, what: Int, content: Serializable) {
         sendMsg(ctx, AppConfig.BROADCAST_ACTION_SERVICE, what, content)
     }
 
-    /**
-     * Sends a message to the UI.
-     *
-     * @param ctx The context.
-     * @param what The message identifier.
-     * @param content The message content.
-     */
     fun sendMsg2UI(ctx: Context, what: Int, content: Serializable) {
         sendMsg(ctx, AppConfig.BROADCAST_ACTION_ACTIVITY, what, content)
     }
 
-    /**
-     * Sends a message to the test service.
-     *
-     * @param ctx The context.
-     * @param what The message identifier.
-     * @param content The message content.
-     */
     fun sendMsg2TestService(ctx: Context, what: Int, content: Serializable) {
         try {
             val intent = Intent()
@@ -48,18 +26,10 @@ object MessageUtil {
             intent.putExtra("content", content)
             ctx.startService(intent)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to send message to test service", e)
+            e.printStackTrace()
         }
     }
 
-    /**
-     * Sends a message with the specified action.
-     *
-     * @param ctx The context.
-     * @param action The action string.
-     * @param what The message identifier.
-     * @param content The message content.
-     */
     private fun sendMsg(ctx: Context, action: String, what: Int, content: Serializable) {
         try {
             val intent = Intent()
@@ -69,7 +39,7 @@ object MessageUtil {
             intent.putExtra("content", content)
             ctx.sendBroadcast(intent)
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to send message with action: $action", e)
+            e.printStackTrace()
         }
     }
 }

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

@@ -11,18 +11,12 @@ import java.util.Locale
 
 open class MyContextWrapper(base: Context?) : ContextWrapper(base) {
     companion object {
-        /**
-         * Wraps the context with a new locale.
-         *
-         * @param context The original context.
-         * @param newLocale The new locale to set.
-         * @return A ContextWrapper with the new locale.
-         */
         @RequiresApi(Build.VERSION_CODES.N)
         fun wrap(context: Context, newLocale: Locale?): ContextWrapper {
             var mContext = context
             val res: Resources = mContext.resources
             val configuration: Configuration = res.configuration
+            //注意 Android 7.0 前后的不同处理方法
             mContext = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 configuration.setLocale(newLocale)
                 val localeList = LocaleList(newLocale)

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

@@ -3,80 +3,53 @@ 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.AppConfig.ANG_PACKAGE
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.fmt.Hysteria2Fmt
-import com.v2ray.ang.handler.SpeedtestManager
 import com.v2ray.ang.service.ProcessService
 import java.io.File
 
 object PluginUtil {
+    //private const val HYSTERIA2 = "hysteria2-plugin"
     private const val HYSTERIA2 = "libhysteria2.so"
-
+    private const val TAG = ANG_PACKAGE
     private val procService: ProcessService by lazy {
         ProcessService()
     }
 
-    /**
+//    fun initPlugin(name: String): PluginManager.InitResult {
-     * Run the plugin based on the provided configuration.
+//        return PluginManager.init(name)!!
-     *
+//    }
-     * @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) {
+    fun runPlugin(context: Context, config: ProfileItem?, domainPort: String?) {
-            Log.w(AppConfig.TAG, "Cannot run plugin: config is null")
+        Log.d(TAG, "runPlugin")
-            return
-        }
 
-        try {
+        if (config?.configType?.equals(EConfigType.HYSTERIA2) == true) {
-            if (config.configType == EConfigType.HYSTERIA2) {
+            val configFile = genConfigHy2(context, config, domainPort) ?: return
-                if (socksPort == null) {
+            val cmd = genCmdHy2(context, configFile)
-                    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)
+            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")
+        Log.d(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 configFile = genConfigHy2(context, config, "0:${socksPort}") ?: return retFailure
             val cmd = genCmdHy2(context, configFile)
 
             val proc = ProcessService()
             proc.runProcess(context, cmd)
             Thread.sleep(1000L)
-            val delay = SpeedtestManager.testConnection(context, socksPort)
+            val delay = SpeedtestUtil.testConnection(context, socksPort)
             proc.stopProcess()
 
             return delay.first
@@ -84,39 +57,27 @@ object PluginUtil {
         return retFailure
     }
 
-    /**
+    private fun genConfigHy2(context: Context, config: ProfileItem, domainPort: String?): File? {
-     * Generate the configuration file for Hysteria2.
+        Log.d(TAG, "runPlugin $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 socksPort = domainPort?.split(":")?.last()
+            .let { if (it.isNullOrEmpty()) return null else it.toInt() }
         val hy2Config = Hysteria2Fmt.toNativeConfig(config, socksPort) ?: return null
 
         val configFile = File(context.noBackupFilesDir, "hy2_${SystemClock.elapsedRealtime()}.json")
-        Log.i(AppConfig.TAG, "runPlugin ${configFile.absolutePath}")
+        Log.d(TAG, "runPlugin ${configFile.absolutePath}")
 
         configFile.parentFile?.mkdirs()
         configFile.writeText(JsonUtil.toJson(hy2Config))
-        Log.i(AppConfig.TAG, JsonUtil.toJson(hy2Config))
+        Log.d(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,
+            //initPlugin(HYSTERIA2).path,
             "--disable-update-check",
             "--config",
             configFile.absolutePath,
@@ -126,15 +87,12 @@ object PluginUtil {
         )
     }
 
-    /**
-     * Stop the Hysteria2 process.
-     */
     private fun stopHy2() {
         try {
-            Log.i(AppConfig.TAG, "$HYSTERIA2 destroy")
+            Log.d(TAG, "$HYSTERIA2 destroy")
             procService?.stopProcess()
         } catch (e: Exception) {
-            Log.e(AppConfig.TAG, "Failed to stop Hysteria2 process", e)
+            Log.d(TAG, e.toString())
         }
     }
 }

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

@@ -14,17 +14,13 @@ 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.
+     * create qrcode using zxing
-     *
-     * @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 {
@@ -39,21 +35,22 @@ object QRCodeDecoder {
         }.getOrNull()
     }
 
+
     /**
-     * Decodes a QR code from a local image file. This method is time-consuming and should be called in a background thread.
+     * 同步解析本地图片二维码。该方法是耗时操作，请在子线程中调用。
      *
-     * @param picturePath The local path of the image file to decode.
+     * @param picturePath 要解析的二维码图片本地路径
-     * @return The content of the QR code, or null if decoding fails.
+     * @return 返回二维码图片里的内容 或 null
      */
     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.
+     * 同步解析bitmap二维码。该方法是耗时操作，请在子线程中调用。
      *
-     * @param bitmap The bitmap to decode.
+     * @param bitmap 要解析的二维码图片
-     * @return The content of the QR code, or null if decoding fails.
+     * @return 返回二维码图片里的内容 或 null
      */
     fun syncDecodeQRCode(bitmap: Bitmap?): String? {
         return bitmap?.let {
@@ -73,11 +70,12 @@ object QRCodeDecoder {
         }
     }
 
+
     /**
-     * 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.
+     * 将本地图片文件转换成可解码二维码的 Bitmap。为了避免图片太大，这里对图片进行了压缩。感谢 https://github.com/devilsen 提的 PR
      *
-     * @param picturePath The local path of the image file.
+     * @param picturePath 本地图片文件路径
-     * @return The decoded bitmap, or null if an error occurs.
+     * @return
      */
     private fun getDecodeAbleBitmap(picturePath: String): Bitmap? {
         return try {