diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c5a92fe..5e69540b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,105 +16,117 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4.2.2 - with: - submodules: 'recursive' - fetch-depth: '0' + uses: actions/checkout@v4 - - name: Setup Android SDK - uses: android-actions/setup-android@v3.2.0 - with: - log-accepted-android-sdk-licenses: false - cmdline-tools-version: '12266719' - packages: 'platforms;android-35 build-tools;35.0.0 platform-tools' - - - name: Install NDK + - name: Prepare build dir run: | - echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager \ - --channel=3 \ - --install "ndk;29.0.13113456" - echo "NDK_HOME=$ANDROID_HOME/ndk/29.0.13113456" >> $GITHUB_ENV - sed -i '10i\ - \ - ndkVersion = "29.0.13113456"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts + mkdir ${{ github.workspace }}/build + + - name: Fetch AndroidLibV2rayLite + run: | + cd ${{ github.workspace }}/build + git clone --depth=1 -b master https://github.com/2dust/AndroidLibV2rayLite.git + cd AndroidLibV2rayLite + git submodule update --init - name: Restore cached libtun2socks id: cache-libtun2socks-restore uses: actions/cache/restore@v4 with: - path: ${{ github.workspace }}/libs - key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }} + path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs + key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }} + + - name: Setup Android NDK + if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true' + uses: nttld/setup-ndk@v1 + id: setup-ndk + # Same version as https://gitlab.com/fdroid/fdroiddata/metadata/com.v2ray.ang.yml + with: + ndk-version: r27 - 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 - key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }} + path: ${{ github.workspace }}/build/AndroidLibV2rayLite/libs + key: libtun2socks-${{ runner.os }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/refs/heads/master') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/badvpn/HEAD') }}-${{ hashFiles('build/AndroidLibV2rayLite/.git/modules/libancillary/HEAD') }} - name: Copy libtun2socks run: | - cp -r ${{ github.workspace }}/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 - CURRENT_TAG=$(git describe --tags --abbrev=0) - echo "Current tag in this repo: $CURRENT_TAG" - echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_ENV - popd + cd ${{ github.workspace }}/build + git clone --depth=1 -b main https://github.com/2dust/AndroidLibXrayLite.git - - name: Download libv2ray - uses: robinraju/release-downloader@v1.12 - with: - repository: '2dust/AndroidLibXrayLite' - tag: ${{ env.CURRENT_TAG }} - fileName: 'libv2ray.aar' - out-file-path: V2rayNG/app/libs/ - - - name: Restore cached libhysteria2 - id: cache-libhysteria2-restore + - name: Restore cached libv2ray + id: cache-libv2ray-restore uses: actions/cache/restore@v4 with: - path: ${{ github.workspace }}/hysteria/libs - key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }} + path: ${{ github.workspace }}/build/AndroidLibXrayLite/ + key: libv2ray-${{ runner.os }}-${{ hashFiles('build/AndroidLibXrayLite/.git/refs/heads/main') }} - name: Setup Golang - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' - uses: actions/setup-go@v5.4.0 + if: steps.cache-libv2ray-restore.outputs.cache-hit != 'true' + uses: actions/setup-go@v5 with: - go-version-file: 'AndroidLibXrayLite/go.mod' + go-version: '1.23.4' cache: false - - name: Build libhysteria2 - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' + - name: Patch Go use 600296 + 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 - if: steps.cache-libhysteria2-restore.outputs.cache-hit != 'true' + - name: Install gomobile + 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 - key: libhysteria2-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hysteria/HEAD') }}-${{ hashFiles('libhysteria2.sh') }} + path: ${{ github.workspace }}/build/AndroidLibXrayLite/ + 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 - prerelease: true + file_glob: true \ No newline at end of file diff --git a/.github/workflows/fastlane.yml b/.github/workflows/fastlane.yml index 4ed66e23..43a4632d 100644 --- a/.github/workflows/fastlane.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 9582b273..239dde7f 100644 --- a/.gitignore +++ b/.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 - -# 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 +libtun2socks.so +libhysteria2.so \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2bdafca3..00000000 --- a/.gitmodules +++ /dev/null @@ -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 diff --git a/AndroidLibV2rayLite/README.md b/AndroidLibV2rayLite/README.md new file mode 100644 index 00000000..118eefcf --- /dev/null +++ b/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: +- 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) diff --git a/AndroidLibXrayLite b/AndroidLibXrayLite deleted file mode 160000 index 8ad3e1dd..00000000 --- a/AndroidLibXrayLite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8ad3e1ddf165d8d67e488346b2faa9153d3e33a4 diff --git a/README.md b/README.md index 4bd6f8ec..1bcc2499 100644 --- a/README.md +++ b/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) + +Get it on Google Play + + ### 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) diff --git a/V2rayNG/.gitignore b/V2rayNG/.gitignore new file mode 100644 index 00000000..16eb6ec8 --- /dev/null +++ b/V2rayNG/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +/captures +*.apk +signing.properties +*.aar diff --git a/V2rayNG/app/.gitignore b/V2rayNG/app/.gitignore new file mode 100644 index 00000000..2abde4aa --- /dev/null +++ b/V2rayNG/app/.gitignore @@ -0,0 +1,2 @@ +/build +/google-services.json diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts index 1624786c..2fbac1d5 100644 --- a/V2rayNG/app/build.gradle.kts +++ b/V2rayNG/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "com.v2ray.ang" minSdk = 21 targetSdk = 35 - versionCode = 658 - versionName = "1.10.8" + versionCode = 623 + 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( - "armeabi-v7a" to 2, "arm64-v8a" to 1, "x86" to 4, "x86_64" to 3, "universal" to 0 - ) + mapOf("armeabi-v7a" to 2, "arm64-v8a" to 1, "x86" to 4, "x86_64" to 3, "universal" to 0 + ) variant.outputs .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl } @@ -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.kotlinx.coroutines.core) + implementation(libs.rxjava) + implementation(libs.rxandroid) + implementation(libs.rxpermissions) // Language and Processing Libraries implementation(libs.language.base) diff --git a/V2rayNG/app/libs/arm64-v8a/libhysteria2.so b/V2rayNG/app/libs/arm64-v8a/libhysteria2.so new file mode 100644 index 00000000..9de1a377 Binary files /dev/null and b/V2rayNG/app/libs/arm64-v8a/libhysteria2.so differ diff --git a/V2rayNG/app/libs/armeabi-v7a/libhysteria2.so b/V2rayNG/app/libs/armeabi-v7a/libhysteria2.so new file mode 100644 index 00000000..ac5e7379 Binary files /dev/null and b/V2rayNG/app/libs/armeabi-v7a/libhysteria2.so differ diff --git a/V2rayNG/app/libs/x86/libhysteria2.so b/V2rayNG/app/libs/x86/libhysteria2.so new file mode 100644 index 00000000..1a6eb668 Binary files /dev/null and b/V2rayNG/app/libs/x86/libhysteria2.so differ diff --git a/V2rayNG/app/libs/x86_64/libhysteria2.so b/V2rayNG/app/libs/x86_64/libhysteria2.so new file mode 100644 index 00000000..4ae0497e Binary files /dev/null and b/V2rayNG/app/libs/x86_64/libhysteria2.so differ diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml index 00e4b747..c2cde774 100644 --- a/V2rayNG/app/src/main/AndroidManifest.xml +++ b/V2rayNG/app/src/main/AndroidManifest.xml @@ -35,6 +35,7 @@ + - @@ -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" - tools:targetApi="24"> + android:process=":RunSoLibV2RayDaemon"> diff --git a/V2rayNG/app/src/main/assets/custom_routing_black b/V2rayNG/app/src/main/assets/custom_routing_black index f15daacd..ce0c7440 100644 --- a/V2rayNG/app/src/main/assets/custom_routing_black +++ b/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", diff --git a/V2rayNG/app/src/main/assets/custom_routing_global b/V2rayNG/app/src/main/assets/custom_routing_global index 21bfb24d..99006d9b 100644 --- a/V2rayNG/app/src/main/assets/custom_routing_global +++ b/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", diff --git a/V2rayNG/app/src/main/assets/custom_routing_white b/V2rayNG/app/src/main/assets/custom_routing_white index e3c360c0..750bd6d4 100644 --- a/V2rayNG/app/src/main/assets/custom_routing_white +++ b/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" } ] \ No newline at end of file diff --git a/V2rayNG/app/src/main/assets/custom_routing_white_iran b/V2rayNG/app/src/main/assets/custom_routing_white_iran index 97ff1227..d1d5e540 100644 --- a/V2rayNG/app/src/main/assets/custom_routing_white_iran +++ b/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" } ] diff --git a/V2rayNG/app/src/main/assets/proxy_packagename.txt b/V2rayNG/app/src/main/assets/proxy_packagename.txt index 12abf7db..ecac8251 100644 --- a/V2rayNG/app/src/main/assets/proxy_packagename.txt +++ b/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 \ No newline at end of file diff --git a/V2rayNG/app/src/main/assets/v2ray_config.json b/V2rayNG/app/src/main/assets/v2ray_config.json index 4f8c3d7e..90abcee0 100644 --- a/V2rayNG/app/src/main/assets/v2ray_config.json +++ b/V2rayNG/app/src/main/assets/v2ray_config.json @@ -97,7 +97,7 @@ } ], "routing": { - "domainStrategy": "AsIs", + "domainStrategy": "IPIfNonMatch", "rules": [] }, "dns": { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt index 44f680b3..6b437021 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt @@ -1,22 +1,22 @@ package com.v2ray.ang import android.content.Context +import android.content.pm.PackageManager +import android.os.Build import androidx.multidex.MultiDexApplication import androidx.work.Configuration import androidx.work.WorkManager import com.tencent.mmkv.MMKV import com.v2ray.ang.AppConfig.ANG_PACKAGE import com.v2ray.ang.handler.SettingsManager +import com.v2ray.ang.util.Utils class AngApplication : MultiDexApplication() { companion object { + //const val PREF_LAST_VERSION = "pref_last_version" lateinit var application: AngApplication } - /** - * Attaches the base context to the application. - * @param base The base context. - */ override fun attachBaseContext(base: Context?) { super.attachBaseContext(base) application = this @@ -26,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() } + } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt index 09e3a9d5..82e8867f 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt +++ b/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 GITHUB_RAW_URL = "https://raw.githubusercontent.com" - const val GITHUB_DOWNLOAD_URL = "$GITHUB_URL/%s/releases/latest/download" - const val ANDROID_PACKAGE_NAME_LIST_URL = "$GITHUB_RAW_URL/2dust/androidpackagenamelist/master/proxy.txt" - const val APP_URL = "$GITHUB_URL/2dust/v2rayNG" - const val APP_API_URL = "https://api.github.com/repos/2dust/v2rayNG/releases" - const val APP_ISSUES_URL = "$APP_URL/issues" - const val APP_WIKI_MODE = "$APP_URL/wiki/Mode" - const val APP_PRIVACY_POLICY = "$GITHUB_RAW_URL/2dust/v2rayNG/master/CR.md" - const val APP_PROMOTION_URL = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=" - const val TG_CHANNEL_URL = "https://t.me/github_2dust" - const val DELAY_TEST_URL = "https://www.gstatic.com/generate_204" - const val DELAY_TEST_URL2 = "https://www.google.com/generate_204" - const val IP_API_URL = "https://speed.cloudflare.com/meta" + const val androidpackagenamelistUrl = + "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt" + const val v2rayCustomRoutingListUrl = + "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/" + const val v2rayNGUrl = "https://github.com/2dust/v2rayNG" + const val v2rayNGIssues = "$v2rayNGUrl/issues" + const val v2rayNGWikiMode = "$v2rayNGUrl/wiki/Mode" + const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md" + const val PromotionUrl = "aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=" + const val GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/" + const val TgChannelUrl = "https://t.me/github_2dust" + const val DelayTestUrl = "https://www.gstatic.com/generate_204" + const val DelayTestUrl2 = "https://www.google.com/generate_204" /** 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_DNS_COM_DOMAIN = "dns.cloudflare.com" - const val DNS_CLOUDFLARE_DNS_DOMAIN = "cloudflare-dns.com" + const val DNS_CLOUDFLARE_DOMAIN = "one.one.one.one" const val DNS_GOOGLE_DOMAIN = "dns.google" const val DNS_QUAD9_DOMAIN = "dns.quad9.net" const val DNS_YANDEX_DOMAIN = "common.dot.dns.yandex.net" + + val DNS_ALIDNS_ADDRESSES = arrayListOf("223.5.5.5", "223.6.6.6", "2400:3200::1", "2400:3200:baba::1") + val DNS_CLOUDFLARE_ADDRESSES = arrayListOf("1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001") + val DNS_DNSPOD_ADDRESSES = arrayListOf("1.12.12.12", "120.53.53.53") + val DNS_GOOGLE_ADDRESSES = arrayListOf("8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844") + val DNS_QUAD9_ADDRESSES = arrayListOf("9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9") + val DNS_YANDEX_ADDRESSES = arrayListOf("77.88.8.8", "77.88.8.1", "2a02:6b8::feed:0ff", "2a02:6b8:0:1::feed:0ff") + const val DEFAULT_PORT = 443 const val DEFAULT_SECURITY = "auto" const val DEFAULT_LEVEL = 8 @@ -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" - ) - } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlItem.kt index 5a8d1e60..d0703f09 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/AssetUrlItem.kt +++ b/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 locked: Boolean? = false, + var lastUpdated: Long = -1 ) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/CheckUpdateResult.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/CheckUpdateResult.kt deleted file mode 100644 index be4f62e5..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/CheckUpdateResult.kt +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt index c8870248..c0b70c6a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt +++ b/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, ) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt index ed7cad3b..fd1578e5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/EConfigType.kt +++ b/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); diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/GitHubRelease.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/GitHubRelease.kt deleted file mode 100644 index 0a7dce56..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/GitHubRelease.kt +++ /dev/null @@ -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, - @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 - ) -} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt index c4fc6582..89900fb8 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Hysteria2Bean.kt @@ -9,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?, - ) -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt deleted file mode 100644 index 97814fbb..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/IPAPIInfo.kt +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt index 46333d06..c3a8d9ba 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/Language.kt +++ b/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"); diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt index 0e8091b9..f34a016a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/NetworkType.kt +++ b/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"); diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt index 7a1f7346..883a3788 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileItem.kt @@ -1,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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileLiteItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/ProfileLiteItem.kt new file mode 100644 index 00000000..12995abd --- /dev/null +++ b/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?, +) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt index 8957df78..8e8c66a4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionItem.kt +++ b/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, ) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt index 155be104..20b8b251 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt +++ b/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, var outbounds: ArrayList, - 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 error: String? = null, - var loglevel: String? = null, + val access: String, + val error: String, + 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? = 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( - var type: String = "none", - var domain: String? = null - ) + data class HeaderBean(var type: String = "none") } 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 domainStrategy: String? = null + var dialerProxy: 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 xudpConcurrency: Int? = null, - var xudpProxyUDP443: String? = null, + var concurrency: Int = 8, + var xudpConcurrency: Int = 8, + 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 { - return outbounds.filter { outbound -> - EConfigType.entries.any { it.name.equals(outbound.protocol, ignoreCase = true) } - } + fun toPrettyPrinting(): String { + return GsonBuilder() + .setPrettyPrinting() + .disableHtmlEscaping() + .registerTypeAdapter( // custom serialiser is needed here since JSON by default parse number as Double, core will fail to start + object : TypeToken() {}.type, + JsonSerializer { src: Double?, _: Type?, _: JsonSerializationContext? -> JsonPrimitive(src?.toInt()) } + ) + .create() + .toJson(this) } -} +} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt deleted file mode 100644 index 6b7bc379..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/VpnInterfaceAddressConfig.kt +++ /dev/null @@ -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 - } - } - } -} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt index 6e5c6bb4..a5e0da0b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/extension/_Ext.kt +++ b/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) { 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) { pairs.forEach { put(it.key, it.value) } } @@ -93,18 +36,8 @@ fun JSONObject.putOpt(pairs: Map) { 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() -/** - * Removes all whitespace from the string. - * - * @return The string without whitespace. - */ -fun String?.removeWhiteSpace(): String? = this?.replace(" ", "") +fun String.removeWhiteSpace(): String = replace("\\s+".toRegex(), "") -/** - * 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 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 Intent.serializable(key: String): T? = when { Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java) else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T } -/** - * Checks if the CharSequence is not null and not empty. - * - * @return True if the CharSequence is not null and not empty, false otherwise. - */ -fun CharSequence?.isNotNullEmpty(): Boolean = this != null && this.isNotEmpty() - -fun String.concatUrl(vararg paths: String): String { - val builder = StringBuilder(this.trimEnd('/')) - - paths.forEach { path -> - val trimmedPath = path.trim('/') - if (trimmedPath.isNotEmpty()) { - builder.append('/').append(trimmedPath) - } - } - - return builder.toString() -} \ No newline at end of file +fun CharSequence?.isNotNullEmpty(): Boolean = (this != null && this.isNotEmpty()) \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt index 3bc20927..7a873832 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt @@ -6,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) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt index 73cdf958..1ecfff47 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt +++ b/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 { 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 { 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, 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 { val dicQuery = HashMap() 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() - } -} +} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt index 8c641f24..0c85b171 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt @@ -4,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 } + + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt index 3b3dc88c..0aad9c88 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt +++ b/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() @@ -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 } + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt index 87ba74f8..c4edc5bd 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt +++ b/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 { - V2rayConfigManager.populateTransportSettings(it, profileItem) - } + val sni = outboundBean?.streamSettings?.populateTransportSettings( + profileItem.network.orEmpty(), + profileItem.headerType, + profileItem.host, + profileItem.path, + profileItem.seed, + profileItem.quicSecurity, + profileItem.quicKey, + profileItem.mode, + profileItem.serviceName, + profileItem.authority, + ) - outboundBean?.streamSettings?.let { - V2rayConfigManager.populateTlsSettings(it, profileItem, sni) - } + outboundBean?.streamSettings?.populateTlsSettings( + profileItem.security.orEmpty(), + profileItem.insecure == true, + if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni, + profileItem.fingerPrint, + profileItem.alpn, + profileItem.publicKey, + profileItem.shortId, + profileItem.spiderX, + ) return outboundBean } + + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt index 30bc08e4..b610a9da 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt +++ b/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 } + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt index 446ef99c..7139ada0 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt +++ b/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 { - V2rayConfigManager.populateTransportSettings(it, profileItem) - } + val sni = outboundBean?.streamSettings?.populateTransportSettings( + profileItem.network.orEmpty(), + profileItem.headerType, + profileItem.host, + profileItem.path, + profileItem.seed, + profileItem.quicSecurity, + profileItem.quicKey, + profileItem.mode, + profileItem.serviceName, + profileItem.authority, + ) - outboundBean?.streamSettings?.let { - V2rayConfigManager.populateTlsSettings(it, profileItem, sni) - } + outboundBean?.streamSettings?.populateTlsSettings( + profileItem.security.orEmpty(), + profileItem.insecure == true, + if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni, + profileItem.fingerPrint, + profileItem.alpn, + profileItem.publicKey, + profileItem.shortId, + profileItem.spiderX, + ) return outboundBean } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt index 9242f0ec..a4ca34c5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt +++ b/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 { - V2rayConfigManager.populateTransportSettings(it, profileItem) - } + val sni = outboundBean?.streamSettings?.populateTransportSettings( + profileItem.network.orEmpty(), + profileItem.headerType, + profileItem.host, + profileItem.path, + profileItem.seed, + profileItem.quicSecurity, + profileItem.quicKey, + profileItem.mode, + profileItem.serviceName, + profileItem.authority, + ) + outboundBean?.streamSettings?.xhttpSettings?.mode = profileItem.xhttpMode + outboundBean?.streamSettings?.xhttpSettings?.extra = JsonUtil.parseString(profileItem.xhttpExtra) - outboundBean?.streamSettings?.let { - V2rayConfigManager.populateTlsSettings(it, profileItem, sni) - } + outboundBean?.streamSettings?.populateTlsSettings( + profileItem.security.orEmpty(), + profileItem.insecure == true, + if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni, + profileItem.fingerPrint, + profileItem.alpn, + profileItem.publicKey, + profileItem.shortId, + profileItem.spiderX, + ) return outboundBean } + + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt index 4201f4dc..72a5868a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt +++ b/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 { - V2rayConfigManager.populateTransportSettings(it, profileItem) - } + val sni = outboundBean?.streamSettings?.populateTransportSettings( + profileItem.network.orEmpty(), + profileItem.headerType, + profileItem.host, + profileItem.path, + profileItem.seed, + profileItem.quicSecurity, + profileItem.quicKey, + profileItem.mode, + profileItem.serviceName, + profileItem.authority, + ) - outboundBean?.streamSettings?.let { - V2rayConfigManager.populateTlsSettings(it, profileItem, sni) - } + outboundBean?.streamSettings?.populateTlsSettings( + profileItem.security.orEmpty(), + profileItem.insecure == true, + if (profileItem.sni.isNullOrEmpty()) sni else profileItem.sni, + profileItem.fingerPrint, + profileItem.alpn, + null, + null, + null + ) return outboundBean } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt index 8f1cec84..11231887 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt @@ -6,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() 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) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt index d24ae0c2..32b19f00 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt +++ b/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.ProfileItem -import com.v2ray.ang.dto.SubscriptionItem +import com.v2ray.ang.dto.* 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. - * - * @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): 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 { - 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 = - JsonUtil.fromJson(server, Array::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. + * parse config form qrcode or... */ 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. - * - * @return The number of configurations updated. + * share config */ + 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): 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 { + 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 = + JsonUtil.fromJson(server, Array::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): 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) { - if (!Utils.isValidSubUrl(url)) { - return 0 - } - } - Log.i(AppConfig.TAG, url) + Log.d(AppConfig.ANG_PACKAGE, 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 { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt index 9dd90c76..a6b63412 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MigrateManager.kt +++ b/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 diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt index 9b589dd0..e8cc78fe 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt @@ -1,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) { mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList)) } - /** - * Decodes the server list. - * - * @return The list of server GUIDs. - */ fun decodeServerList(): MutableList { 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?) { 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> { 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) { mainStorage.encode(KEY_SUB_IDS, JsonUtil.toJson(subsList)) } - /** - * Decodes the subscription list. - * - * @return The list of subscription IDs. - */ fun decodeSubsList(): MutableList { 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> { val assetUrlItems = mutableListOf>() 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? { val ruleset = settingsStorage.decodeString(PREF_ROUTING_RULESET) if (ruleset.isNullOrEmpty()) return null return JsonUtil.fromJson(ruleset, Array::class.java).toMutableList() } - /** - * Encodes the routing rulesets. - * - * @param rulesetList The list of routing rulesets. - */ fun encodeRoutingRulesets(rulesetList: MutableList?) { 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): Boolean { return settingsStorage.encode(key, value) } - /** - * Decodes the settings string. - * - * @param key The settings key. - * @return The settings value. - */ + fun decodeSettingsString(key: String): String? { return settingsStorage.decodeString(key) } - /** - * Decodes the settings string. - * - * @param key The settings key. - * @param defaultValue The default value. - * @return The settings value. - */ fun decodeSettingsString(key: String, defaultValue: String?): String? { return settingsStorage.decodeString(key, defaultValue) } - /** - * Decodes the settings boolean. - * - * @param key The settings key. - * @return The settings value. - */ fun decodeSettingsBool(key: String): Boolean { return settingsStorage.decodeBool(key, false) } - /** - * Decodes the settings boolean. - * - * @param key The settings key. - * @param defaultValue The default value. - * @return The settings value. - */ fun decodeSettingsBool(key: String, defaultValue: Boolean): Boolean { return settingsStorage.decodeBool(key, defaultValue) } - /** - * Decodes the settings string set. - * - * @param key The settings key. - * @return The settings value. - */ + fun decodeSettingsInt(key: String, defaultValue: Int): Int { + return settingsStorage.decodeInt(key, defaultValue) + } + fun decodeSettingsStringSet(key: String): MutableSet? { 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) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt index b2e23f7f..864d1799 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt @@ -4,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? { val fileName = RoutingType.fromIndex(index).fileName val assets = Utils.readTextFromAssets(context, fileName) @@ -56,21 +42,12 @@ object SettingsManager { return JsonUtil.fromJson(assets, Array::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) { val rulesetNew: MutableList = 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() - if (rulesetList.isNullOrEmpty()) { - rulesetList = mutableListOf() - } + val rulesetList = MmkvManager.decodeRoutingRulesets() + if (rulesetList.isNullOrEmpty()) return 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 { - 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 { - 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 { - 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) } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt deleted file mode 100644 index 37b55c2e..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/UpdateCheckerManager.kt +++ /dev/null @@ -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::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") - } -} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt index f53697bb..8c432dde 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt @@ -4,232 +4,129 @@ import android.content.Context import android.text.TextUtils import android.util.Log import com.v2ray.ang.AppConfig +import com.v2ray.ang.AppConfig.ANG_PACKAGE +import com.v2ray.ang.AppConfig.DEFAULT_NETWORK +import com.v2ray.ang.AppConfig.DNS_ALIDNS_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_ALIDNS_DOMAIN +import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_CLOUDFLARE_DOMAIN +import com.v2ray.ang.AppConfig.DNS_DNSPOD_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_DNSPOD_DOMAIN +import com.v2ray.ang.AppConfig.DNS_GOOGLE_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_GOOGLE_DOMAIN +import com.v2ray.ang.AppConfig.DNS_QUAD9_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_QUAD9_DOMAIN +import com.v2ray.ang.AppConfig.DNS_YANDEX_ADDRESSES +import com.v2ray.ang.AppConfig.DNS_YANDEX_DOMAIN +import com.v2ray.ang.AppConfig.GEOIP_CN +import com.v2ray.ang.AppConfig.GEOSITE_CN +import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE +import com.v2ray.ang.AppConfig.GOOGLEAPIS_CN_DOMAIN +import com.v2ray.ang.AppConfig.GOOGLEAPIS_COM_DOMAIN +import com.v2ray.ang.AppConfig.HEADER_TYPE_HTTP +import com.v2ray.ang.AppConfig.LOOPBACK +import com.v2ray.ang.AppConfig.PROTOCOL_FREEDOM +import com.v2ray.ang.AppConfig.TAG_BLOCKED +import com.v2ray.ang.AppConfig.TAG_DIRECT +import com.v2ray.ang.AppConfig.TAG_FRAGMENT +import com.v2ray.ang.AppConfig.TAG_PROXY +import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4 +import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6 import com.v2ray.ang.dto.ConfigResult import com.v2ray.ang.dto.EConfigType import com.v2ray.ang.dto.NetworkType import com.v2ray.ang.dto.ProfileItem import com.v2ray.ang.dto.RulesetItem import com.v2ray.ang.dto.V2rayConfig -import com.v2ray.ang.dto.V2rayConfig.OutboundBean -import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean -import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean import com.v2ray.ang.extension.isNotNullEmpty import com.v2ray.ang.fmt.HttpFmt +import com.v2ray.ang.fmt.Hysteria2Fmt import com.v2ray.ang.fmt.ShadowsocksFmt import com.v2ray.ang.fmt.SocksFmt import com.v2ray.ang.fmt.TrojanFmt import com.v2ray.ang.fmt.VlessFmt import com.v2ray.ang.fmt.VmessFmt import com.v2ray.ang.fmt.WireguardFmt -import com.v2ray.ang.util.HttpUtil import com.v2ray.ang.util.JsonUtil import com.v2ray.ang.util.Utils object V2rayConfigManager { - private var initConfigCache: String? = null - //region get config function - - /** - * Retrieves the V2ray configuration for the given GUID. - * - * @param context The context of the caller. - * @param guid The unique identifier for the V2ray configuration. - * @return A ConfigResult object containing the configuration details or indicating failure. - */ fun getV2rayConfig(context: Context, guid: String): ConfigResult { try { val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false) - return if (config.configType == EConfigType.CUSTOM) { - getV2rayCustomConfig(guid, config) - } else { - getV2rayNormalConfig(context, guid, config) + if (config.configType == EConfigType.CUSTOM) { + val raw = MmkvManager.decodeServerRaw(guid) ?: return ConfigResult(false) + val domainPort = config.getServerAddressAndPort() + return ConfigResult(true, guid, raw, domainPort) } + + val result = getV2rayNonCustomConfig(context, config) + //Log.d(ANG_PACKAGE, result.content) + result.guid = guid + return result } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to get V2ray config", e) + e.printStackTrace() return ConfigResult(false) } } - /** - * Retrieves the speedtest V2ray configuration for the given GUID. - * - * @param context The context of the caller. - * @param guid The unique identifier for the V2ray configuration. - * @return A ConfigResult object containing the configuration details or indicating failure. - */ - fun getV2rayConfig4Speedtest(context: Context, guid: String): ConfigResult { - try { - val config = MmkvManager.decodeServerConfig(guid) ?: return ConfigResult(false) - return if (config.configType == EConfigType.CUSTOM) { - getV2rayCustomConfig(guid, config) - } else { - getV2rayNormalConfig4Speedtest(context, guid, config) - } - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to get V2ray config for speedtest", e) - return ConfigResult(false) - } - } - - /** - * Retrieves the custom V2ray configuration. - * - * @param guid The unique identifier for the V2ray configuration. - * @param config The profile item containing the configuration details. - * @return A ConfigResult object containing the result of the configuration retrieval. - */ - private fun getV2rayCustomConfig(guid: String, config: ProfileItem): ConfigResult { - val raw = MmkvManager.decodeServerRaw(guid) ?: return ConfigResult(false) - return ConfigResult(true, guid, raw) - } - - /** - * Retrieves the normal V2ray configuration. - * - * @param context The context in which the function is called. - * @param guid The unique identifier for the V2ray configuration. - * @param config The profile item containing the configuration details. - * @return A ConfigResult object containing the result of the configuration retrieval. - */ - private fun getV2rayNormalConfig(context: Context, guid: String, config: ProfileItem): ConfigResult { + private fun getV2rayNonCustomConfig(context: Context, config: ProfileItem): ConfigResult { val result = ConfigResult(false) val address = config.server ?: return result - if (!Utils.isPureIpAddress(address)) { + if (!Utils.isIpAddress(address)) { if (!Utils.isValidUrl(address)) { - Log.w(AppConfig.TAG, "$address is an invalid ip or domain") + Log.d(ANG_PACKAGE, "$address is an invalid ip or domain") return result } } - val v2rayConfig = initV2rayConfig(context) ?: return result - v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning" + //取得默认配置 + val assets = Utils.readTextFromAssets(context, "v2ray_config.json") + if (TextUtils.isEmpty(assets)) { + return result + } + val v2rayConfig = JsonUtil.fromJson(assets, V2rayConfig::class.java) ?: return result + v2rayConfig.log.loglevel = + MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning" v2rayConfig.remarks = config.remarks - getInbounds(v2rayConfig) + inbounds(v2rayConfig) - if (config.configType == EConfigType.HYSTERIA2) { - result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result - } else { - getOutbounds(v2rayConfig, config) ?: return result - getMoreOutbounds(v2rayConfig, config.subscriptionId) - } + val isPlugin = config.configType == EConfigType.HYSTERIA2 + val retOut = outbounds(v2rayConfig, config, isPlugin) ?: return result + val retMore = moreOutbounds(v2rayConfig, config.subscriptionId, isPlugin) - getRouting(v2rayConfig) + routing(v2rayConfig) - getFakeDns(v2rayConfig) + fakedns(v2rayConfig) - getDns(v2rayConfig) + dns(v2rayConfig) if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true) { - getCustomLocalDns(v2rayConfig) + customLocalDns(v2rayConfig) } if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) { v2rayConfig.stats = null v2rayConfig.policy = null } - //Resolve and add to DNS Hosts - if (MmkvManager.decodeSettingsString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "1") == "1") { - resolveOutboundDomainsToHosts(v2rayConfig) - } - result.status = true - result.content = JsonUtil.toJsonPretty(v2rayConfig) ?: "" - result.guid = guid + result.content = v2rayConfig.toPrettyPrinting() + result.domainPort = if (retMore.first) retMore.second else retOut.second return result } - /** - * Retrieves the normal V2ray configuration for speedtest. - * - * @param context The context in which the function is called. - * @param guid The unique identifier for the V2ray configuration. - * @param config The profile item containing the configuration details. - * @return A ConfigResult object containing the result of the configuration retrieval. - */ - private fun getV2rayNormalConfig4Speedtest(context: Context, guid: String, config: ProfileItem): ConfigResult { - val result = ConfigResult(false) - - val address = config.server ?: return result - if (!Utils.isPureIpAddress(address)) { - if (!Utils.isValidUrl(address)) { - Log.w(AppConfig.TAG, "$address is an invalid ip or domain") - return result - } - } - - val v2rayConfig = initV2rayConfig(context) ?: return result - - if (config.configType == EConfigType.HYSTERIA2) { - result.socksPort = getPlusOutbounds(v2rayConfig, config) ?: return result - } else { - getOutbounds(v2rayConfig, config) ?: return result - getMoreOutbounds(v2rayConfig, config.subscriptionId) - } - - v2rayConfig.log.loglevel = MmkvManager.decodeSettingsString(AppConfig.PREF_LOGLEVEL) ?: "warning" - v2rayConfig.inbounds.clear() - v2rayConfig.routing.rules.clear() - v2rayConfig.dns = null - v2rayConfig.fakedns = null - v2rayConfig.stats = null - v2rayConfig.policy = null - - v2rayConfig.outbounds.forEach { key -> - key.mux = null - } - - result.status = true - result.content = JsonUtil.toJsonPretty(v2rayConfig) ?: "" - result.guid = guid - return result - } - - /** - * Initializes V2ray configuration. - * - * This function loads the V2ray configuration from assets or from a cached value. - * It first attempts to use the cached configuration if available, otherwise reads - * the configuration from the "v2ray_config.json" asset file. - * - * @param context Android context used to access application assets - * @return V2rayConfig object parsed from the JSON configuration, or null if the configuration is empty - */ - private fun initV2rayConfig(context: Context): V2rayConfig? { - val assets = initConfigCache ?: Utils.readTextFromAssets(context, "v2ray_config.json") - if (TextUtils.isEmpty(assets)) { - return null - } - initConfigCache = assets - val config = JsonUtil.fromJson(assets, V2rayConfig::class.java) - return config - } - - - //endregion - - - //region some sub function - - /** - * Configures the inbound settings for V2ray. - * - * This function sets up the listening ports, sniffing options, and other inbound-related configurations. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @return true if inbound configuration was successful, false otherwise - */ - private fun getInbounds(v2rayConfig: V2rayConfig): Boolean { + private fun inbounds(v2rayConfig: V2rayConfig): Boolean { try { val socksPort = SettingsManager.getSocksPort() v2rayConfig.inbounds.forEach { curInbound -> if (MmkvManager.decodeSettingsBool(AppConfig.PREF_PROXY_SHARING) != true) { //bind all inbounds to localhost if the user requests - curInbound.listen = AppConfig.LOOPBACK + curInbound.listen = LOOPBACK } } v2rayConfig.inbounds[0].port = socksPort @@ -254,20 +151,50 @@ object V2rayConfigManager { } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure inbounds", e) + e.printStackTrace() return false } return true } - /** - * Configures the fake DNS settings if enabled. - * - * Adds FakeDNS configuration to v2rayConfig if both local DNS and fake DNS are enabled. - * - * @param v2rayConfig The V2ray configuration object to be modified - */ - private fun getFakeDns(v2rayConfig: V2rayConfig) { + private fun outbounds(v2rayConfig: V2rayConfig, config: ProfileItem, isPlugin: Boolean): Pair? { + if (isPlugin) { + val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0)) + val outboundNew = V2rayConfig.OutboundBean( + mux = null, + protocol = EConfigType.SOCKS.name.lowercase(), + settings = V2rayConfig.OutboundBean.OutSettingsBean( + servers = listOf( + V2rayConfig.OutboundBean.OutSettingsBean.ServersBean( + address = LOOPBACK, + port = socksPort + ) + ) + ) + ) + if (v2rayConfig.outbounds.isNotEmpty()) { + v2rayConfig.outbounds[0] = outboundNew + } else { + v2rayConfig.outbounds.add(outboundNew) + } + return Pair(true, outboundNew.getServerAddressAndPort()) + } + + val outbound = getProxyOutbound(config) ?: return null + val ret = updateOutboundWithGlobalSettings(outbound) + if (!ret) return null + + if (v2rayConfig.outbounds.isNotEmpty()) { + v2rayConfig.outbounds[0] = outbound + } else { + v2rayConfig.outbounds.add(outbound) + } + + updateOutboundFragment(v2rayConfig) + return Pair(true, config.getServerAddressAndPort()) + } + + private fun fakedns(v2rayConfig: V2rayConfig) { if (MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED) == true && MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true ) { @@ -275,39 +202,25 @@ object V2rayConfigManager { } } - /** - * Configures routing settings for V2ray. - * - * Sets up the domain strategy and adds routing rules from saved rulesets. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @return true if routing configuration was successful, false otherwise - */ - private fun getRouting(v2rayConfig: V2rayConfig): Boolean { + private fun routing(v2rayConfig: V2rayConfig): Boolean { try { v2rayConfig.routing.domainStrategy = MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) - ?: "AsIs" + ?: "IPIfNonMatch" val rulesetItems = MmkvManager.decodeRoutingRulesets() rulesetItems?.forEach { key -> - getRoutingUserRule(key, v2rayConfig) + routingUserRule(key, v2rayConfig) } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure routing", e) + e.printStackTrace() return false } return true } - /** - * Adds a specific ruleset item to the routing configuration. - * - * @param item The ruleset item to add - * @param v2rayConfig The V2ray configuration object to be modified - */ - private fun getRoutingUserRule(item: RulesetItem?, v2rayConfig: V2rayConfig) { + private fun routingUserRule(item: RulesetItem?, v2rayConfig: V2rayConfig) { try { if (item == null || !item.enabled) { return @@ -318,26 +231,18 @@ object V2rayConfigManager { v2rayConfig.routing.rules.add(rule) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to apply routing user rule", e) + e.printStackTrace() } } - /** - * Retrieves domain rules for a specific outbound tag. - * - * Searches through all rulesets to find domains targeting the specified tag. - * - * @param tag The outbound tag to search for - * @return ArrayList of domain rules matching the tag - */ - private fun getUserRule2Domain(tag: String): ArrayList { + private fun userRule2Domain(tag: String): ArrayList { val domain = ArrayList() val rulesetItems = MmkvManager.decodeRoutingRulesets() rulesetItems?.forEach { key -> if (key.enabled && key.outboundTag == tag && !key.domain.isNullOrEmpty()) { key.domain?.forEach { - if (it != AppConfig.GEOSITE_PRIVATE + if (it != GEOSITE_PRIVATE && (it.startsWith("geosite:") || it.startsWith("domain:")) ) { domain.add(it) @@ -349,22 +254,14 @@ object V2rayConfigManager { return domain } - /** - * Configures custom local DNS settings. - * - * Sets up DNS inbound, outbound, and routing rules for local DNS resolution. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @return true if custom local DNS configuration was successful, false otherwise - */ - private fun getCustomLocalDns(v2rayConfig: V2rayConfig): Boolean { + private fun customLocalDns(v2rayConfig: V2rayConfig): Boolean { try { if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) { - val geositeCn = arrayListOf(AppConfig.GEOSITE_CN) - val proxyDomain = getUserRule2Domain(AppConfig.TAG_PROXY) - val directDomain = getUserRule2Domain(AppConfig.TAG_DIRECT) + val geositeCn = arrayListOf(GEOSITE_CN) + val proxyDomain = userRule2Domain(TAG_PROXY) + val directDomain = userRule2Domain(TAG_DIRECT) // fakedns with all domains to make it always top priority - v2rayConfig.dns?.servers?.add( + v2rayConfig.dns.servers?.add( 0, V2rayConfig.DnsBean.ServersBean( address = "fakedns", @@ -373,8 +270,8 @@ object V2rayConfigManager { ) } - // DNS inbound - val remoteDns = SettingsManager.getRemoteDnsServers() + // DNS inbound对象 + val remoteDns = Utils.getRemoteDnsServers() if (v2rayConfig.inbounds.none { e -> e.protocol == "dokodemo-door" && e.tag == "dns-in" }) { val dnsInboundSettings = V2rayConfig.InboundBean.InSettingsBean( address = if (Utils.isPureIpAddress(remoteDns.first())) remoteDns.first() else AppConfig.DNS_PROXY, @@ -390,7 +287,7 @@ object V2rayConfigManager { V2rayConfig.InboundBean( tag = "dns-in", port = localDnsPort, - listen = AppConfig.LOOPBACK, + listen = LOOPBACK, protocol = "dokodemo-door", settings = dnsInboundSettings, sniffing = null @@ -398,7 +295,7 @@ object V2rayConfigManager { ) } - // DNS outbound + // DNS outbound对象 if (v2rayConfig.outbounds.none { e -> e.protocol == "dns" && e.tag == "dns-out" }) { v2rayConfig.outbounds.add( V2rayConfig.OutboundBean( @@ -420,28 +317,20 @@ object V2rayConfigManager { ) ) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure custom local DNS", e) + e.printStackTrace() return false } return true } - /** - * Configures the DNS settings for V2ray. - * - * Sets up DNS servers, hosts, and routing rules for DNS resolution. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @return true if DNS configuration was successful, false otherwise - */ - private fun getDns(v2rayConfig: V2rayConfig): Boolean { + private fun dns(v2rayConfig: V2rayConfig): Boolean { try { val hosts = mutableMapOf() val servers = ArrayList() //remote Dns - val remoteDns = SettingsManager.getRemoteDnsServers() - val proxyDomain = getUserRule2Domain(AppConfig.TAG_PROXY) + val remoteDns = Utils.getRemoteDnsServers() + val proxyDomain = userRule2Domain(TAG_PROXY) remoteDns.forEach { servers.add(it) } @@ -455,10 +344,10 @@ object V2rayConfigManager { } // domestic DNS - val domesticDns = SettingsManager.getDomesticDnsServers() - val directDomain = getUserRule2Domain(AppConfig.TAG_DIRECT) - val isCnRoutingMode = directDomain.contains(AppConfig.GEOSITE_CN) - val geoipCn = arrayListOf(AppConfig.GEOIP_CN) + val domesticDns = Utils.getDomesticDnsServers() + val directDomain = userRule2Domain(TAG_DIRECT) + val isCnRoutingMode = directDomain.contains(GEOSITE_CN) + val geoipCn = arrayListOf(GEOIP_CN) if (directDomain.isNotEmpty()) { servers.add( V2rayConfig.DnsBean.ServersBean( @@ -473,7 +362,7 @@ object V2rayConfigManager { if (Utils.isPureIpAddress(domesticDns.first())) { v2rayConfig.routing.rules.add( 0, RulesBean( - outboundTag = AppConfig.TAG_DIRECT, + outboundTag = TAG_DIRECT, port = "53", ip = arrayListOf(domesticDns.first()), domain = null @@ -481,25 +370,6 @@ object V2rayConfigManager { ) } - //block dns - val blkDomain = getUserRule2Domain(AppConfig.TAG_BLOCKED) - if (blkDomain.isNotEmpty()) { - hosts.putAll(blkDomain.map { it to AppConfig.LOOPBACK }) - } - - // hardcode googleapi rule to fix play store problems - hosts[AppConfig.GOOGLEAPIS_CN_DOMAIN] = AppConfig.GOOGLEAPIS_COM_DOMAIN - - // hardcode popular Android Private DNS rule to fix localhost DNS problem - hosts[AppConfig.DNS_ALIDNS_DOMAIN] = AppConfig.DNS_ALIDNS_ADDRESSES - hosts[AppConfig.DNS_CLOUDFLARE_ONE_DOMAIN] = AppConfig.DNS_CLOUDFLARE_ONE_ADDRESSES - hosts[AppConfig.DNS_CLOUDFLARE_DNS_COM_DOMAIN] = AppConfig.DNS_CLOUDFLARE_DNS_COM_ADDRESSES - hosts[AppConfig.DNS_CLOUDFLARE_DNS_DOMAIN] = AppConfig.DNS_CLOUDFLARE_DNS_ADDRESSES - hosts[AppConfig.DNS_DNSPOD_DOMAIN] = AppConfig.DNS_DNSPOD_ADDRESSES - hosts[AppConfig.DNS_GOOGLE_DOMAIN] = AppConfig.DNS_GOOGLE_ADDRESSES - hosts[AppConfig.DNS_QUAD9_DOMAIN] = AppConfig.DNS_QUAD9_ADDRESSES - hosts[AppConfig.DNS_YANDEX_DOMAIN] = AppConfig.DNS_YANDEX_ADDRESSES - //User DNS hosts try { val userHosts = MmkvManager.decodeSettingsString(AppConfig.PREF_DNS_HOSTS) @@ -511,10 +381,28 @@ object V2rayConfigManager { if (userHostsMap != null) hosts.putAll(userHostsMap) } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure user DNS hosts", e) + e.printStackTrace() } - // DNS dns + //block dns + val blkDomain = userRule2Domain(TAG_BLOCKED) + if (blkDomain.isNotEmpty()) { + hosts.putAll(blkDomain.map { it to LOOPBACK }) + } + + // hardcode googleapi rule to fix play store problems + hosts[GOOGLEAPIS_CN_DOMAIN] = GOOGLEAPIS_COM_DOMAIN + + // hardcode popular Android Private DNS rule to fix localhost DNS problem + hosts[DNS_ALIDNS_DOMAIN] = DNS_ALIDNS_ADDRESSES + hosts[DNS_CLOUDFLARE_DOMAIN] = DNS_CLOUDFLARE_ADDRESSES + hosts[DNS_DNSPOD_DOMAIN] = DNS_DNSPOD_ADDRESSES + hosts[DNS_GOOGLE_DOMAIN] = DNS_GOOGLE_ADDRESSES + hosts[DNS_QUAD9_DOMAIN] = DNS_QUAD9_ADDRESSES + hosts[DNS_YANDEX_DOMAIN] = DNS_YANDEX_ADDRESSES + + + // DNS dns对象 v2rayConfig.dns = V2rayConfig.DnsBean( servers = servers, hosts = hosts @@ -524,7 +412,7 @@ object V2rayConfigManager { if (Utils.isPureIpAddress(remoteDns.first())) { v2rayConfig.routing.rules.add( 0, RulesBean( - outboundTag = AppConfig.TAG_PROXY, + outboundTag = TAG_PROXY, port = "53", ip = arrayListOf(remoteDns.first()), domain = null @@ -532,144 +420,12 @@ object V2rayConfigManager { ) } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure DNS", e) + e.printStackTrace() return false } return true } - - //endregion - - - //region outbound related functions - - /** - * Configures the primary outbound connection. - * - * Converts the profile to an outbound configuration and applies global settings. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @param config The profile item containing connection details - * @return true if outbound configuration was successful, null if there was an error - */ - private fun getOutbounds(v2rayConfig: V2rayConfig, config: ProfileItem): Boolean? { - val outbound = convertProfile2Outbound(config) ?: return null - val ret = updateOutboundWithGlobalSettings(outbound) - if (!ret) return null - - if (v2rayConfig.outbounds.isNotEmpty()) { - v2rayConfig.outbounds[0] = outbound - } else { - v2rayConfig.outbounds.add(outbound) - } - - updateOutboundFragment(v2rayConfig) - return true - } - - /** - * Configures special outbound settings for Hysteria2 protocol. - * - * Creates a SOCKS outbound connection on a free port for protocols requiring special handling. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @param config The profile item containing connection details - * @return The port number for the SOCKS connection, or null if there was an error - */ - private fun getPlusOutbounds(v2rayConfig: V2rayConfig, config: ProfileItem): Int? { - try { - val socksPort = Utils.findFreePort(listOf(100 + SettingsManager.getSocksPort(), 0)) - - val outboundNew = OutboundBean( - mux = null, - protocol = EConfigType.SOCKS.name.lowercase(), - settings = OutSettingsBean( - servers = listOf( - OutSettingsBean.ServersBean( - address = AppConfig.LOOPBACK, - port = socksPort - ) - ) - ) - ) - if (v2rayConfig.outbounds.isNotEmpty()) { - v2rayConfig.outbounds[0] = outboundNew - } else { - v2rayConfig.outbounds.add(outboundNew) - } - - return socksPort - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure plusOutbound", e) - return null - } - } - - /** - * Configures additional outbound connections for proxy chaining. - * - * Sets up previous and next proxies in a subscription for advanced routing capabilities. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @param subscriptionId The subscription ID to look up related proxies - * @return true if additional outbounds were configured successfully, false otherwise - */ - private fun getMoreOutbounds(v2rayConfig: V2rayConfig, subscriptionId: String): Boolean { - //fragment proxy - if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) { - return false - } - - if (subscriptionId.isEmpty()) { - return false - } - try { - val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return false - - //current proxy - val outbound = v2rayConfig.outbounds[0] - - //Previous proxy - val prevNode = SettingsManager.getServerViaRemarks(subItem.prevProfile) - if (prevNode != null) { - val prevOutbound = convertProfile2Outbound(prevNode) - if (prevOutbound != null) { - updateOutboundWithGlobalSettings(prevOutbound) - prevOutbound.tag = AppConfig.TAG_PROXY + "2" - v2rayConfig.outbounds.add(prevOutbound) - outbound.ensureSockopt().dialerProxy = prevOutbound.tag - } - } - - //Next proxy - val nextNode = SettingsManager.getServerViaRemarks(subItem.nextProfile) - if (nextNode != null) { - val nextOutbound = convertProfile2Outbound(nextNode) - if (nextOutbound != null) { - updateOutboundWithGlobalSettings(nextOutbound) - nextOutbound.tag = AppConfig.TAG_PROXY - v2rayConfig.outbounds.add(0, nextOutbound) - outbound.tag = AppConfig.TAG_PROXY + "1" - nextOutbound.ensureSockopt().dialerProxy = outbound.tag - } - } - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to configure more outbounds", e) - return false - } - - return true - } - - /** - * Updates outbound settings based on global preferences. - * - * Applies multiplexing and protocol-specific settings to an outbound connection. - * - * @param outbound The outbound connection to update - * @return true if the update was successful, false otherwise - */ private fun updateOutboundWithGlobalSettings(outbound: V2rayConfig.OutboundBean): Boolean { try { var muxEnabled = MmkvManager.decodeSettingsBool(AppConfig.PREF_MUX_ENABLED, false) @@ -682,18 +438,21 @@ object V2rayConfigManager { || protocol.equals(EConfigType.HYSTERIA2.name, true) ) { muxEnabled = false + } else if (protocol.equals(EConfigType.VLESS.name, true) + && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true + ) { + muxEnabled = false } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) { muxEnabled = false } - if (muxEnabled == true) { outbound.mux?.enabled = true - outbound.mux?.concurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8").orEmpty().toInt() - outbound.mux?.xudpConcurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "16").orEmpty().toInt() - outbound.mux?.xudpProxyUDP443 = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC, "reject") - if (protocol.equals(EConfigType.VLESS.name, true) && outbound.settings?.vnext?.first()?.users?.first()?.flow?.isNotEmpty() == true) { - outbound.mux?.concurrency = -1 - } + outbound.mux?.concurrency = + MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_CONCURRENCY, 8) + outbound.mux?.xudpConcurrency = + MmkvManager.decodeSettingsInt(AppConfig.PREF_MUX_XUDP_CONCURRENCY, 16) + outbound.mux?.xudpProxyUDP443 = + MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_QUIC) ?: "reject" } else { outbound.mux?.enabled = false outbound.mux?.concurrency = -1 @@ -701,7 +460,7 @@ object V2rayConfigManager { if (protocol.equals(EConfigType.WIREGUARD.name, true)) { var localTunAddr = if (outbound.settings?.address == null) { - listOf(AppConfig.WIREGUARD_LOCAL_ADDRESS_V4) + listOf(WIREGUARD_LOCAL_ADDRESS_V4, WIREGUARD_LOCAL_ADDRESS_V6) } else { outbound.settings?.address as List<*> } @@ -711,8 +470,8 @@ object V2rayConfigManager { outbound.settings?.address = localTunAddr } - if (outbound.streamSettings?.network == AppConfig.DEFAULT_NETWORK - && outbound.streamSettings?.tcpSettings?.header?.type == AppConfig.HEADER_TYPE_HTTP + if (outbound.streamSettings?.network == DEFAULT_NETWORK + && outbound.streamSettings?.tcpSettings?.header?.type == HEADER_TYPE_HTTP ) { val path = outbound.streamSettings?.tcpSettings?.header?.request?.path val host = outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host @@ -722,7 +481,7 @@ object V2rayConfigManager { } outbound.streamSettings?.tcpSettings?.header?.request = JsonUtil.fromJson( requestString, - StreamSettingsBean.TcpSettingsBean.HeaderBean.RequestBean::class.java + V2rayConfig.OutboundBean.StreamSettingsBean.TcpSettingsBean.HeaderBean.RequestBean::class.java ) outbound.streamSettings?.tcpSettings?.header?.request?.path = if (path.isNullOrEmpty()) { @@ -735,20 +494,12 @@ object V2rayConfigManager { } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to update outbound with global settings", e) + e.printStackTrace() return false } return true } - /** - * Updates the outbound with fragment settings for traffic optimization. - * - * Configures packet fragmentation for TLS and REALITY protocols if enabled. - * - * @param v2rayConfig The V2ray configuration object to be modified - * @return true if fragment configuration was successful, false otherwise - */ private fun updateOutboundFragment(v2rayConfig: V2rayConfig): Boolean { try { if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == false) { @@ -762,8 +513,8 @@ object V2rayConfigManager { val fragmentOutbound = V2rayConfig.OutboundBean( - protocol = AppConfig.PROTOCOL_FREEDOM, - tag = AppConfig.TAG_FRAGMENT, + protocol = PROTOCOL_FREEDOM, + tag = TAG_FRAGMENT, mux = null ) @@ -779,8 +530,8 @@ object V2rayConfigManager { packets = "tlshello" } - fragmentOutbound.settings = OutboundBean.OutSettingsBean( - fragment = OutboundBean.OutSettingsBean.FragmentBean( + fragmentOutbound.settings = V2rayConfig.OutboundBean.OutSettingsBean( + fragment = V2rayConfig.OutboundBean.OutSettingsBean.FragmentBean( packets = packets, length = MmkvManager.decodeSettingsString(AppConfig.PREF_FRAGMENT_LENGTH) ?: "50-100", @@ -788,15 +539,15 @@ object V2rayConfigManager { ?: "10-20" ), noises = listOf( - OutboundBean.OutSettingsBean.NoiseBean( + V2rayConfig.OutboundBean.OutSettingsBean.NoiseBean( type = "rand", packet = "10-20", delay = "10-16", ) ), ) - fragmentOutbound.streamSettings = StreamSettingsBean( - sockopt = StreamSettingsBean.SockoptBean( + fragmentOutbound.streamSettings = V2rayConfig.OutboundBean.StreamSettingsBean( + sockopt = V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean( TcpNoDelay = true, mark = 255 ) @@ -805,61 +556,84 @@ object V2rayConfigManager { //proxy chain v2rayConfig.outbounds[0].streamSettings?.sockopt = - StreamSettingsBean.SockoptBean( - dialerProxy = AppConfig.TAG_FRAGMENT + V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean( + dialerProxy = TAG_FRAGMENT ) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to update outbound fragment", e) + e.printStackTrace() return false } return true } - /** - * Resolves domain names to IP addresses in outbound connections. - * - * Pre-resolves domains to improve connection speed and reliability. - * - * @param v2rayConfig The V2ray configuration object to be modified - */ - private fun resolveOutboundDomainsToHosts(v2rayConfig: V2rayConfig) { - val proxyOutboundList = v2rayConfig.getAllProxyOutbound() - val dns = v2rayConfig.dns ?: return - val newHosts = dns.hosts?.toMutableMap() ?: mutableMapOf() - val preferIpv6 = MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true + private fun moreOutbounds( + v2rayConfig: V2rayConfig, + subscriptionId: String, + isPlugin: Boolean + ): Pair { + val returnPair = Pair(false, "") + var domainPort: String = "" - for (item in proxyOutboundList) { - val domain = item.getServerAddress() - if (domain.isNullOrEmpty()) continue - - if (newHosts.containsKey(domain)) { - item.ensureSockopt().domainStrategy = if (preferIpv6) "UseIPv6v4" else "UseIPv4v6" - continue - } - - val resolvedIps = HttpUtil.resolveHostToIP(domain, preferIpv6) - if (resolvedIps.isNullOrEmpty()) continue - - item.ensureSockopt().domainStrategy = if (preferIpv6) "UseIPv6v4" else "UseIPv4v6" - newHosts[domain] = if (resolvedIps.size == 1) { - resolvedIps[0] - } else { - resolvedIps - } + if (isPlugin) { + return returnPair + } + //fragment proxy + if (MmkvManager.decodeSettingsBool(AppConfig.PREF_FRAGMENT_ENABLED, false) == true) { + return returnPair } - dns.hosts = newHosts + if (subscriptionId.isEmpty()) { + return returnPair + } + try { + val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return returnPair + + //current proxy + val outbound = v2rayConfig.outbounds[0] + + //Previous proxy + val prevNode = SettingsManager.getServerViaRemarks(subItem.prevProfile) + if (prevNode != null) { + val prevOutbound = getProxyOutbound(prevNode) + if (prevOutbound != null) { + updateOutboundWithGlobalSettings(prevOutbound) + prevOutbound.tag = TAG_PROXY + "2" + v2rayConfig.outbounds.add(prevOutbound) + outbound.streamSettings?.sockopt = + V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean( + dialerProxy = prevOutbound.tag + ) + domainPort = prevNode.getServerAddressAndPort() + } + } + + //Next proxy + val nextNode = SettingsManager.getServerViaRemarks(subItem.nextProfile) + if (nextNode != null) { + val nextOutbound = getProxyOutbound(nextNode) + if (nextOutbound != null) { + updateOutboundWithGlobalSettings(nextOutbound) + nextOutbound.tag = TAG_PROXY + v2rayConfig.outbounds.add(0, nextOutbound) + outbound.tag = TAG_PROXY + "1" + nextOutbound.streamSettings?.sockopt = + V2rayConfig.OutboundBean.StreamSettingsBean.SockoptBean( + dialerProxy = outbound.tag + ) + } + } + } catch (e: Exception) { + e.printStackTrace() + return returnPair + } + + if (domainPort.isNotEmpty()) { + return Pair(true, domainPort) + } + return returnPair } - /** - * Converts a profile item to an outbound configuration. - * - * Creates appropriate outbound settings based on the protocol type. - * - * @param profileItem The profile item to convert - * @return OutboundBean configuration for the profile, or null if not supported - */ - private fun convertProfile2Outbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? { + fun getProxyOutbound(profileItem: ProfileItem): V2rayConfig.OutboundBean? { return when (profileItem.configType) { EConfigType.VMESS -> VmessFmt.toOutbound(profileItem) EConfigType.CUSTOM -> null @@ -868,224 +642,10 @@ object V2rayConfigManager { EConfigType.VLESS -> VlessFmt.toOutbound(profileItem) EConfigType.TROJAN -> TrojanFmt.toOutbound(profileItem) EConfigType.WIREGUARD -> WireguardFmt.toOutbound(profileItem) - EConfigType.HYSTERIA2 -> null + EConfigType.HYSTERIA2 -> Hysteria2Fmt.toOutbound(profileItem) EConfigType.HTTP -> HttpFmt.toOutbound(profileItem) } + } - /** - * Creates an initial outbound configuration for a specific protocol type. - * - * Provides a template configuration for different protocol types. - * - * @param configType The type of configuration to create - * @return An initial OutboundBean for the specified configuration type, or null for custom types - */ - fun createInitOutbound(configType: EConfigType): OutboundBean? { - return when (configType) { - EConfigType.VMESS, - EConfigType.VLESS -> - return OutboundBean( - protocol = configType.name.lowercase(), - settings = OutSettingsBean( - vnext = listOf( - OutSettingsBean.VnextBean( - users = listOf(OutSettingsBean.VnextBean.UsersBean()) - ) - ) - ), - streamSettings = StreamSettingsBean() - ) - - EConfigType.SHADOWSOCKS, - EConfigType.SOCKS, - EConfigType.HTTP, - EConfigType.TROJAN, - EConfigType.HYSTERIA2 -> - return OutboundBean( - protocol = configType.name.lowercase(), - settings = OutSettingsBean( - servers = listOf(OutSettingsBean.ServersBean()) - ), - streamSettings = StreamSettingsBean() - ) - - EConfigType.WIREGUARD -> - return OutboundBean( - protocol = configType.name.lowercase(), - settings = OutSettingsBean( - secretKey = "", - peers = listOf(OutSettingsBean.WireGuardBean()) - ) - ) - - EConfigType.CUSTOM -> null - } - } - - /** - * Configures transport settings for an outbound connection. - * - * Sets up protocol-specific transport options based on the profile settings. - * - * @param streamSettings The stream settings to configure - * @param profileItem The profile containing transport configuration - * @return The Server Name Indication (SNI) value to use, or null if not applicable - */ - fun populateTransportSettings(streamSettings: StreamSettingsBean, profileItem: ProfileItem): String? { - val transport = profileItem.network.orEmpty() - val headerType = profileItem.headerType - val host = profileItem.host - val path = profileItem.path - val seed = profileItem.seed -// val quicSecurity = profileItem.quicSecurity -// val key = profileItem.quicKey - val mode = profileItem.mode - val serviceName = profileItem.serviceName - val authority = profileItem.authority - val xhttpMode = profileItem.xhttpMode - val xhttpExtra = profileItem.xhttpExtra - - var sni: String? = null - streamSettings.network = if (transport.isEmpty()) NetworkType.TCP.type else transport - when (streamSettings.network) { - NetworkType.TCP.type -> { - val tcpSetting = StreamSettingsBean.TcpSettingsBean() - if (headerType == AppConfig.HEADER_TYPE_HTTP) { - tcpSetting.header.type = AppConfig.HEADER_TYPE_HTTP - if (!TextUtils.isEmpty(host) || !TextUtils.isEmpty(path)) { - val requestObj = StreamSettingsBean.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 - } - streamSettings.tcpSettings = tcpSetting - } - - NetworkType.KCP.type -> { - val kcpsetting = StreamSettingsBean.KcpSettingsBean() - kcpsetting.header.type = headerType ?: "none" - if (seed.isNullOrEmpty()) { - kcpsetting.seed = null - } else { - kcpsetting.seed = seed - } - if (host.isNullOrEmpty()) { - kcpsetting.header.domain = null - } else { - kcpsetting.header.domain = host - } - streamSettings.kcpSettings = kcpsetting - } - - NetworkType.WS.type -> { - val wssetting = StreamSettingsBean.WsSettingsBean() - wssetting.headers.Host = host.orEmpty() - sni = host - wssetting.path = path ?: "/" - streamSettings.wsSettings = wssetting - } - - NetworkType.HTTP_UPGRADE.type -> { - val httpupgradeSetting = StreamSettingsBean.HttpupgradeSettingsBean() - httpupgradeSetting.host = host.orEmpty() - sni = host - httpupgradeSetting.path = path ?: "/" - streamSettings.httpupgradeSettings = httpupgradeSetting - } - - NetworkType.XHTTP.type -> { - val xhttpSetting = StreamSettingsBean.XhttpSettingsBean() - xhttpSetting.host = host.orEmpty() - sni = host - xhttpSetting.path = path ?: "/" - xhttpSetting.mode = xhttpMode - xhttpSetting.extra = JsonUtil.parseString(xhttpExtra) - streamSettings.xhttpSettings = xhttpSetting - } - - NetworkType.H2.type, NetworkType.HTTP.type -> { - streamSettings.network = NetworkType.H2.type - val h2Setting = StreamSettingsBean.HttpSettingsBean() - h2Setting.host = host.orEmpty().split(",").map { it.trim() }.filter { it.isNotEmpty() } - sni = h2Setting.host.getOrNull(0) - h2Setting.path = path ?: "/" - streamSettings.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 = StreamSettingsBean.GrpcSettingsBean() - grpcSetting.multiMode = mode == "multi" - grpcSetting.serviceName = serviceName.orEmpty() - grpcSetting.authority = authority.orEmpty() - grpcSetting.idle_timeout = 60 - grpcSetting.health_check_timeout = 20 - sni = authority - streamSettings.grpcSettings = grpcSetting - } - } - return sni - } - - /** - * Configures TLS or REALITY security settings for an outbound connection. - * - * Sets up security-related parameters like certificates, fingerprints, and SNI. - * - * @param streamSettings The stream settings to configure - * @param profileItem The profile containing security configuration - * @param sniExt An external SNI value to use if the profile doesn't specify one - */ - fun populateTlsSettings(streamSettings: StreamSettingsBean, profileItem: ProfileItem, sniExt: String?) { - val streamSecurity = profileItem.security.orEmpty() - val allowInsecure = profileItem.insecure == true - val sni = if (profileItem.sni.isNullOrEmpty()) { - when { - sniExt.isNotNullEmpty() && Utils.isDomainName(sniExt) -> sniExt - profileItem.server.isNotNullEmpty() && Utils.isDomainName(profileItem.server) -> profileItem.server - else -> sniExt - } - } else { - profileItem.sni - } - val fingerprint = profileItem.fingerPrint - val alpns = profileItem.alpn - val publicKey = profileItem.publicKey - val shortId = profileItem.shortId - val spiderX = profileItem.spiderX - - streamSettings.security = if (streamSecurity.isEmpty()) null else streamSecurity - if (streamSettings.security == null) return - val tlsSetting = StreamSettingsBean.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 (streamSettings.security == AppConfig.TLS) { - streamSettings.tlsSettings = tlsSetting - streamSettings.realitySettings = null - } else if (streamSettings.security == AppConfig.REALITY) { - streamSettings.tlsSettings = null - streamSettings.realitySettings = tlsSetting - } - } - - //endregion } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt deleted file mode 100644 index 0f6d37c0..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/CustomDividerItemDecoration.kt +++ /dev/null @@ -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) - } - } -} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt index b98129a7..ff61aadc 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/helper/SimpleItemTouchHelperCallback.kt @@ -16,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 } -} +} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt index e7e8457a..121cfd33 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/plugin/PluginManager.kt +++ b/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) -// .getString(value) + is Int -> AngApplication.application.packageManager.getResourcesForApplication(applicationInfo) + .getString(value) null -> null else -> error("meta-data $key has invalid type ${value.javaClass}") diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt index ae15e76c..acc86730 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/BootReceiver.kt @@ -7,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) } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt index bdb7bf9a..c6e49af4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/TaskerReceiver.kt @@ -5,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() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt index 99d9bda2..5aa6c2de 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/receiver/WidgetProvider.kt @@ -11,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()) { - V2RayServiceManager.stopVService(context) + if (V2RayServiceManager.v2rayPoint.isRunning) { + Utils.stopVService(context) } else { - V2RayServiceManager.startVServiceFromToggle(context) + Utils.startVServiceFromToggle(context) } } else if (AppConfig.BROADCAST_ACTION_ACTIVITY == intent.action) { AppWidgetManager.getInstance(context)?.let { manager -> diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt deleted file mode 100644 index 92c551a6..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/NotificationService.kt +++ /dev/null @@ -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() - } -} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt index e81e3615..89ab476f 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ProcessService.kt +++ b/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) { - 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()) } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt index 7aecf634..151d5c38 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/QSTileService.kt +++ b/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_ACTIVE) - } else { - setState(Tile.STATE_INACTIVE) - } + 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) } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ServiceControl.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/ServiceControl.kt index 085c72eb..36a26b88 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/ServiceControl.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/ServiceControl.kt @@ -3,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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt index 5f3f8172..4de3381b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdater.kt @@ -19,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}") } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt index 25fcd1a6..4d387a45 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayProxyOnlyService.kt @@ -6,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) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt index 4f42ca23..a008a840 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayServiceManager.kt @@ -1,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? = 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 - /** - * Starts the V2Ray service from a toggle action. - * @param context The context from which the service is started. - * @return True if the service was started successfully, false otherwise. - */ - fun startVServiceFromToggle(context: Context): Boolean { - if (MmkvManager.getSelectServer().isNullOrEmpty()) { - context.toast(R.string.app_tile_first_use) - return false - } - startContextService(context) - return true - } + private var lastQueryTime = 0L + private var mBuilder: NotificationCompat.Builder? = null + private var mDisposable: Disposable? = null + private var mNotificationManager: NotificationManager? = null - /** - * Starts the V2Ray service. - * @param context The context from which the service is started. - * @param guid The GUID of the server configuration to use (optional). - */ - fun startVService(context: Context, guid: String? = null) { - if (guid != null) { - MmkvManager.setSelectServer(guid) - } - startContextService(context) - } - - /** - * Stops the V2Ray service. - * @param context The context from which the service is stopped. - */ - fun stopVService(context: Context) { - context.toast(R.string.toast_services_stop) - MessageUtil.sendMsg2Service(context, AppConfig.MSG_STATE_STOP, "") - } - - /** - * Checks if the V2Ray service is running. - * @return True if the service is running, false otherwise. - */ - fun isRunning() = coreController.isRunning - - /** - * Gets the name of the currently running server. - * @return The name of the running server. - */ - fun getRunningServerName() = currentConfig?.remarks.orEmpty() - - /** - * Starts the context service for V2Ray. - * Chooses between VPN service or Proxy-only service based on user settings. - * @param context The context from which the service is started. - */ - private fun startContextService(context: Context) { - if (coreController.isRunning) { - return - } + fun startV2Ray(context: Context) { + if (v2rayPoint.isRunning) return val guid = MmkvManager.getSelectServer() ?: return val config = MmkvManager.decodeServerConfig(guid) ?: return - if (config.configType != EConfigType.CUSTOM - && !Utils.isValidUrl(config.server) - && !Utils.isPureIpAddress(config.server.orEmpty()) - ) return + if (!Utils.isValidUrl(config.server) && !Utils.isIpAddress(config.server)) 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 - val guid = MmkvManager.getSelectServer() ?: return false - val config = MmkvManager.decodeServerConfig(guid) ?: return false + fun startV2rayPoint() { + val service = serviceControl?.get()?.getService() ?: return + val guid = MmkvManager.getSelectServer() ?: return + val config = MmkvManager.decodeServerConfig(guid) ?: return + if (v2rayPoint.isRunning) { + return + } val result = V2rayConfigManager.getV2rayConfig(service, guid) if (!result.status) - return 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) - return false + Log.d(ANG_PACKAGE, e.toString()) } + 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) - return false + Log.d(ANG_PACKAGE, e.toString()) } - if (coreController.isRunning == false) { - MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "") - NotificationService.cancelNotification() - return false - } - - try { + if (v2rayPoint.isRunning) { MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_SUCCESS, "") - NotificationService.showNotification(currentConfig) - NotificationService.startSpeedNotification(currentConfig) + showNotification() - PluginUtil.runPlugin(service, config, result.socksPort) - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to startup service", e) - return false + PluginUtil.runPlugin(service, config, result.domainPort) + } else { + MessageUtil.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, "") + cancelNotification() } - return true } - /** - * Stops the V2Ray core service. - * Unregisters broadcast receivers, stops notifications, and shuts down plugins. - * @return True if the core was stopped successfully, false otherwise. - */ - fun stopCoreLoop(): Boolean { - val service = getService() ?: return false + fun stopV2rayPoint() { + val service = serviceControl?.get()?.getService() ?: return - 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") - NotificationService.stopSpeedNotification(currentConfig) + Log.d(ANG_PACKAGE, "SCREEN_OFF, stop querying stats") + stopSpeedNotification() } Intent.ACTION_SCREEN_ON -> { - Log.i(AppConfig.TAG, "SCREEN_ON, start querying stats") - NotificationService.startSpeedNotification(currentConfig) + Log.d(ANG_PACKAGE, "SCREEN_ON, start querying stats") + startSpeedNotification() } } } } + + private fun measureV2rayDelay() { + CoroutineScope(Dispatchers.IO).launch { + val service = serviceControl?.get()?.getService() ?: return@launch + var time = -1L + var errstr = "" + if (v2rayPoint.isRunning) { + try { + time = v2rayPoint.measureDelay(Utils.getDelayTestUrl()) + } catch (e: Exception) { + Log.d(ANG_PACKAGE, "measureV2rayDelay: $e") + errstr = e.message?.substringAfter("\":") ?: "empty message" + } + if (time == -1L) { + try { + time = v2rayPoint.measureDelay(Utils.getDelayTestUrl(true)) + } catch (e: Exception) { + Log.d(ANG_PACKAGE, "measureV2rayDelay: $e") + errstr = e.message?.substringAfter("\":") ?: "empty message" + } + } + } + val result = if (time == -1L) { + service.getString(R.string.connection_test_error, errstr) + } else { + service.getString(R.string.connection_test_available, time) + } + + MessageUtil.sendMsg2UI(service, AppConfig.MSG_MEASURE_DELAY_SUCCESS, result) + } + } + + private fun showNotification() { + val service = serviceControl?.get()?.getService() ?: return + val 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) + } + } + } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt index 3fef1ae1..372cf714 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt @@ -9,10 +9,10 @@ import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_SUCCESS import com.v2ray.ang.dto.EConfigType import com.v2ray.ang.extension.serializable import com.v2ray.ang.handler.MmkvManager -import com.v2ray.ang.handler.SpeedtestManager import com.v2ray.ang.handler.V2rayConfigManager import com.v2ray.ang.util.MessageUtil import com.v2ray.ang.util.PluginUtil +import com.v2ray.ang.util.SpeedtestUtil import com.v2ray.ang.util.Utils import go.Seq import kotlinx.coroutines.CoroutineScope @@ -26,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) - if (!configResult.status) { + val config = V2rayConfigManager.getV2rayConfig(this, guid) + if (!config.status) { return retFailure } - return SpeedtestManager.realPing(configResult.content) + return SpeedtestUtil.realPing(config.content) } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt index d734c299..41a5745d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayVpnService.kt +++ b/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()) { - startService() - } + V2RayServiceManager.startV2rayPoint() 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) - } - } - } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt index 1931cb45..eacacb35 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt +++ b/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.extension.toastSuccess -import com.v2ray.ang.handler.MmkvManager -import com.v2ray.ang.handler.SpeedtestManager +import com.v2ray.ang.util.SpeedtestUtil import com.v2ray.ang.util.Utils import com.v2ray.ang.util.ZipUtil import java.io.File import java.text.SimpleDateFormat import java.util.Locale -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, - FileProvider.getUriForFile( + Intent.EXTRA_STREAM, FileProvider.getUriForFile( this, BuildConfig.APPLICATION_ID + ".cache", File(ret.second) ) ), getString(R.string.title_configuration_share) ) ) } else { - toastError(R.string.toast_failure) + toast(R.string.toast_failure) } } binding.layoutRestore.setOnClickListener { - val permission = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - Manifest.permission.READ_MEDIA_IMAGES - } else { - Manifest.permission.READ_EXTERNAL_STORAGE - } - - 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) - } + val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + Manifest.permission.READ_MEDIA_IMAGES } 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 { - val webView = android.webkit.WebView(this) - webView.loadUrl("file:///android_asset/open_source_licenses.html") + binding.layoutOssLicenses.setOnClickListener{ + val webView = android.webkit.WebView(this); + webView.loadUrl("file:///android_asset/open_source_licenses.html"); android.app.AlertDialog.Builder(this) .setTitle("Open source licenses") .setView(webView) - .setPositiveButton("OK") { dialog, _ -> dialog.dismiss() } - .show() + .setPositiveButton("OK", android.content.DialogInterface.OnClickListener { dialog, whichButton -> dialog.dismiss() }).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 { + fun backupConfiguration(outputZipFilePos: String): Pair { 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 -> - val uri = result.data?.data - if (result.resultCode == RESULT_OK && uri != null) { + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + val uri = it.data?.data + if (it.resultCode == RESULT_OK && uri != null) { try { val targetFile = File(this.cacheDir.absolutePath, "${System.currentTimeMillis()}.zip") @@ -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) - toastError(R.string.toast_failure) + Log.e(AppConfig.ANG_PACKAGE, "Error during file restore: ${e.message}", e) + toast(R.string.toast_failure) } } } + } \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt index 0cd7f647..f2d4ba94 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/BaseActivity.kt @@ -6,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())) - } - - /** - * 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) + super.attachBaseContext(MyContextWrapper.wrap(newBase ?: return, Utils.getLocale())) } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt deleted file mode 100644 index a9b698c5..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/CheckUpdateActivity.kt +++ /dev/null @@ -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() - } -} \ No newline at end of file diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt index 436f5913..83f45d77 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatActivity.kt @@ -1,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(), SwipeRefreshLayout.OnRefreshListener { +class LogcatActivity : BaseActivity() { private val binding by lazy { ActivityLogcatBinding.inflate(layoutInflater) } - - private var logsetsAll: MutableList = mutableListOf() - var logsets: MutableList = mutableListOf() - private val adapter by lazy { LogcatRecyclerAdapter(this) } + private val throttleManager = ThrottleManager() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(binding.root) - title = getString(R.string.title_logcat) - - binding.recyclerView.setHasFixedSize(true) - binding.recyclerView.layoutManager = LinearLayoutManager(this) - addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider) - binding.recyclerView.adapter = adapter - - binding.refreshLayout.setOnRefreshListener(this) - - logsets.add(getString(R.string.pull_down_to_refresh)) + logcat(false) } - private fun getLogcat() { + class ThrottleManager { + private val throttleMap = mutableMapOf() - try { - binding.refreshLayout.isRefreshing = true + companion object { + private const val THROTTLE_DURATION = 1000L + } + + @Synchronized + fun shouldProcess(key: String): Boolean { + val currentTime = System.currentTimeMillis() + val lastProcessTime = throttleMap[key] ?: 0L + + return if (currentTime - lastProcessTime > THROTTLE_DURATION) { + throttleMap[key] = currentTime + true + } else { + false + } + } + + @Synchronized + fun reset(key: String) { + throttleMap.remove(key) + } + } + + private fun logcat(shouldFlushLog: Boolean) { + binding.pbWaiting.visibility = View.VISIBLE + + lifecycleScope.launch(Dispatchers.Default) { + try { + if (shouldFlushLog) { + val lst = linkedSetOf("logcat", "-c") + withContext(Dispatchers.IO) { + val process = Runtime.getRuntime().exec(lst.toTypedArray()) + process.waitFor() + } + } + + val lst = linkedSetOf( + "logcat", "-d", "-v", "time", "-s", + "GoLog,tun2socks,$ANG_PACKAGE,AndroidRuntime,System.err" + ) - lifecycleScope.launch(Dispatchers.Default) { - val lst = LinkedHashSet() - lst.add("logcat") - lst.add("-d") - lst.add("-v") - lst.add("time") - lst.add("-s") - lst.add("GoLog,tun2socks,${ANG_PACKAGE},AndroidRuntime,System.err") val process = withContext(Dispatchers.IO) { Runtime.getRuntime().exec(lst.toTypedArray()) } - val allText = process.inputStream.bufferedReader().use { it.readLines() }.reversed() - launch(Dispatchers.Main) { - logsetsAll = allText.toMutableList() - logsets = allText.toMutableList() - refreshData() - binding.refreshLayout.isRefreshing = false + val allLogs = process.inputStream.bufferedReader().use { it.readLines() } + val filteredLogs = processLogs(allLogs) + + withContext(Dispatchers.Main) { + updateLogDisplay(filteredLogs) } + + } catch (e: IOException) { + withContext(Dispatchers.Main) { + binding.pbWaiting.visibility = View.GONE + toast(R.string.toast_failure) + } + e.printStackTrace() } - } catch (e: IOException) { - Log.e(AppConfig.TAG, "Failed to get logcat", e) } } - private fun clearLogcat() { - try { - lifecycleScope.launch(Dispatchers.Default) { - val lst = LinkedHashSet() - lst.add("logcat") - lst.add("-c") - withContext(Dispatchers.IO) { - val process = Runtime.getRuntime().exec(lst.toTypedArray()) - process.waitFor() - } - launch(Dispatchers.Main) { - logsetsAll.clear() - logsets.clear() - refreshData() + private fun processLogs(logs: List): List { + val processedLogs = mutableListOf() + var isNotMatch = false + + for (line in logs) { + when { + line.contains("zxing.NotFoundException", ignoreCase = true) -> { + if (!isNotMatch) { + if (throttleManager.shouldProcess("NotFoundException")) { + processedLogs.add(line) + isNotMatch = true + } + } } + else -> processedLogs.add(line) } - } catch (e: IOException) { - Log.e(AppConfig.TAG, "Failed to clear logcat", e) + } + + return processedLogs.take(500) + } + + private fun updateLogDisplay(logs: List) { + 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")) - toastSuccess(R.string.toast_success) + Utils.setClipboard(this, binding.tvLogcat.text.toString()) + 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() - } -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt deleted file mode 100644 index e83714d5..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/LogcatRecyclerAdapter.kt +++ /dev/null @@ -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() { - 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) - -} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt index 0c7584d8..53ae34ea 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt @@ -1,18 +1,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 = GridLayoutManager(this, 2) - } else { - binding.recyclerView.layoutManager = GridLayoutManager(this, 1) - } - addCustomDividerToRecyclerView(binding.recyclerView, this, R.drawable.custom_divider) + binding.recyclerView.layoutManager = LinearLayoutManager(this) 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) { - pendingAction = Action.POST_NOTIFICATIONS - requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS) - } + RxPermissions(this) + .request(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) - } - lifecycleScope.launch { - delay(500) - startV2Ray() + Utils.stopVService(this) } + 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 { - val permission = Manifest.permission.CAMERA - if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) { - scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java)) - } else { - pendingAction = Action.IMPORT_QR_CODE_CONFIG - requestPermissionLauncher.launch(permission) - } + private fun importQRcode(forConfig: Boolean): Boolean { +// try { +// startActivityForResult(Intent("com.google.zxing.client.android.SCAN") +// .addCategory(Intent.CATEGORY_DEFAULT) +// .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP), requestCode) +// } catch (e: Exception) { + RxPermissions(this) + .request(Manifest.permission.CAMERA) + .subscribe { + if (it) + if (forConfig) + scanQRCodeForConfig.launch(Intent(this, ScannerActivity::class.java)) + else + scanQRCodeForUrlToCustomConfig.launch(Intent(this, ScannerActivity::class.java)) + else + toast(R.string.toast_permission_denied) + } +// } 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) { - 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 + try { chooseFileForCustomConfig.launch(Intent.createChooser(intent, getString(R.string.title_file_chooser))) - } else { - requestPermissionLauncher.launch(permission) + } catch (ex: ActivityNotFoundException) { + 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 } - - if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) { - try { - contentResolver.openInputStream(uri).use { input -> - importBatchConfig(input?.bufferedReader()?.readText()) - } - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to read content from URI", e) + RxPermissions(this) + .request(permission) + .subscribe { + if (it) { + try { + contentResolver.openInputStream(uri).use { input -> + importCustomizeConfig(input?.bufferedReader()?.readText()) + } + } catch (e: Exception) { + e.printStackTrace() + } + } else + toast(R.string.toast_permission_denied) } - } 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.per_app_proxy_settings -> startActivity(Intent(this, PerAppProxyActivity::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.sub_setting -> { + requestSubSettingActivity.launch(Intent(this, SubSettingActivity::class.java)) + } - R.id.promotion -> Utils.openUri(this, "${Utils.decode(AppConfig.APP_PROMOTION_URL)}?t=${System.currentTimeMillis()}") - R.id.logcat -> startActivity(Intent(this, LogcatActivity::class.java)) - R.id.check_for_update -> startActivity(Intent(this, CheckUpdateActivity::class.java)) - R.id.about -> startActivity(Intent(this, AboutActivity::class.java)) + R.id.settings -> { + startActivity( + Intent(this, SettingsActivity::class.java) + .putExtra("isRunning", mainViewModel.isRunning.value == true) + ) + } + + R.id.routing_setting -> { + requestSubSettingActivity.launch(Intent(this, RoutingSettingActivity::class.java)) + } + + + R.id.promotion -> { + Utils.openUri(this, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}") + } + + R.id.logcat -> { + startActivity(Intent(this, LogcatActivity::class.java)) + } + + R.id.about -> { + startActivity(Intent(this, AboutActivity::class.java)) + } } - binding.drawerLayout.closeDrawer(GravityCompat.START) return true } -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt index e7ea6211..30bc3ed2 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/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 kotlinx.coroutines.delay -import kotlinx.coroutines.launch +import com.v2ray.ang.util.Utils +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.core.Observable +import java.util.concurrent.TimeUnit class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter(), ItemTouchHelperAdapter { companion object { @@ -41,278 +37,169 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter by lazy { mActivity.resources.getStringArray(R.array.share_method) } - private val share_method_more: Array 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 - val subRemarks = getSubscriptionRemarks(profile) - holder.itemMainBinding.tvSubscription.text = subRemarks - holder.itemMainBinding.layoutSubscription.visibility = if (subRemarks.isEmpty()) View.GONE else View.VISIBLE - - //layout - if (doubleColumnDisplay) { - holder.itemMainBinding.layoutShare.visibility = View.GONE - holder.itemMainBinding.layoutEdit.visibility = View.GONE - holder.itemMainBinding.layoutRemove.visibility = View.GONE - holder.itemMainBinding.layoutMore.visibility = View.VISIBLE - - //share method - val shareOptions = if (isCustom) share_method_more.asList().takeLast(3) else share_method_more.asList() - - holder.itemMainBinding.layoutMore.setOnClickListener { - shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0) - } - } else { - holder.itemMainBinding.layoutShare.visibility = View.VISIBLE - holder.itemMainBinding.layoutEdit.visibility = View.VISIBLE - holder.itemMainBinding.layoutRemove.visibility = View.VISIBLE - holder.itemMainBinding.layoutMore.visibility = View.GONE - - //share method - val shareOptions = if (isCustom) share_method.asList().takeLast(1) else share_method.asList() - - holder.itemMainBinding.layoutShare.setOnClickListener { - shareServer(guid, profile, position, shareOptions, if (isCustom) 2 else 0) + var shareOptions = share_method.asList() + when (profile.configType) { + EConfigType.CUSTOM -> { + holder.itemMainBinding.tvType.text = mActivity.getString(R.string.server_customize_config) + shareOptions = shareOptions.takeLast(1) } - holder.itemMainBinding.layoutEdit.setOnClickListener { - editServer(guid, profile) + else -> { + 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) - } - } -// if (holder is FooterViewHolder) { -// if (true) { -// holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE -// } else { -// holder.itemFooterBinding.layoutEdit.setOnClickListener { -// Utils.openUri(mActivity, "${Utils.decode(AppConfig.PromotionUrl)}?t=${System.currentTimeMillis()}") -// } -// } -// } - } - - /** - * Gets the server address information - * Hides part of IP or domain information for privacy protection - * @param profile The server configuration - * @return Formatted address string - */ - private fun getAddress(profile: ProfileItem): String { - // Hide xxx:xxx:***/xxx.xxx.xxx.*** - return "${ - profile.server?.let { - if (it.contains(":")) - it.split(":").take(2).joinToString(":", postfix = ":***") - else - it.split('.').dropLast(1).joinToString(".", postfix = ".***") - } - } : ${profile.serverPort}" - } - - /** - * Gets the subscription remarks information - * @param profile The server configuration - * @return Subscription remarks string, or empty string if none - */ - private fun getSubscriptionRemarks(profile: ProfileItem): String { - val subRemarks = - if (mActivity.mainViewModel.subscriptionId.isEmpty()) - MmkvManager.decodeSubscription(profile.subscriptionId)?.remarks?.firstOrNull() - else - null - return subRemarks?.toString() ?: "" - } - - /** - * Shares server configuration - * Displays a dialog with sharing options and executes the selected action - * @param guid The server unique identifier - * @param profile The server configuration - * @param position The position in the list - * @param shareOptions The list of share options - * @param skip The number of options to skip - */ - private fun shareServer(guid: String, profile: ProfileItem, position: Int, shareOptions: List, 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) + 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) { + Utils.stopVService(mActivity) + Observable.timer(500, TimeUnit.MILLISECONDS) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { + V2RayServiceManager.startV2Ray(mActivity) + } + } } } } - } - - /** - * Edits server configuration - * Opens appropriate editing interface based on configuration type - * @param guid The server unique identifier - * @param profile The server configuration - */ - private fun editServer(guid: String, profile: ProfileItem) { - val intent = Intent().putExtra("guid", guid) - .putExtra("isRunning", isRunning) - .putExtra("createConfigType", profile.configType.value) - if (profile.configType == EConfigType.CUSTOM) { - mActivity.startActivity(intent.setClass(mActivity, ServerCustomConfigActivity::class.java)) - } else { - mActivity.startActivity(intent.setClass(mActivity, ServerActivity::class.java)) - } - } - - /** - * Removes server configuration - * Handles confirmation dialog and related checks - * @param guid The server unique identifier - * @param position The position in the list - */ - private fun removeServer(guid: String, position: Int) { - if (guid != MmkvManager.getSelectServer()) { - if (MmkvManager.decodeSettingsBool(AppConfig.PREF_CONFIRM_REMOVE) == true) { - AlertDialog.Builder(mActivity).setMessage(R.string.del_config_comfirm) - .setPositiveButton(android.R.string.ok) { _, _ -> - removeServerSub(guid, position) - } - .setNegativeButton(android.R.string.cancel) { _, _ -> - //do noting - } - .show() + if (holder is FooterViewHolder) { + //if (activity?.defaultDPreference?.getPrefBoolean(AppConfig.PREF_INAPP_BUY_IS_PREMIUM, false)) { + if (true) { + holder.itemFooterBinding.layoutEdit.visibility = View.INVISIBLE } 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) } } - /** - * Executes the actual server removal process - * @param guid The server unique identifier - * @param position The position in the list - */ - private fun removeServerSub(guid: String, position: Int) { + private fun shareFullContent(guid: String) { + if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) { + mActivity.toast(R.string.toast_success) + } else { + mActivity.toast(R.string.toast_failure) + } + } + + 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? = 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 { - try { - binding.pbWaiting.show() - val blacklist = MmkvManager.decodeSettingsStringSet(AppConfig.PREF_PER_APP_PROXY_SET) - val apps = withContext(Dispatchers.IO) { - val appsList = AppManagerUtil.loadNetworkAppList(this@PerAppProxyActivity) - - if (blacklist != null) { - appsList.forEach { app -> - app.isSelected = if (blacklist.contains(app.packageName)) 1 else 0 + AppManagerUtil.rxLoadNetworkAppList(this) + .subscribeOn(Schedulers.io()) + .map { + if (blacklist != null) { + it.forEach { one -> + if (blacklist.contains(one.packageName)) { + one.isSelected = 1 + } else { + one.isSelected = 0 } - 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 { p1, p2 -> + when { + p1.isSelected > p2.isSelected -> -1 + p1.isSelected == p2.isSelected -> 0 + else -> 1 + } + } + it.sortedWith(comparator) + } else { + val comparator = object : Comparator { + 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 { +// 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() + 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.ANDROID_PACKAGE_NAME_LIST_URL + val url = AppConfig.androidpackagenamelistUrl lifecycleScope.launch(Dispatchers.IO) { - var content = HttpUtil.getUrlContent(url, 5000) - if (content.isNullOrEmpty()) { - val httpPort = SettingsManager.getHttpPort() - content = HttpUtil.getUrlContent(url, 5000, httpPort) ?: "" - } + val content = Utils.getUrlContext(url, 5000) launch(Dispatchers.Main) { - Log.i(AppConfig.TAG, content) + Log.d(ANG_PACKAGE, content) selectProxyApp(content, true) - toastSuccess(R.string.toast_success) - binding.pbWaiting.hide() + toast(R.string.toast_success) } } } @@ -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() - } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt index 1d02b3b1..deb585fe 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt @@ -4,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, 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) } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt index bb0ee572..561db0e9 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingEditActivity.kt +++ b/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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt index e585cff8..44410d67 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/RoutingSettingActivity.kt +++ b/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() - binding.layoutDomainStrategy.setOnClickListener { - setDomainStrategy() + val found = Utils.arrayFind(routing_domain_strategy, MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: "") + found.let { binding.spDomainStrategy.setSelection(if (it >= 0) it else 0) } + binding.spDomainStrategy.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onNothingSelected(parent: AdapterView<*>?) { + } + + override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { + 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) { - R.id.add_rule -> startActivity(Intent(this, RoutingEditActivity::class.java)).let { true } - R.id.import_predefined_rulesets -> importPredefined().let { true } - R.id.import_rulesets_from_clipboard -> importFromClipboard().let { true } - R.id.import_rulesets_from_qrcode -> requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA).let { true } - R.id.export_rulesets_to_clipboard -> export2Clipboard().let { true } - else -> super.onOptionsItemSelected(item) - } + override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { + R.id.add_rule -> { + startActivity(Intent(this, RoutingEditActivity::class.java)) + true + } - private fun getDomainStrategy(): String { - return MmkvManager.decodeSettingsString(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY) ?: routing_domain_strategy.first() - } + R.id.user_asset_setting -> { + startActivity(Intent(this, UserAssetActivity::class.java)) + true + } - private fun setDomainStrategy() { - android.app.AlertDialog.Builder(this).setItems(routing_domain_strategy.asList().toTypedArray()) { _, i -> - try { - val value = routing_domain_strategy[i] - MmkvManager.encodeSettings(AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, value) - binding.tvDomainStrategySummary.text = value - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to set domain strategy", e) - } - }.show() - } - - private fun importPredefined() { - AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i -> + R.id.import_predefined_rulesets -> { AlertDialog.Builder(this).setMessage(R.string.routing_settings_import_rulesets_tip) .setPositiveButton(android.R.string.ok) { _, _ -> - try { - lifecycleScope.launch(Dispatchers.IO) { - SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i) - launch(Dispatchers.Main) { + AlertDialog.Builder(this).setItems(preset_rulesets.asList().toTypedArray()) { _, i -> + try { + lifecycleScope.launch(Dispatchers.IO) { + SettingsManager.resetRoutingRulesetsFromPresets(this@RoutingSettingActivity, i) + launch(Dispatchers.Main) { + refreshData() + toast(R.string.toast_success) + } + } + } catch (e: Exception) { + e.printStackTrace() + } + }.show() + + + } + .setNegativeButton(android.R.string.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() - } - - 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) + true } + + R.id.import_rulesets_from_qrcode -> { + RxPermissions(this) + .request(Manifest.permission.CAMERA) + .subscribe { + if (it) + scanQRcodeForRulesets.launch(Intent(this, ScannerActivity::class.java)) + else + toast(R.string.toast_permission_denied) + } + true + } + + + R.id.export_rulesets_to_clipboard -> { + val rulesetList = MmkvManager.decodeRoutingRulesets() + if (rulesetList.isNullOrEmpty()) { + 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() } -} \ No newline at end of file + +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt index 9a972f93..187a6de3 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScScannerActivity.kt @@ -4,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 { - requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA) + fun importQRcode(): Boolean { + RxPermissions(this) + .request(Manifest.permission.CAMERA) + .subscribe { granted -> + if (granted) { + scanQRCode.launch(Intent(this, ScannerActivity::class.java)) + } else { + toast(R.string.toast_permission_denied) + } + } 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() } -} \ No newline at end of file + +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt index 0495318a..7f536971 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScSwitchActivity.kt @@ -3,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()) { - V2RayServiceManager.stopVService(this) + if (V2RayServiceManager.v2rayPoint.isRunning) { + Utils.stopVService(this) } else { - V2RayServiceManager.startVServiceFromToggle(this) + Utils.startVServiceFromToggle(this) } finish() } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt index 2a971ac0..6402c5a2 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt @@ -2,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 } - - if (ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED) { - showFileChooser() - } else { - requestPermissionLauncher.launch(permission) - } + RxPermissions(this) + .request(permission) + .subscribe { granted -> + if (granted) { + showFileChooser() + } else { + toast(R.string.toast_permission_denied) + } + } true } @@ -131,4 +100,26 @@ class ScannerActivity : BaseActivity() { toast(R.string.toast_require_file_manager) } } -} \ No newline at end of file + + 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) + } + } + } + +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt index e9bdad66..7cb66933 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt +++ b/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() } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt index 44e0b32b..6dba8faf 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt +++ b/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) - toast("${getString(R.string.toast_malformed_josn)} ${e.cause?.message}") + e.printStackTrace() + 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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt index 6af64e3a..09901948 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt @@ -43,8 +43,6 @@ class SettingsActivity : BaseActivity() { private val appendHttpProxy by lazy { findPreference(AppConfig.PREF_APPEND_HTTP_PROXY) } private val localDnsPort by lazy { findPreference(AppConfig.PREF_LOCAL_DNS_PORT) } private val vpnDns by lazy { findPreference(AppConfig.PREF_VPN_DNS) } - private val vpnBypassLan by lazy { findPreference(AppConfig.PREF_VPN_BYPASS_LAN) } - private val vpnInterfaceAddress by lazy { findPreference(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX) } private val mux by lazy { findPreference(AppConfig.PREF_MUX_ENABLED) } private val muxConcurrency by lazy { findPreference(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) } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt index f85382f1..45f92c2d 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt +++ b/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 - private var save_config: MenuItem? = null + var del_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) - .setPositiveButton(android.R.string.ok) { _, _ -> - lifecycleScope.launch(Dispatchers.IO) { - MmkvManager.removeSubscription(editSubId) - launch(Dispatchers.Main) { - finish() - } + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + lifecycleScope.launch(Dispatchers.IO) { + MmkvManager.removeSubscription(editSubId) + launch(Dispatchers.Main) { + 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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt index ef27fcff..e0ef627c 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt +++ b/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.toastSuccess +import com.v2ray.ang.extension.toast 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() diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt index cc2d5404..9f84c093 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt +++ b/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(), 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( diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt index 8600a4ee..16eac3a4 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt +++ b/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() } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt index 364f442a..fe16b2c5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UrlSchemeActivity.kt @@ -4,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) - lifecycleScope.launch(Dispatchers.IO) { - val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false) - withContext(Dispatchers.Main) { - if (count + countSub > 0) { - toast(R.string.import_subscription_success) - } else { - toast(R.string.import_subscription_failure) - } - } + Log.d("UrlScheme-decodedUrl", decodedUrl) + val (count, countSub) = AngConfigManager.importBatchConfig(decodedUrl, "", false) + if (count + countSub > 0) { + toast(R.string.import_subscription_success) + } else { + toast(R.string.import_subscription_failure) } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt index efc0a39c..c59afe5b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetActivity.kt @@ -19,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) - refreshData() + toast(R.string.toast_success) + 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( - Intent(this, UserAssetUrlActivity::class.java) - .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url) - ) + startActivity(Intent(this, UserAssetUrlActivity::class.java) + .putExtra(UserAssetUrlActivity.ASSET_URL_QRCODE, url)) } catch (e: Exception) { - 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 - lifecycleScope.launch(Dispatchers.IO) { - assets.forEach { - try { - var result = downloadGeo(it.second, 15000, httpPort) - if (!result) { - result = downloadGeo(it.second, 15000, 0) + assets.forEach { + //toast(getString(R.string.msg_downloading_content) + it) + lifecycleScope.launch(Dispatchers.IO) { + var result = downloadGeo(it.second, 60000, httpPort) + if (!result) { + result = downloadGeo(it.second, 60000, 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) - resultCount++ - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to download geo file: ${it.second.remarks}", e) + dialog.dismiss() } } - 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), - locked = true + AppConfig.GeoUrl + it ) ) } @@ -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() { 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) -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt index 3d390967..0f95dd7a 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/UserAssetUrlActivity.kt +++ b/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 - private var save_config: MenuItem? = null + var del_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() - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to delete asset file: ${file.path}", e) - } + file.delete() } } 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 } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt index 577698ea..8ce94751 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/AppManagerUtil.kt @@ -4,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 kotlinx.coroutines.withContext +import io.reactivex.rxjava3.core.Observable object AppManagerUtil { - /** - * Load the list of network applications. - * - * @param context The context to use. - * @return A list of AppInfo objects representing the network applications. - */ - suspend fun loadNetworkAppList(context: Context): ArrayList = - withContext(Dispatchers.IO) { - val packageManager = context.packageManager - val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS) - val apps = ArrayList() + private fun loadNetworkAppList(ctx: Context): ArrayList { + val packageManager = ctx.packageManager + val packages = packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS) + val apps = ArrayList() - for (pkg in packages) { - val applicationInfo = pkg.applicationInfo ?: continue + for (pkg in packages) { + val applicationInfo = pkg.applicationInfo ?: continue - val appName = applicationInfo.loadLabel(packageManager).toString() - val appIcon = applicationInfo.loadIcon(packageManager) ?: continue - val isSystemApp = applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM > 0 + val appName = applicationInfo.loadLabel(packageManager).toString() + val appIcon = applicationInfo.loadIcon(packageManager) ?: continue + val isSystemApp = (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM) > 0 - val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0) - apps.add(appInfo) - } - - return@withContext apps + val appInfo = AppInfo(appName, pkg.packageName, appIcon, isSystemApp, 0) + apps.add(appInfo) } - fun getLastUpdateTime(context: Context): Long = - context.packageManager.getPackageInfo(context.packageName, 0).lastUpdateTime + return apps + } + fun rxLoadNetworkAppList(ctx: Context): Observable> = + Observable.unsafeCreate { + it.onNext(loadNetworkAppList(ctx)) + } + +// val PackageInfo.hasInternetPermission: Boolean +// get() { +// val permissions = requestedPermissions +// return permissions?.any { it == Manifest.permission.INTERNET } ?: false +// } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt deleted file mode 100644 index 7172728e..00000000 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt +++ /dev/null @@ -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? { - 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 - } -} - diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt index 80a40fbf..28e7e956 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/JsonUtil.kt +++ b/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 fromJson(src: String, cls: Class): 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 } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt index c84443c7..0f521f57 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MessageUtil.kt +++ b/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() } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt index a769368f..8c0a4c63 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/MyContextWrapper.kt @@ -11,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) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt index 2b9f71aa..a7566076 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/PluginUtil.kt +++ b/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() } - /** - * Run the plugin based on the provided configuration. - * - * @param context The context to use. - * @param config The profile configuration. - * @param socksPort The port information. - */ - fun runPlugin(context: Context, config: ProfileItem?, socksPort: Int?) { - Log.i(AppConfig.TAG, "Starting plugin execution") +// fun initPlugin(name: String): PluginManager.InitResult { +// return PluginManager.init(name)!! +// } - if (config == null) { - Log.w(AppConfig.TAG, "Cannot run plugin: config is null") - return - } + fun runPlugin(context: Context, config: ProfileItem?, domainPort: String?) { + Log.d(TAG, "runPlugin") - try { - if (config.configType == EConfigType.HYSTERIA2) { - if (socksPort == null) { - Log.w(AppConfig.TAG, "Cannot run plugin: socksPort is null") - return - } - Log.i(AppConfig.TAG, "Running Hysteria2 plugin") - val configFile = genConfigHy2(context, config, socksPort) ?: return - val cmd = genCmdHy2(context, configFile) + if (config?.configType?.equals(EConfigType.HYSTERIA2) == true) { + val configFile = genConfigHy2(context, config, domainPort) ?: return + val cmd = genCmdHy2(context, configFile) - procService.runProcess(context, cmd) - } - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Error running plugin", e) + procService.runProcess(context, cmd) } } - /** - * 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 } - /** - * Generate the configuration file for Hysteria2. - * - * @param context The context to use. - * @param config The profile configuration. - * @param socksPort The port information. - * @return The generated configuration file. - */ - private fun genConfigHy2(context: Context, config: ProfileItem, socksPort: Int): File? { - Log.i(AppConfig.TAG, "runPlugin $HYSTERIA2") + private fun genConfigHy2(context: Context, config: ProfileItem, domainPort: String?): File? { + Log.d(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 { 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()) } } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt index 446739b6..fb6b2f68 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/QRCodeDecoder.kt @@ -14,17 +14,13 @@ import com.google.zxing.qrcode.QRCodeWriter import java.util.EnumMap /** - * QR code decoder utility. + * 描述:解析二维码图片 */ object QRCodeDecoder { val HINTS: MutableMap = EnumMap(DecodeHintType::class.java) /** - * Creates a QR code bitmap from the given text. - * - * @param text The text to encode in the QR code. - * @param size The size of the QR code bitmap. - * @return The generated QR code bitmap, or null if an error occurs. + * create qrcode using zxing */ 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. - * @return The content of the QR code, or null if decoding fails. + * @param picturePath 要解析的二维码图片本地路径 + * @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. - * @return The content of the QR code, or null if decoding fails. + * @param bitmap 要解析的二维码图片 + * @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. - * @return The decoded bitmap, or null if an error occurs. + * @param picturePath 本地图片文件路径 + * @return */ private fun getDecodeAbleBitmap(picturePath: String): Bitmap? { return try { diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt similarity index 56% rename from V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt rename to V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt index e547c378..10e793be 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SpeedtestManager.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/SpeedtestUtil.kt @@ -1,34 +1,28 @@ -package com.v2ray.ang.handler +package com.v2ray.ang.util import android.content.Context import android.os.SystemClock import android.text.TextUtils import android.util.Log import com.v2ray.ang.AppConfig +import com.v2ray.ang.AppConfig.LOOPBACK import com.v2ray.ang.R -import com.v2ray.ang.dto.IPAPIInfo import com.v2ray.ang.extension.responseLength -import com.v2ray.ang.util.HttpUtil -import com.v2ray.ang.util.JsonUtil import kotlinx.coroutines.isActive import libv2ray.Libv2ray import java.io.IOException +import java.net.HttpURLConnection import java.net.InetSocketAddress +import java.net.Proxy import java.net.Socket +import java.net.URL import java.net.UnknownHostException import kotlin.coroutines.coroutineContext -object SpeedtestManager { +object SpeedtestUtil { private val tcpTestingSockets = ArrayList() - /** - * Measures the TCP connection time to a given URL and port. - * - * @param url The URL to connect to. - * @param port The port to connect to. - * @return The connection time in milliseconds, or -1 if the connection failed. - */ suspend fun tcping(url: String, port: Int): Long { var time = -1L for (k in 0 until 2) { @@ -43,27 +37,15 @@ object SpeedtestManager { return time } - /** - * Measures the real ping time using the V2Ray library. - * - * @param config The configuration string for the V2Ray library. - * @return The ping time in milliseconds, or -1 if the ping failed. - */ fun realPing(config: String): Long { return try { - Libv2ray.measureOutboundDelay(config, SettingsManager.getDelayTestUrl()) + Libv2ray.measureOutboundDelay(config, Utils.getDelayTestUrl()) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to measure outbound delay", e) + Log.d(AppConfig.ANG_PACKAGE, "realPing: $e") -1L } } - /** - * Measures the ping time to a given URL using the system ping command. - * - * @param url The URL to ping. - * @return The ping time in milliseconds as a string, or "-1ms" if the ping failed. - */ fun ping(url: String): String { try { val command = "/system/bin/ping -c 3 $url" @@ -78,18 +60,11 @@ object SpeedtestManager { } } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to ping URL: $url", e) + e.printStackTrace() } return "-1ms" } - /** - * Measures the time taken to establish a TCP connection to a given URL and port. - * - * @param url The URL to connect to. - * @param port The port to connect to. - * @return The connection time in milliseconds, or -1 if the connection failed. - */ fun socketConnectTime(url: String, port: Int): Long { try { val socket = Socket() @@ -105,18 +80,15 @@ object SpeedtestManager { socket.close() return time } catch (e: UnknownHostException) { - Log.e(AppConfig.TAG, "Unknown host: $url", e) + e.printStackTrace() } catch (e: IOException) { - Log.e(AppConfig.TAG, "socketConnectTime IOException: $e") + Log.d(AppConfig.ANG_PACKAGE, "socketConnectTime IOException: $e") } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to establish socket connection to $url:$port", e) + e.printStackTrace() } return -1 } - /** - * Closes all TCP sockets that are currently being tested. - */ fun closeAllTcpSockets() { synchronized(this) { tcpTestingSockets.forEach { @@ -126,19 +98,26 @@ object SpeedtestManager { } } - /** - * Tests the connection to a given URL and port. - * - * @param context The Context in which the test is running. - * @param port The port to connect to. - * @return A pair containing the elapsed time in milliseconds and the result message. - */ fun testConnection(context: Context, port: Int): Pair { var result: String var elapsed = -1L + var conn: HttpURLConnection? = null - val conn = HttpUtil.createProxyConnection(SettingsManager.getDelayTestUrl(), port, 15000, 15000) ?: return Pair(elapsed, "") try { + val url = URL(Utils.getDelayTestUrl()) + + conn = url.openConnection( + Proxy( + Proxy.Type.HTTP, + InetSocketAddress(LOOPBACK, port) + ) + ) as HttpURLConnection + conn.connectTimeout = 30000 + conn.readTimeout = 30000 + conn.setRequestProperty("Connection", "close") + conn.instanceFollowRedirects = false + conn.useCaches = false + val start = SystemClock.elapsedRealtime() val code = conn.responseCode elapsed = SystemClock.elapsedRealtime() - start @@ -154,34 +133,20 @@ object SpeedtestManager { ) } } catch (e: IOException) { - Log.e(AppConfig.TAG, "Connection test IOException", e) + // network exception + Log.d(AppConfig.ANG_PACKAGE, "testConnection IOException: " + Log.getStackTraceString(e)) result = context.getString(R.string.connection_test_error, e.message) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Connection test Exception", e) + // library exception, eg sumsung + Log.d(AppConfig.ANG_PACKAGE, "testConnection Exception: " + Log.getStackTraceString(e)) result = context.getString(R.string.connection_test_error, e.message) } finally { - conn.disconnect() + conn?.disconnect() } return Pair(elapsed, result) } - fun getRemoteIPInfo(): String? { - val httpPort = SettingsManager.getHttpPort() - var content = HttpUtil.getUrlContent(AppConfig.IP_API_URL, 5000, httpPort) ?: return null - - var ipInfo = JsonUtil.fromJson(content, IPAPIInfo::class.java) ?: return null - var ip = ipInfo.ip ?: ipInfo.clientIp ?: ipInfo.ip_addr ?: ipInfo.query - var country = ipInfo.country_code ?: ipInfo.country ?: ipInfo.countryCode - - return "(${country ?: "unknown"}) $ip" - } - - /** - * Gets the version of the V2Ray library. - * - * @return The version of the V2Ray library. - */ fun getLibVersion(): String { return Libv2ray.checkVersionX() } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt index 148ce4ec..ee0167fd 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/Utils.kt @@ -4,8 +4,10 @@ import android.content.ClipData import android.content.ClipboardManager import android.content.Context import android.content.Intent +import android.content.pm.PackageManager import android.content.res.Configuration.UI_MODE_NIGHT_MASK import android.content.res.Configuration.UI_MODE_NIGHT_NO +import android.net.Uri import android.os.Build import android.os.LocaleList import android.provider.Settings @@ -14,79 +16,72 @@ import android.util.Base64 import android.util.Log import android.util.Patterns import android.webkit.URLUtil +import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.ContextCompat -import androidx.core.net.toUri import com.v2ray.ang.AppConfig +import com.v2ray.ang.AppConfig.ANG_PACKAGE import com.v2ray.ang.AppConfig.LOOPBACK import com.v2ray.ang.BuildConfig +import com.v2ray.ang.R +import com.v2ray.ang.dto.Language +import com.v2ray.ang.extension.toast +import com.v2ray.ang.handler.MmkvManager +import com.v2ray.ang.service.V2RayServiceManager import java.io.IOException -import java.net.InetAddress -import java.net.ServerSocket -import java.net.URI -import java.net.URLDecoder -import java.net.URLEncoder -import java.util.Locale -import java.util.UUID +import java.net.* +import java.util.* object Utils { - private val IPV4_REGEX = - Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$") - private val IPV6_REGEX = Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$") - /** - * Convert string to editable for Kotlin. + * convert string to editalbe for kotlin * - * @param text The string to convert. - * @return An Editable instance containing the text. + * @param text + * @return */ fun getEditable(text: String?): Editable { return Editable.Factory.getInstance().newEditable(text.orEmpty()) } /** - * Find the position of a value in an array. - * - * @param array The array to search. - * @param value The value to find. - * @return The index of the value in the array, or -1 if not found. + * find value in array position */ fun arrayFind(array: Array, value: String): Int { - return array.indexOf(value) + for (i in array.indices) { + if (array[i] == value) { + return i + } + } + return -1 } /** - * Parse a string to an integer with a default value. - * - * @param str The string to parse. - * @param default The default value if parsing fails. - * @return The parsed integer, or the default value if parsing fails. + * parseInt */ - fun parseInt(str: String?, default: Int = 0): Int { + fun parseInt(str: String): Int { + return parseInt(str, 0) + } + + fun parseInt(str: String?, default: Int): Int { return str?.toIntOrNull() ?: default } + /** - * Get text from the clipboard. - * - * @param context The context to use. - * @return The text from the clipboard, or an empty string if an error occurs. + * get text from clipboard */ fun getClipboard(context: Context): String { return try { val cmb = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager cmb.primaryClip?.getItemAt(0)?.text.toString() } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to get clipboard content", e) + e.printStackTrace() "" } } /** - * Set text to the clipboard. - * - * @param context The context to use. - * @param content The text to set to the clipboard. + * set text to clipboard */ fun setClipboard(context: Context, content: String) { try { @@ -94,368 +89,385 @@ object Utils { val clipData = ClipData.newPlainText(null, content) cmb.setPrimaryClip(clipData) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to set clipboard content", e) + e.printStackTrace() } } /** - * Decode a base64 encoded string. - * - * @param text The base64 encoded string. - * @return The decoded string, or an empty string if decoding fails. + * base64 decode */ fun decode(text: String?): String { return tryDecodeBase64(text) ?: text?.trimEnd('=')?.let { tryDecodeBase64(it) }.orEmpty() } - /** - * Try to decode a base64 encoded string. - * - * @param text The base64 encoded string. - * @return The decoded string, or null if decoding fails. - */ - fun tryDecodeBase64(text: String?): String? { - if (text.isNullOrEmpty()) return null + fun tryDecodeBase64(text: String?): String? { try { return Base64.decode(text, Base64.NO_WRAP).toString(Charsets.UTF_8) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to decode standard base64", e) + Log.i(ANG_PACKAGE, "Parse base64 standard failed $e") } try { return Base64.decode(text, Base64.NO_WRAP.or(Base64.URL_SAFE)).toString(Charsets.UTF_8) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to decode URL-safe base64", e) + Log.i(ANG_PACKAGE, "Parse base64 url safe failed $e") } return null } /** - * Encode a string to base64. - * - * @param text The string to encode. - * @return The base64 encoded string, or an empty string if encoding fails. + * base64 encode */ fun encode(text: String): String { return try { Base64.encodeToString(text.toByteArray(Charsets.UTF_8), Base64.NO_WRAP) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to encode text to base64", e) + e.printStackTrace() "" } } /** - * Check if a string is a valid IP address. - * - * @param value The string to check. - * @return True if the string is a valid IP address, false otherwise. + * get remote dns servers from preference + */ + fun getRemoteDnsServers(): List { + val remoteDns = + MmkvManager.decodeSettingsString(AppConfig.PREF_REMOTE_DNS) ?: AppConfig.DNS_PROXY + val ret = remoteDns.split(",").filter { isPureIpAddress(it) || isCoreDNSAddress(it) } + if (ret.isEmpty()) { + return listOf(AppConfig.DNS_PROXY) + } + return ret + } + + fun getVpnDnsServers(): List { + val vpnDns = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS) ?: AppConfig.DNS_VPN + return vpnDns.split(",").filter { isPureIpAddress(it) } + // allow empty, in that case dns will use system default + } + + /** + * get remote dns servers from preference + */ + fun getDomesticDnsServers(): List { + val domesticDns = + MmkvManager.decodeSettingsString(AppConfig.PREF_DOMESTIC_DNS) ?: AppConfig.DNS_DIRECT + val ret = domesticDns.split(",").filter { isPureIpAddress(it) || isCoreDNSAddress(it) } + if (ret.isEmpty()) { + return listOf(AppConfig.DNS_DIRECT) + } + return ret + } + + /** + * is ip address */ fun isIpAddress(value: String?): Boolean { - if (value.isNullOrEmpty()) return false - try { - var addr = value.trim() - if (addr.isEmpty()) return false - + if (value.isNullOrEmpty()) { + return false + } + var addr = value + if (addr.isEmpty() || addr.isBlank()) { + return false + } //CIDR - if (addr.contains("/")) { + if (addr.indexOf("/") > 0) { val arr = addr.split("/") - if (arr.size == 2 && arr[1].toIntOrNull() != null && arr[1].toInt() > -1) { + if (arr.count() == 2 && Integer.parseInt(arr[1]) > -1) { addr = arr[0] } } - // Handle IPv4-mapped IPv6 addresses + // "::ffff:192.168.173.22" + // "[::ffff:192.168.173.22]:80" if (addr.startsWith("::ffff:") && '.' in addr) { addr = addr.drop(7) } else if (addr.startsWith("[::ffff:") && '.' in addr) { addr = addr.drop(8).replace("]", "") } - val octets = addr.split('.') + // addr = addr.toLowerCase() + val octets = addr.split('.').toTypedArray() if (octets.size == 4) { - if (octets[3].contains(":")) { + if (octets[3].indexOf(":") > 0) { addr = addr.substring(0, addr.indexOf(":")) } return isIpv4Address(addr) } + // Ipv6addr [2001:abc::123]:8080 return isIpv6Address(addr) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to validate IP address", e) + e.printStackTrace() return false } } - /** - * Check if a string is a pure IP address (IPv4 or IPv6). - * - * @param value The string to check. - * @return True if the string is a pure IP address, false otherwise. - */ fun isPureIpAddress(value: String): Boolean { return isIpv4Address(value) || isIpv6Address(value) } - /** - * Check if a string is a valid domain name. - * - * A valid domain name must not be an IP address and must be a valid URL format. - * - * @param input The string to check. - * @return True if the string is a valid domain name, false otherwise. - */ - fun isDomainName(input: String?): Boolean { - if (input.isNullOrEmpty()) return false - - // Must not be an IP address and must be a valid URL format - return !isPureIpAddress(input) && isValidUrl(input) + fun isIpv4Address(value: String): Boolean { + val regV4 = + Regex("^([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])\\.([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])$") + return regV4.matches(value) } - /** - * Check if a string is a valid IPv4 address. - * - * @param value The string to check. - * @return True if the string is a valid IPv4 address, false otherwise. - */ - private fun isIpv4Address(value: String): Boolean { - return IPV4_REGEX.matches(value) - } - - /** - * Check if a string is a valid IPv6 address. - * - * @param value The string to check. - * @return True if the string is a valid IPv6 address, false otherwise. - */ - private fun isIpv6Address(value: String): Boolean { + fun isIpv6Address(value: String): Boolean { var addr = value - if (addr.startsWith("[") && addr.endsWith("]")) { - addr = addr.drop(1).dropLast(1) + if (addr.indexOf("[") == 0 && addr.lastIndexOf("]") > 0) { + addr = addr.drop(1) + addr = addr.dropLast(addr.count() - addr.lastIndexOf("]")) } - return IPV6_REGEX.matches(addr) + val regV6 = + Regex("^((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))?((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7}$") + return regV6.matches(addr) + } + + private fun isCoreDNSAddress(s: String): Boolean { + return s.startsWith("https") || s.startsWith("tcp") || s.startsWith("quic") || s == "localhost" } /** - * Check if a string is a CoreDNS address. - * - * @param s The string to check. - * @return True if the string is a CoreDNS address, false otherwise. - */ - fun isCoreDNSAddress(s: String): Boolean { - return s.startsWith("https") || - s.startsWith("tcp") || - s.startsWith("quic") || - s == "localhost" - } - - /** - * Check if a string is a valid URL. - * - * @param value The string to check. - * @return True if the string is a valid URL, false otherwise. + * is valid url */ fun isValidUrl(value: String?): Boolean { - if (value.isNullOrEmpty()) return false - - return try { - Patterns.WEB_URL.matcher(value).matches() || - Patterns.DOMAIN_NAME.matcher(value).matches() || - URLUtil.isValidUrl(value) - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to validate URL", e) - false - } - } - - /** - * Open a URI in a browser. - * - * @param context The context to use. - * @param uriString The URI string to open. - */ - fun openUri(context: Context, uriString: String) { try { - val uri = uriString.toUri() - context.startActivity(Intent(Intent.ACTION_VIEW, uri)) + if (value.isNullOrEmpty()) { + return false + } + if (Patterns.WEB_URL.matcher(value).matches() + || Patterns.DOMAIN_NAME.matcher(value).matches() + || URLUtil.isValidUrl(value) + ) { + return true + } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to open URI", e) + e.printStackTrace() + return false } + return false + } + + fun startVServiceFromToggle(context: Context): Boolean { + if (MmkvManager.getSelectServer().isNullOrEmpty()) { + context.toast(R.string.app_tile_first_use) + return false + } + V2RayServiceManager.startV2Ray(context) + return true } /** - * Generate a UUID. - * - * @return A UUID string without dashes. + * stopVService + */ + fun stopVService(context: Context) { + context.toast(R.string.toast_services_stop) + MessageUtil.sendMsg2Service(context, AppConfig.MSG_STATE_STOP, "") + } + + fun openUri(context: Context, uriString: String) { + val uri = Uri.parse(uriString) + context.startActivity(Intent(Intent.ACTION_VIEW, uri)) + } + + /** + * uuid */ fun getUuid(): String { return try { UUID.randomUUID().toString().replace("-", "") } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to generate UUID", e) + e.printStackTrace() "" } } - /** - * Decode a URL-encoded string. - * - * @param url The URL-encoded string. - * @return The decoded string, or the original string if decoding fails. - */ fun urlDecode(url: String): String { return try { URLDecoder.decode(url, Charsets.UTF_8.toString()) } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to decode URL", e) + e.printStackTrace() url } } - /** - * Encode a string to URL-encoded format. - * - * @param url The string to encode. - * @return The URL-encoded string, or the original string if encoding fails. - */ fun urlEncode(url: String): String { return try { URLEncoder.encode(url, Charsets.UTF_8.toString()).replace("+", "%20") } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to encode URL", e) + e.printStackTrace() url } } + /** - * Read text from an asset file. - * - * @param context The context to use. - * @param fileName The name of the asset file. - * @return The content of the asset file as a string. + * readTextFromAssets */ fun readTextFromAssets(context: Context?, fileName: String): String { - if (context == null) return "" - - return try { - context.assets.open(fileName).use { inputStream -> - inputStream.bufferedReader().use { reader -> - reader.readText() - } - } - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to read asset file: $fileName", e) - "" + if (context == null) { + return "" } + val content = context.assets.open(fileName).bufferedReader().use { + it.readText() + } + return content } - /** - * Get the path to the user asset directory. - * - * @param context The context to use. - * @return The path to the user asset directory. - */ fun userAssetPath(context: Context?): String { - if (context == null) return "" - - return try { - context.getExternalFilesDir(AppConfig.DIR_ASSETS)?.absolutePath - ?: context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to get user asset path", e) - "" - } + if (context == null) + return "" + val extDir = context.getExternalFilesDir(AppConfig.DIR_ASSETS) + ?: return context.getDir(AppConfig.DIR_ASSETS, 0).absolutePath + return extDir.absolutePath } - /** - * Get the path to the backup directory. - * - * @param context The context to use. - * @return The path to the backup directory. - */ fun backupPath(context: Context?): String { - if (context == null) return "" - - return try { - context.getExternalFilesDir(AppConfig.DIR_BACKUPS)?.absolutePath - ?: context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to get backup path", e) - "" - } + if (context == null) + return "" + val extDir = context.getExternalFilesDir(AppConfig.DIR_BACKUPS) + ?: return context.getDir(AppConfig.DIR_BACKUPS, 0).absolutePath + return extDir.absolutePath } - /** - * Get the device ID for XUDP base key. - * - * @return The device ID for XUDP base key. - */ fun getDeviceIdForXUDPBaseKey(): String { - return try { - val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8) - Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE)) + val androidId = Settings.Secure.ANDROID_ID.toByteArray(Charsets.UTF_8) + return Base64.encodeToString(androidId.copyOf(32), Base64.NO_PADDING.or(Base64.URL_SAFE)) + } + + fun getUrlContext(url: String, timeout: Int): String { + var result: String + var conn: HttpURLConnection? = null + + try { + conn = URL(url).openConnection() as HttpURLConnection + conn.connectTimeout = timeout + conn.readTimeout = timeout + conn.setRequestProperty("Connection", "close") + conn.instanceFollowRedirects = false + conn.useCaches = false + //val code = conn.responseCode + result = conn.inputStream.bufferedReader().readText() } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to generate device ID", e) - "" + result = "" + } finally { + conn?.disconnect() + } + return result + } + + @Throws(IOException::class) + fun getUrlContentWithCustomUserAgent( + urlStr: String?, + timeout: Int = 30000, + httpPort: Int = 0 + ): String { + val url = URL(urlStr) + val conn = if (httpPort == 0) { + url.openConnection() + } else { + url.openConnection( + Proxy( + Proxy.Type.HTTP, + InetSocketAddress(LOOPBACK, httpPort) + ) + ) + } + conn.connectTimeout = timeout + conn.readTimeout = timeout + conn.setRequestProperty("Connection", "close") + conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}") + url.userInfo?.let { + conn.setRequestProperty( + "Authorization", + "Basic ${encode(urlDecode(it))}" + ) + } + conn.useCaches = false + return conn.inputStream.use { + it.bufferedReader().readText() } } - /** - * Get the dark mode status. - * - * @param context The context to use. - * @return True if dark mode is enabled, false otherwise. - */ fun getDarkModeStatus(context: Context): Boolean { return context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK != UI_MODE_NIGHT_NO } - /** - * Get the IPv6 address in a formatted string. - * - * @param address The IPv6 address. - * @return The formatted IPv6 address, or the original address if not valid. - */ - fun getIpv6Address(address: String?): String { - if (address.isNullOrEmpty()) return "" + 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) + } + } + + fun getIpv6Address(address: String?): String { + if (address == null) { + return "" + } return if (isIpv6Address(address) && !address.contains('[') && !address.contains(']')) { - "[$address]" + String.format("[%s]", address) } else { address } } - /** - * Get the system locale. - * - * @return The system locale. - */ - fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + fun getLocale(): Locale { + val langCode = + MmkvManager.decodeSettingsString(AppConfig.PREF_LANGUAGE) ?: Language.AUTO.code + val language = Language.fromCode(langCode) + + return when (language) { + Language.AUTO -> getSysLocale() + Language.ENGLISH -> Locale.ENGLISH + Language.CHINA -> Locale.CHINA + Language.TRADITIONAL_CHINESE -> Locale.TRADITIONAL_CHINESE + Language.VIETNAMESE -> Locale("vi") + Language.RUSSIAN -> Locale("ru") + Language.PERSIAN -> Locale("fa") + Language.BANGLA -> Locale("bn") + Language.BAKHTIARI -> Locale("bqi", "IR") + } + } + + + private fun getSysLocale(): Locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { LocaleList.getDefault()[0] } else { Locale.getDefault() } - /** - * Fix illegal characters in a URL. - * - * @param str The URL string. - * @return The URL string with illegal characters replaced. - */ fun fixIllegalUrl(str: String): String { - return str.replace(" ", "%20") + return str + .replace(" ", "%20") .replace("|", "%7C") } - /** - * Find a free port from a list of ports. - * - * @param ports The list of ports to check. - * @return The first free port found. - * @throws IOException If no free port is found. - */ + fun removeWhiteSpace(str: String?): String? { + return str?.replace(" ", "") + } + + fun idnToASCII(str: String): String { + val url = URL(str) + return URL(url.protocol, IDN.toASCII(url.host, IDN.ALLOW_UNASSIGNED), url.port, url.file) + .toExternalForm() + } + + fun isTv(context: Context): Boolean = + context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK) + + fun getDelayTestUrl(second: Boolean = false): String { + return if (second) { + AppConfig.DelayTestUrl2 + } else { + MmkvManager.decodeSettingsString(AppConfig.PREF_DELAY_TEST_URL) + ?: AppConfig.DelayTestUrl + } + } + fun findFreePort(ports: List): Int { for (port in ports) { try { @@ -469,102 +481,24 @@ object Utils { throw IOException("no free port found") } - /** - * Check if a string is a valid subscription URL. - * - * @param value The string to check. - * @return True if the string is a valid subscription URL, false otherwise. - */ fun isValidSubUrl(value: String?): Boolean { - if (value.isNullOrEmpty()) return false - try { + if (value.isNullOrEmpty()) return false if (URLUtil.isHttpsUrl(value)) return true - if (URLUtil.isHttpUrl(value)) { - if (value.contains(LOOPBACK)) return true - - //Check private ip address - val uri = URI(fixIllegalUrl(value)) - if (isIpAddress(uri.host)) { - AppConfig.PRIVATE_IP_LIST.forEach { - if (isIpInCidr(uri.host, it)) return true - } - } - } + if (URLUtil.isHttpUrl(value) && value.contains(LOOPBACK)) return true } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to validate subscription URL", e) + e.printStackTrace() } return false } - /** - * Get the receiver flags based on the Android version. - * - * @return The receiver flags. - */ fun receiverFlags(): Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { ContextCompat.RECEIVER_EXPORTED } else { ContextCompat.RECEIVER_NOT_EXPORTED } - /** - * Check if the package is Xray. - * - * @return True if the package is Xray, false otherwise. - */ - fun isXray(): Boolean = BuildConfig.APPLICATION_ID.startsWith("com.v2ray.ang") + fun isXray(): Boolean = (ANG_PACKAGE.startsWith("com.v2ray.ang")) - /** - * Check if it is the Google Play version. - * - * @return True if the package is Google Play, false otherwise. - */ - fun isGoogleFlavor(): Boolean = BuildConfig.FLAVOR == "playstore" - - /** - * Converts an InetAddress to its long representation - * - * @param ip The InetAddress to convert - * @return The long representation of the IP address - */ - private fun inetAddressToLong(ip: InetAddress): Long { - val bytes = ip.address - var result: Long = 0 - for (i in bytes.indices) { - result = result shl 8 or (bytes[i].toInt() and 0xff).toLong() - } - return result - } - - /** - * Check if an IP address is within a CIDR range - * - * @param ip The IP address to check - * @param cidr The CIDR notation range (e.g., "192.168.1.0/24") - * @return True if the IP is within the CIDR range, false otherwise - */ - fun isIpInCidr(ip: String, cidr: String): Boolean { - try { - if (!isIpAddress(ip)) return false - - // Parse CIDR (e.g., "192.168.1.0/24") - val (cidrIp, prefixLen) = cidr.split("/") - val prefixLength = prefixLen.toInt() - - // Convert IP and CIDR's IP portion to Long - val ipLong = inetAddressToLong(InetAddress.getByName(ip)) - val cidrIpLong = inetAddressToLong(InetAddress.getByName(cidrIp)) - - // Calculate subnet mask (e.g., /24 → 0xFFFFFF00) - val mask = if (prefixLength == 0) 0L else (-1L shl (32 - prefixLength)) - - // Check if they're in the same subnet - return (ipLong and mask) == (cidrIpLong and mask) - } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to check if IP is in CIDR", e) - return false - } - } } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt index 9d9dce62..5343f6d8 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/util/ZipUtil.kt @@ -1,7 +1,5 @@ package com.v2ray.ang.util -import android.util.Log -import com.v2ray.ang.AppConfig import java.io.BufferedOutputStream import java.io.File import java.io.FileInputStream @@ -15,14 +13,6 @@ import java.util.zip.ZipOutputStream object ZipUtil { private const val BUFFER_SIZE = 4096 - /** - * Zip the contents of a folder. - * - * @param folderPath The path to the folder to zip. - * @param outputZipFilePath The path to the output zip file. - * @return True if the operation is successful, false otherwise. - * @throws IOException If an I/O error occurs. - */ @Throws(IOException::class) fun zipFromFolder(folderPath: String, outputZipFilePath: String): Boolean { val buffer = ByteArray(BUFFER_SIZE) @@ -63,20 +53,12 @@ object ZipUtil { zos.closeEntry() zos.close() } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to zip folder", e) + e.printStackTrace() return false } return true } - /** - * Unzip the contents of a zip file to a folder. - * - * @param zipFile The zip file to unzip. - * @param destDirectory The destination directory. - * @return True if the operation is successful, false otherwise. - * @throws IOException If an I/O error occurs. - */ @Throws(IOException::class) fun unzipToFolder(zipFile: File, destDirectory: String): Boolean { File(destDirectory).run { @@ -90,8 +72,10 @@ object ZipUtil { zip.getInputStream(entry).use { input -> val filePath = destDirectory + File.separator + entry.name if (!entry.isDirectory) { + // if the entry is a file, extracts it extractFile(input, filePath) } else { + // if the entry is a directory, make the directory val dir = File(filePath) dir.mkdir() } @@ -99,19 +83,12 @@ object ZipUtil { } } } catch (e: Exception) { - Log.e(AppConfig.TAG, "Failed to unzip file", e) + e.printStackTrace() return false } return true } - /** - * Extract a file from an input stream. - * - * @param inputStream The input stream to read from. - * @param destFilePath The destination file path. - * @throws IOException If an I/O error occurs. - */ @Throws(IOException::class) private fun extractFile(inputStream: InputStream, destFilePath: String) { val bos = BufferedOutputStream(FileOutputStream(destFilePath)) diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt index ec5cb7ee..74752a43 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt @@ -13,17 +13,18 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.viewModelScope import com.v2ray.ang.AngApplication import com.v2ray.ang.AppConfig +import com.v2ray.ang.AppConfig.ANG_PACKAGE import com.v2ray.ang.R import com.v2ray.ang.dto.ProfileItem import com.v2ray.ang.dto.ServersCache import com.v2ray.ang.extension.serializable -import com.v2ray.ang.extension.toastError -import com.v2ray.ang.extension.toastSuccess +import com.v2ray.ang.extension.toast +import com.v2ray.ang.fmt.CustomFmt import com.v2ray.ang.handler.AngConfigManager import com.v2ray.ang.handler.MmkvManager import com.v2ray.ang.handler.SettingsManager -import com.v2ray.ang.handler.SpeedtestManager import com.v2ray.ang.util.MessageUtil +import com.v2ray.ang.util.SpeedtestUtil import com.v2ray.ang.util.Utils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -48,6 +49,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { * Refer to the official documentation for [registerReceiver](https://developer.android.com/reference/androidx/core/content/ContextCompat#registerReceiver(android.content.Context,android.content.BroadcastReceiver,android.content.IntentFilter,int): * `registerReceiver(Context, BroadcastReceiver, IntentFilter, int)`. */ + fun startListenBroadcast() { isRunning.value = false val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_ACTIVITY) @@ -55,30 +57,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { MessageUtil.sendMsg2Service(getApplication(), AppConfig.MSG_REGISTER_CLIENT, "") } - /** - * Called when the ViewModel is cleared. - */ override fun onCleared() { getApplication().unregisterReceiver(mMsgReceiver) tcpingTestScope.coroutineContext[Job]?.cancelChildren() - SpeedtestManager.closeAllTcpSockets() - Log.i(AppConfig.TAG, "Main ViewModel is cleared") + SpeedtestUtil.closeAllTcpSockets() + Log.i(ANG_PACKAGE, "Main ViewModel is cleared") super.onCleared() } - /** - * Reloads the server list. - */ fun reloadServerList() { serverList = MmkvManager.decodeServerList() updateCache() updateListAction.value = -1 } - /** - * Removes a server by its GUID. - * @param guid The GUID of the server to remove. - */ fun removeServer(guid: String) { serverList.remove(guid) MmkvManager.removeServer(guid) @@ -88,43 +80,33 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } -// /** -// * Appends a custom configuration server. -// * @param server The server configuration to append. -// * @return True if the server was successfully appended, false otherwise. -// */ -// fun appendCustomConfigServer(server: String): Boolean { -// if (server.contains("inbounds") -// && server.contains("outbounds") -// && server.contains("routing") -// ) { -// try { -// val config = CustomFmt.parse(server) ?: return false -// config.subscriptionId = subscriptionId -// val key = MmkvManager.encodeServerConfig("", config) -// MmkvManager.encodeServerRaw(key, server) -// serverList.add(0, key) -//// val profile = ProfileLiteItem( -//// configType = config.configType, -//// subscriptionId = config.subscriptionId, -//// remarks = config.remarks, -//// server = config.getProxyOutbound()?.getServerAddress(), -//// serverPort = config.getProxyOutbound()?.getServerPort(), -//// ) -// serversCache.add(0, ServersCache(key, config)) -// return true -// } catch (e: Exception) { -// e.printStackTrace() -// } -// } -// return false -// } + fun appendCustomConfigServer(server: String): Boolean { + if (server.contains("inbounds") + && server.contains("outbounds") + && server.contains("routing") + ) { + try { + val config = CustomFmt.parse(server) ?: return false + config.subscriptionId = subscriptionId + val key = MmkvManager.encodeServerConfig("", config) + MmkvManager.encodeServerRaw(key, server) + serverList.add(0, key) +// val profile = ProfileLiteItem( +// configType = config.configType, +// subscriptionId = config.subscriptionId, +// remarks = config.remarks, +// server = config.getProxyOutbound()?.getServerAddress(), +// serverPort = config.getProxyOutbound()?.getServerPort(), +// ) + serversCache.add(0, ServersCache(key, config)) + return true + } catch (e: Exception) { + e.printStackTrace() + } + } + return false + } - /** - * Swaps the positions of two servers. - * @param fromPosition The initial position of the server. - * @param toPosition The target position of the server. - */ fun swapServer(fromPosition: Int, toPosition: Int) { if (subscriptionId.isEmpty()) { Collections.swap(serverList, fromPosition, toPosition) @@ -137,9 +119,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { MmkvManager.encodeServerList(serverList) } - /** - * Updates the cache of servers. - */ @Synchronized fun updateCache() { serversCache.clear() @@ -162,16 +141,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { continue } - if (keywordFilter.isEmpty() || profile.remarks.lowercase().contains(keywordFilter.lowercase())) { + if (keywordFilter.isEmpty() || profile.remarks.contains(keywordFilter)) { serversCache.add(ServersCache(guid, profile)) } } } - /** - * Updates the configuration via subscription for all servers. - * @return The number of updated configurations. - */ fun updateConfigViaSubAll(): Int { if (subscriptionId.isEmpty()) { return AngConfigManager.updateConfigViaSubAll() @@ -181,10 +156,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } - /** - * Exports all servers. - * @return The number of exported servers. - */ fun exportAllServer(): Int { val serverListCopy = if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) { @@ -200,22 +171,21 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return ret } - /** - * Tests the TCP ping for all servers. - */ + fun testAllTcping() { tcpingTestScope.coroutineContext[Job]?.cancelChildren() - SpeedtestManager.closeAllTcpSockets() + SpeedtestUtil.closeAllTcpSockets() MmkvManager.clearAllTestDelayResults(serversCache.map { it.guid }.toList()) + //updateListAction.value = -1 // update all - val serversCopy = serversCache.toList() + val serversCopy = serversCache.toList() // Create a copy of the list for (item in serversCopy) { item.profile.let { outbound -> val serverAddress = outbound.server val serverPort = outbound.serverPort if (serverAddress != null && serverPort != null) { tcpingTestScope.launch { - val testResult = SpeedtestManager.tcping(serverAddress, serverPort.toInt()) + val testResult = SpeedtestUtil.tcping(serverAddress, serverPort.toInt()) launch(Dispatchers.Main) { MmkvManager.encodeServerTestDelayMillis(item.guid, testResult) updateListAction.value = getPosition(item.guid) @@ -226,33 +196,23 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } - /** - * Tests the real ping for all servers. - */ fun testAllRealPing() { MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG_CANCEL, "") MmkvManager.clearAllTestDelayResults(serversCache.map { it.guid }.toList()) - updateListAction.value = -1 + updateListAction.value = -1 // update all - val serversCopy = serversCache.toList() - viewModelScope.launch(Dispatchers.Default) { + val serversCopy = serversCache.toList() // Create a copy of the list + viewModelScope.launch(Dispatchers.Default) { // without Dispatchers.Default viewModelScope will launch in main thread for (item in serversCopy) { MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, item.guid) } } } - /** - * Tests the real ping for the current server. - */ fun testCurrentServerRealPing() { MessageUtil.sendMsg2Service(getApplication(), AppConfig.MSG_MEASURE_DELAY, "") } - /** - * Changes the subscription ID. - * @param id The new subscription ID. - */ fun subscriptionIdChanged(id: String) { if (subscriptionId != id) { subscriptionId = id @@ -261,11 +221,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } } - /** - * Gets the subscriptions. - * @param context The context. - * @return A pair of lists containing the subscription IDs and remarks. - */ fun getSubscriptions(context: Context): Pair?, MutableList?> { val subscriptions = MmkvManager.decodeSubscriptions() if (subscriptionId.isNotEmpty() @@ -284,11 +239,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return listId to listRemarks } - /** - * Gets the position of a server by its GUID. - * @param guid The GUID of the server. - * @return The position of the server. - */ fun getPosition(guid: String): Int { serversCache.forEachIndexed { index, it -> if (it.guid == guid) @@ -297,10 +247,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return -1 } - /** - * Removes duplicate servers. - * @return The number of removed servers. - */ fun removeDuplicateServer(): Int { val serversCacheCopy = mutableListOf>() for (it in serversCache) { @@ -327,10 +273,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return deleteServer.count() } - /** - * Removes all servers. - * @return The number of removed servers. - */ fun removeAllServer(): Int { val count = if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) { @@ -345,10 +287,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return count } - /** - * Removes invalid servers. - * @return The number of removed servers. - */ fun removeInvalidServer(): Int { var count = 0 if (subscriptionId.isEmpty() && keywordFilter.isEmpty()) { @@ -362,9 +300,6 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { return count } - /** - * Sorts servers by their test results. - */ fun sortByTestResults() { data class ServerDelay(var guid: String, var testDelayMillis: Long) @@ -384,20 +319,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { MmkvManager.encodeServerList(serverList) } - /** - * Initializes assets. - * @param assets The asset manager. - */ fun initAssets(assets: AssetManager) { viewModelScope.launch(Dispatchers.Default) { SettingsManager.initAssets(getApplication(), assets) } } - /** - * Filters the configuration by a keyword. - * @param keyword The keyword to filter by. - */ fun filterConfig(keyword: String) { if (keyword == keywordFilter) { return @@ -419,12 +346,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) { } AppConfig.MSG_STATE_START_SUCCESS -> { - getApplication().toastSuccess(R.string.toast_services_success) + getApplication().toast(R.string.toast_services_success) isRunning.value = true } AppConfig.MSG_STATE_START_FAILURE -> { - getApplication().toastError(R.string.toast_services_failure) + getApplication().toast(R.string.toast_services_failure) isRunning.value = false } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt index 7ac5d60f..b0533f02 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt @@ -7,41 +7,28 @@ import androidx.lifecycle.AndroidViewModel import androidx.preference.PreferenceManager import com.v2ray.ang.AppConfig import com.v2ray.ang.handler.MmkvManager -import com.v2ray.ang.handler.SettingsManager +import com.v2ray.ang.util.Utils class SettingsViewModel(application: Application) : AndroidViewModel(application), SharedPreferences.OnSharedPreferenceChangeListener { - /** - * Starts listening for preference changes. - */ fun startListenPreferenceChange() { PreferenceManager.getDefaultSharedPreferences(getApplication()) .registerOnSharedPreferenceChangeListener(this) } - /** - * Called when the ViewModel is cleared. - */ override fun onCleared() { PreferenceManager.getDefaultSharedPreferences(getApplication()) .unregisterOnSharedPreferenceChangeListener(this) - Log.i(AppConfig.TAG, "Settings ViewModel is cleared") + Log.i(AppConfig.ANG_PACKAGE, "Settings ViewModel is cleared") super.onCleared() } - /** - * Called when a shared preference is changed. - * @param sharedPreferences The shared preferences. - * @param key The key of the changed preference. - */ override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { - Log.i(AppConfig.TAG, "Observe settings changed: $key") + Log.d(AppConfig.ANG_PACKAGE, "Observe settings changed: $key") when (key) { AppConfig.PREF_MODE, AppConfig.PREF_VPN_DNS, - AppConfig.PREF_VPN_BYPASS_LAN, - AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX, AppConfig.PREF_REMOTE_DNS, AppConfig.PREF_DOMESTIC_DNS, AppConfig.PREF_DNS_HOSTS, @@ -49,7 +36,6 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PREF_SOCKS_PORT, AppConfig.PREF_LOGLEVEL, - AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, AppConfig.PREF_LANGUAGE, AppConfig.PREF_UI_MODE_NIGHT, AppConfig.PREF_ROUTING_DOMAIN_STRATEGY, @@ -75,7 +61,6 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application AppConfig.PREF_BYPASS_APPS, AppConfig.PREF_CONFIRM_REMOVE, AppConfig.PREF_START_SCAN_IMMEDIATE, - AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, AppConfig.SUBSCRIPTION_AUTO_UPDATE, AppConfig.PREF_FRAGMENT_ENABLED, AppConfig.PREF_MUX_ENABLED, @@ -91,9 +76,13 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application AppConfig.PREF_MUX_XUDP_CONCURRENCY -> { MmkvManager.encodeSettings(key, sharedPreferences.getString(key, "8")) } + +// AppConfig.PREF_PER_APP_PROXY_SET -> { +// MmkvManager.encodeSettings(key, sharedPreferences.getStringSet(key, setOf())) +// } } if (key == AppConfig.PREF_UI_MODE_NIGHT) { - SettingsManager.setNightMode() + Utils.setNightMode() } } } diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_check_update_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_check_update_24dp.xml deleted file mode 100644 index 5a7c2fd0..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_check_update_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml index 73387126..30595842 100644 --- a/V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable-night/ic_file_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M537,85.3A85.3,85.3 0,0 1,597.3 110.3L828.3,341.3A85.3,85.3 0,0 1,853.3 401.7L853.3,810.7a128,128 0,0 1,-128 128L298.7,938.7a128,128 0,0 1,-128 -128L170.7,213.3a128,128 0,0 1,128 -128zM537,170.7L298.7,170.7a42.7,42.7 0,0 0,-42.7 42.7v597.3a42.7,42.7 0,0 0,42.7 42.7h426.7a42.7,42.7 0,0 0,42.7 -42.7L768,401.7L537,170.7zM512,384a42.7,42.7 0,0 1,42.4 37.7L554.7,426.7v85.3h85.3a42.7,42.7 0,0 1,5 85L640,597.3h-85.3v85.3a42.7,42.7 0,0 1,-85 5L469.3,682.7v-85.3L384,597.3a42.7,42.7 0,0 1,-5 -85L384,512h85.3v-85.3a42.7,42.7 0,0 1,42.7 -42.7z" + android:fillColor="#FFFFFFFF" /> diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml index 77e41a46..1c1a9c94 100644 --- a/V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable-night/ic_logcat_24dp.xml @@ -4,12 +4,12 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M273.2,212.8h583.7L856.9,906.2h-583.7L273.2,212.8zM344.9,284.5L344.9,834.6h440.3L785.2,284.5h-440.3z" + android:fillColor="#FFFFFFFF" /> + android:pathData="M167.1,117.8h554.4v123.6h-71.7V189.4H238.8v498.8h73.9v71.7H167.1V117.8z" + android:fillColor="#FFFFFFFF" /> + android:pathData="M674.8,504H455.3v-71.7h219.4v71.7zM674.8,650.2H455.3v-71.7h219.4v71.7z" + android:fillColor="#FFFFFFFF" /> diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_more_vert_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_more_vert_24dp.xml deleted file mode 100644 index 2a252346..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_more_vert_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml b/V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml index 07553f4e..9d0d5910 100644 --- a/V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml +++ b/V2rayNG/app/src/main/res/drawable-night/ic_outline_filter_alt_24.xml @@ -1,9 +1,9 @@ - + android:width="24dp" + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_per_apps_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_per_apps_24dp.xml deleted file mode 100644 index 99d8212e..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_per_apps_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_promotion_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_promotion_24dp.xml index e6142817..014a5021 100644 --- a/V2rayNG/app/src/main/res/drawable-night/ic_promotion_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable-night/ic_promotion_24dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M723.9,312c-13.2,-13.2 -34.7,-13.2 -47.9,0 -6.6,6.6 -9.9,15.3 -9.9,23.9 0,8.7 3.3,17.3 9.9,23.9 65.9,65.9 80.9,165.5 37.3,247.8 -4.9,9.2 -10.5,18.2 -16.9,26.8 -6.4,8.7 -12.9,16.4 -20,23.3 -13.4,13.1 -13.7,34.5 -0.6,47.9 13.1,13.4 34.5,13.7 47.9,0.6 9.7,-9.5 18.9,-20.2 27.3,-31.6 8.3,-11.2 15.7,-23 22.2,-35.2 57.5,-108.7 37.7,-240.3 -49.3,-327.4zM507.6,470c-0.2,-0.2 -0.4,-0.3 -0.7,-0.5 -0.8,-0.3 -1.7,-0.1 -2.3,0.5 -0.2,0.2 -0.3,0.4 -0.5,0.7 -0.1,0.3 -0.2,0.5 -0.2,0.8 0,0.6 0.3,1.1 0.6,1.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.1 0.5,0.2 0.8,0.2 0.6,0 1.1,-0.3 1.5,-0.6 0.4,-0.4 0.6,-1 0.6,-1.5 0,-0.3 -0.1,-0.5 -0.2,-0.8 0,-0.4 -0.2,-0.6 -0.3,-0.8z" + android:fillColor="#FFFFFFFF" /> + android:pathData="M833.7,209.6c-13.2,-13.2 -34.5,-13.2 -47.6,0 -13.2,13.2 -13.2,34.5 0,47.6 122.3,122.3 140,314.4 42.1,456.6 -12.5,18.1 -26.5,35 -42.1,50.5 -6.6,6.6 -9.9,15.2 -9.9,23.8 0,8.6 3.3,17.2 9.9,23.8 13.2,13.2 34.5,13.2 47.6,0 18.4,-18.4 35.1,-38.5 49.9,-60C1000,583.1 979,355 833.7,209.6zM515.1,166.8c-48,-22.3 -102.9,-15.1 -143.4,19L176.6,349.9h-50.2c-31,0 -63.3,25.2 -63.3,56.3v209.4c0,31 32.2,56.3 63.3,56.3h50.2L371.7,836c24.9,21 55.4,31.8 86.2,31.8 19.3,0 38.7,-4.2 57.2,-12.8 48,-22.3 77.8,-69.1 77.8,-122L592.9,288.8c0,-52.9 -29.8,-99.6 -77.8,-122zM531.1,732.9c0,31.8 -17.2,52.9 -46.1,66.3 -28.9,13.4 -56.7,6.2 -81,-14.3L206.2,623.5c-4.9,-4.2 -11.2,-6.4 -17.6,-6.4h-60.2c-0.8,0 -1.5,-0.7 -1.5,-1.5L126.9,406.2c0,-0.8 0.7,-1.5 1.5,-1.5h60.2c6.5,0 12.7,-2.3 17.6,-6.4L412,237.7c24.4,-20.5 51.2,-24.7 80,-11.3 28.9,13.4 39.1,30.5 39.1,62.3v444.2z" + android:fillColor="#FFFFFFFF" /> diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml index 3d37d197..a24c01bf 100644 --- a/V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable-night/ic_select_all_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp"> diff --git a/V2rayNG/app/src/main/res/drawable/custom_divider.xml b/V2rayNG/app/src/main/res/drawable/custom_divider.xml deleted file mode 100644 index 94f03147..00000000 --- a/V2rayNG/app/src/main/res/drawable/custom_divider.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_check_update_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_check_update_24dp.xml deleted file mode 100644 index b0f163c6..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_check_update_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_circle.xml b/V2rayNG/app/src/main/res/drawable/ic_circle.xml deleted file mode 100644 index 13bb8e65..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_circle.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml index 50ca7039..c14b248f 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_file_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M537,85.3A85.3,85.3 0,0 1,597.3 110.3L828.3,341.3A85.3,85.3 0,0 1,853.3 401.7L853.3,810.7a128,128 0,0 1,-128 128L298.7,938.7a128,128 0,0 1,-128 -128L170.7,213.3a128,128 0,0 1,128 -128zM537,170.7L298.7,170.7a42.7,42.7 0,0 0,-42.7 42.7v597.3a42.7,42.7 0,0 0,42.7 42.7h426.7a42.7,42.7 0,0 0,42.7 -42.7L768,401.7L537,170.7zM512,384a42.7,42.7 0,0 1,42.4 37.7L554.7,426.7v85.3h85.3a42.7,42.7 0,0 1,5 85L640,597.3h-85.3v85.3a42.7,42.7 0,0 1,-85 5L469.3,682.7v-85.3L384,597.3a42.7,42.7 0,0 1,-5 -85L384,512h85.3v-85.3a42.7,42.7 0,0 1,42.7 -42.7z" + android:fillColor="#FF000000" /> diff --git a/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml index 95fe140c..b8a544ef 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_logcat_24dp.xml @@ -4,12 +4,12 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M273.2,212.8h583.7L856.9,906.2h-583.7L273.2,212.8zM344.9,284.5L344.9,834.6h440.3L785.2,284.5h-440.3z" + android:fillColor="#FF000000" /> + android:pathData="M167.1,117.8h554.4v123.6h-71.7V189.4H238.8v498.8h73.9v71.7H167.1V117.8z" + android:fillColor="#FF000000" /> + android:pathData="M674.8,504H455.3v-71.7h219.4v71.7zM674.8,650.2H455.3v-71.7h219.4v71.7z" + android:fillColor="#FF000000" /> diff --git a/V2rayNG/app/src/main/res/drawable/ic_more_vert_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_more_vert_24dp.xml deleted file mode 100644 index 32d39196..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_more_vert_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml index 77112182..3a12237a 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_outline_filter_alt_24.xml @@ -1,9 +1,9 @@ - + android:width="24dp" + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_per_apps_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_per_apps_24dp.xml deleted file mode 100644 index c45cd8c5..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_per_apps_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_promotion_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_promotion_24dp.xml index f4283b58..079a2197 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_promotion_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_promotion_24dp.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M723.9,312c-13.2,-13.2 -34.7,-13.2 -47.9,0 -6.6,6.6 -9.9,15.3 -9.9,23.9 0,8.7 3.3,17.3 9.9,23.9 65.9,65.9 80.9,165.5 37.3,247.8 -4.9,9.2 -10.5,18.2 -16.9,26.8 -6.4,8.7 -12.9,16.4 -20,23.3 -13.4,13.1 -13.7,34.5 -0.6,47.9 13.1,13.4 34.5,13.7 47.9,0.6 9.7,-9.5 18.9,-20.2 27.3,-31.6 8.3,-11.2 15.7,-23 22.2,-35.2 57.5,-108.7 37.7,-240.3 -49.3,-327.4zM507.6,470c-0.2,-0.2 -0.4,-0.3 -0.7,-0.5 -0.8,-0.3 -1.7,-0.1 -2.3,0.5 -0.2,0.2 -0.3,0.4 -0.5,0.7 -0.1,0.3 -0.2,0.5 -0.2,0.8 0,0.6 0.3,1.1 0.6,1.5 0.2,0.2 0.4,0.3 0.7,0.5 0.3,0.1 0.5,0.2 0.8,0.2 0.6,0 1.1,-0.3 1.5,-0.6 0.4,-0.4 0.6,-1 0.6,-1.5 0,-0.3 -0.1,-0.5 -0.2,-0.8 0,-0.4 -0.2,-0.6 -0.3,-0.8z" + android:fillColor="#FF000000" /> + android:pathData="M833.7,209.6c-13.2,-13.2 -34.5,-13.2 -47.6,0 -13.2,13.2 -13.2,34.5 0,47.6 122.3,122.3 140,314.4 42.1,456.6 -12.5,18.1 -26.5,35 -42.1,50.5 -6.6,6.6 -9.9,15.2 -9.9,23.8 0,8.6 3.3,17.2 9.9,23.8 13.2,13.2 34.5,13.2 47.6,0 18.4,-18.4 35.1,-38.5 49.9,-60C1000,583.1 979,355 833.7,209.6zM515.1,166.8c-48,-22.3 -102.9,-15.1 -143.4,19L176.6,349.9h-50.2c-31,0 -63.3,25.2 -63.3,56.3v209.4c0,31 32.2,56.3 63.3,56.3h50.2L371.7,836c24.9,21 55.4,31.8 86.2,31.8 19.3,0 38.7,-4.2 57.2,-12.8 48,-22.3 77.8,-69.1 77.8,-122L592.9,288.8c0,-52.9 -29.8,-99.6 -77.8,-122zM531.1,732.9c0,31.8 -17.2,52.9 -46.1,66.3 -28.9,13.4 -56.7,6.2 -81,-14.3L206.2,623.5c-4.9,-4.2 -11.2,-6.4 -17.6,-6.4h-60.2c-0.8,0 -1.5,-0.7 -1.5,-1.5L126.9,406.2c0,-0.8 0.7,-1.5 1.5,-1.5h60.2c6.5,0 12.7,-2.3 17.6,-6.4L412,237.7c24.4,-20.5 51.2,-24.7 80,-11.3 28.9,13.4 39.1,30.5 39.1,62.3v444.2z" + android:fillColor="#FF000000" /> diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml index 79be6f81..0021d339 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml @@ -1,8 +1,8 @@ + android:viewportHeight="1024" + android:viewportWidth="1024"> diff --git a/V2rayNG/app/src/main/res/drawable/ic_source_code_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_source_code_24dp.xml index 800f7b5f..dc13d1c8 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_source_code_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_source_code_24dp.xml @@ -1,8 +1,8 @@ - + android:width="24dp" + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/V2rayNG/app/src/main/res/drawable/license_24px.xml b/V2rayNG/app/src/main/res/drawable/license_24px.xml index 5b63fd29..99b9354b 100644 --- a/V2rayNG/app/src/main/res/drawable/license_24px.xml +++ b/V2rayNG/app/src/main/res/drawable/license_24px.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + diff --git a/V2rayNG/app/src/main/res/layout/activity_about.xml b/V2rayNG/app/src/main/res/layout/activity_about.xml index 62053559..15262fd6 100644 --- a/V2rayNG/app/src/main/res/layout/activity_about.xml +++ b/V2rayNG/app/src/main/res/layout/activity_about.xml @@ -24,18 +24,18 @@ android:focusable="true" android:gravity="center|start" android:orientation="horizontal" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/padding"> + android:paddingStart="@dimen/padding_start"> @@ -58,23 +58,23 @@ + android:padding="@dimen/padding"> @@ -82,23 +82,23 @@ + android:padding="@dimen/padding"> @@ -109,28 +109,28 @@ android:layout_height="match_parent" android:gravity="top" android:orientation="vertical" - android:paddingTop="@dimen/padding_spacing_dp16"> + android:paddingTop="@dimen/padding_start"> + android:padding="@dimen/padding"> @@ -138,23 +138,23 @@ + android:padding="@dimen/padding"> @@ -162,23 +162,23 @@ + android:padding="@dimen/padding"> @@ -187,23 +187,23 @@ + android:padding="@dimen/padding"> @@ -211,33 +211,33 @@ + android:padding="@dimen/padding"> + android:padding="@dimen/padding"> - - + android:orientation="vertical"> + android:paddingStart="@dimen/padding_start" + android:paddingEnd="@dimen/padding_end"> @@ -69,26 +60,8 @@ android:layout_height="wrap_content" android:text="@string/switch_bypass_apps_mode" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@color/colorAccent" app:theme="@style/BrandedSwitch" /> - - - - - - @@ -96,11 +69,17 @@ + + + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:context=".ui.PerAppProxyActivity" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/activity_check_update.xml b/V2rayNG/app/src/main/res/layout/activity_check_update.xml deleted file mode 100644 index 29345075..00000000 --- a/V2rayNG/app/src/main/res/layout/activity_check_update.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/V2rayNG/app/src/main/res/layout/activity_logcat.xml b/V2rayNG/app/src/main/res/layout/activity_logcat.xml index 05db70a7..902116dd 100644 --- a/V2rayNG/app/src/main/res/layout/activity_logcat.xml +++ b/V2rayNG/app/src/main/res/layout/activity_logcat.xml @@ -1,26 +1,40 @@ - + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> - + + - - - + android:layout_height="wrap_content" + android:gravity="bottom" + android:maxLines="65536" + android:textAppearance="?android:attr/textAppearanceSmall" /> + diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index e5f6964c..9927e8c8 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -48,7 +48,6 @@ android:id="@+id/tab_group" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/padding_spacing_dp8" app:tabIndicatorFullWidth="false" app:tabMode="scrollable" app:tabTextAppearance="@style/TabLayoutTextStyle" /> @@ -58,32 +57,26 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:nextFocusRight="@+id/fab" - android:scrollbars="vertical" /> + android:nextFocusRight="@+id/fab" /> - - + android:nextFocusRight="@+id/fab"> @@ -91,21 +84,27 @@ + android:layout_marginBottom="12dp"> diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml index 53a49fec..5d8b768c 100644 --- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml +++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml @@ -1,11 +1,11 @@ + tools:context=".ui.SubSettingActivity"> + android:padding="@dimen/layout_margin_top_height"> @@ -144,7 +143,7 @@ @@ -163,7 +162,7 @@ @@ -185,8 +182,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml index d79b4c84..825c1c50 100644 --- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml +++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml @@ -7,7 +7,7 @@ android:fitsSystemWindows="true" tools:context=".ui.RoutingSettingActivity"> - @@ -17,36 +17,40 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_margin="@dimen/cardview_margin" + android:orientation="horizontal" + card_view:cardCornerRadius="5dp"> - + android:layout_marginTop="@dimen/layout_margin_top_height" + android:paddingStart="@dimen/padding_start" + android:paddingEnd="@dimen/padding_end" + android:orientation="vertical"> - - + + + + + - + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml index d6d587b8..40423b54 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml @@ -14,7 +14,7 @@ @@ -65,7 +65,7 @@ @@ -73,7 +73,7 @@ android:id="@+id/editor" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/padding_spacing_dp16" + android:layout_marginTop="@dimen/layout_margin_top_height" android:gravity="top|start" /> diff --git a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml index 86df50ef..24a120a0 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -36,7 +36,7 @@ @@ -55,7 +55,7 @@ @@ -74,7 +74,7 @@ - - - - - - - - - - - - - - - - diff --git a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml index 0d9e958f..83dbfc96 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -37,7 +37,7 @@ @@ -61,8 +59,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml index 90c1b883..42f62a3f 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -37,7 +37,7 @@ @@ -56,8 +56,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml index 2159ec43..b98753d0 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -40,8 +40,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml index 7d29efd2..c7bf624b 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -36,7 +36,7 @@ @@ -80,8 +78,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml index 4e77cbdf..413127e4 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -36,7 +36,7 @@ @@ -60,8 +58,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml index 7ecd7ce1..93bc43f7 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml @@ -10,14 +10,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -36,7 +36,7 @@ - @@ -76,7 +75,7 @@ @@ -101,7 +100,7 @@ @@ -138,8 +137,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml index af5d70cd..504c1e07 100644 --- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml +++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml @@ -1,11 +1,11 @@ + tools:context=".ui.SubSettingActivity"> + android:padding="@dimen/layout_margin_top_height"> @@ -52,7 +52,7 @@ @@ -96,7 +96,7 @@ @@ -118,7 +118,7 @@ @@ -141,29 +141,7 @@ - - - - - - - - @@ -183,7 +161,7 @@ @@ -204,8 +182,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml b/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml index 1654701d..ed34fc22 100644 --- a/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml +++ b/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml @@ -1,25 +1,22 @@ + - - - + android:layout_height="match_parent"> + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/activity_tasker.xml b/V2rayNG/app/src/main/res/layout/activity_tasker.xml index 56a1276d..fc3d62e1 100644 --- a/V2rayNG/app/src/main/res/layout/activity_tasker.xml +++ b/V2rayNG/app/src/main/res/layout/activity_tasker.xml @@ -1,33 +1,33 @@ + android:layout_height="@dimen/bypass_list_header_height"> + android:checked="true" /> diff --git a/V2rayNG/app/src/main/res/layout/activity_user_asset.xml b/V2rayNG/app/src/main/res/layout/activity_user_asset.xml deleted file mode 100644 index 08d7583f..00000000 --- a/V2rayNG/app/src/main/res/layout/activity_user_asset.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml index e1b55173..d46391c0 100644 --- a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml +++ b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> @@ -51,7 +51,7 @@ diff --git a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml index 0bbc9003..1c043f4f 100644 --- a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml +++ b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml @@ -7,27 +7,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="@dimen/padding_spacing_dp16"> + android:padding="@dimen/layout_margin_top_height"> + android:layout_height="@dimen/edit_height" /> diff --git a/V2rayNG/app/src/main/res/layout/item_qrcode.xml b/V2rayNG/app/src/main/res/layout/item_qrcode.xml index d3ea9075..d5997b3f 100644 --- a/V2rayNG/app/src/main/res/layout/item_qrcode.xml +++ b/V2rayNG/app/src/main/res/layout/item_qrcode.xml @@ -9,8 +9,8 @@ diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml index 889cb3c6..f074f9ff 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml @@ -2,47 +2,46 @@ + android:focusable="true"> + android:layout_width="60dp" + android:layout_height="60dp" + android:paddingStart="@dimen/padding_start" + android:paddingEnd="@dimen/padding_end" /> + android:orientation="vertical" + android:paddingStart="@dimen/padding_start" + android:paddingEnd="@dimen/padding_end"> + android:layout_height="wrap_content" /> + + android:paddingStart="@dimen/padding_start" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml index 01db7a96..6c4df973 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml @@ -8,18 +8,18 @@ + android:padding="@dimen/padding"> + android:orientation="vertical" + android:paddingBottom="@dimen/layout_margin_top_height"> - - - - - - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml index 313492d4..ac27a40e 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -7,119 +7,125 @@ android:layout_height="wrap_content" android:gravity="center_vertical"> - - - + android:layout_margin="@dimen/cardview_margin" + app:cardCornerRadius="5dp"> + android:layout_height="@dimen/server_height" + android:layout_gravity="center" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" + android:gravity="center" + android:nextFocusRight="@+id/layout_share" + android:orientation="horizontal"> + + - - - - - - - - - - - - - - - - - - - - - + android:layout_weight="1" + android:orientation="vertical" + android:paddingStart="@dimen/padding_start"> + + + + + + + + + + + + + + + + + + + + + + android:padding="@dimen/layout_margin_spacing"> @@ -127,17 +133,17 @@ + android:padding="@dimen/layout_margin_spacing"> @@ -145,75 +151,41 @@ + android:padding="@dimen/layout_margin_spacing"> - - - - - - - - - - - - - + android:layout_gravity="right" + android:orientation="vertical" + android:paddingEnd="@dimen/padding_end"> + + + - - - + diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml index e104ef97..daf1020f 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml @@ -6,105 +6,113 @@ android:layout_height="wrap_content" android:gravity="center_vertical"> - + card_view:cardCornerRadius="5dp"> + android:id="@+id/info_container" + android:layout_width="match_parent" + android:layout_height="@dimen/sub_height" + android:layout_gravity="center" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:gravity="center" + android:nextFocusRight="@+id/layout_edit" + android:orientation="horizontal"> + android:layout_weight="1" + android:orientation="vertical" + android:paddingStart="@dimen/padding_start"> + + + + + + + + + android:layout_marginTop="@dimen/layout_margin_spacing" + android:lines="1" + android:textAppearance="@style/TextAppearance.AppCompat.Small" /> - + - - - - - - - - + android:paddingStart="@dimen/padding_start" + android:paddingEnd="@dimen/padding_end"> - - - - - - + android:background="?attr/selectableItemBackgroundBorderless" + android:clickable="true" + android:focusable="true" + android:gravity="center" + android:nextFocusLeft="@+id/info_container" + android:orientation="vertical" + android:padding="@dimen/layout_margin_spacing"> + + + + + + + + + - - - + diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml index 47c2b4c5..a2ad1817 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml @@ -6,153 +6,109 @@ android:layout_height="wrap_content" android:gravity="center_vertical"> - + card_view:cardCornerRadius="5dp"> + android:layout_height="@dimen/sub_height" + android:layout_gravity="center" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:gravity="center" + android:nextFocusRight="@+id/layout_edit" + android:orientation="horizontal"> + android:layout_weight="1" + android:orientation="vertical" + android:paddingStart="@dimen/padding_start"> - + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml index 61cd2a67..cf1bf597 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml @@ -5,82 +5,90 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + android:layout_margin="@dimen/cardview_margin" + app:cardCornerRadius="5dp"> + android:background="?attr/selectableItemBackground" + android:gravity="center" + android:orientation="horizontal" + android:padding="@dimen/nav_header_vertical_spacing"> + android:layout_weight="1" + android:orientation="vertical" + android:paddingStart="@dimen/padding_start"> - + android:orientation="vertical"> - + - + + + + + + + + + + + + + + + - - - - - - - - - - - - + diff --git a/V2rayNG/app/src/main/res/layout/layout_address_port.xml b/V2rayNG/app/src/main/res/layout/layout_address_port.xml index 1c0111ca..66c46609 100644 --- a/V2rayNG/app/src/main/res/layout/layout_address_port.xml +++ b/V2rayNG/app/src/main/res/layout/layout_address_port.xml @@ -19,7 +19,7 @@ @@ -38,7 +38,7 @@ @@ -57,7 +57,7 @@ diff --git a/V2rayNG/app/src/main/res/layout/layout_progress.xml b/V2rayNG/app/src/main/res/layout/layout_progress.xml new file mode 100644 index 00000000..8e431cad --- /dev/null +++ b/V2rayNG/app/src/main/res/layout/layout_progress.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/layout/layout_tls.xml b/V2rayNG/app/src/main/res/layout/layout_tls.xml index b7c34a12..1c0c5589 100644 --- a/V2rayNG/app/src/main/res/layout/layout_tls.xml +++ b/V2rayNG/app/src/main/res/layout/layout_tls.xml @@ -2,14 +2,14 @@ @@ -21,9 +21,7 @@ @@ -33,7 +31,7 @@ android:id="@+id/lay_sni" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" + android:layout_marginBottom="@dimen/activity_horizontal_margin" android:orientation="vertical"> @@ -54,8 +52,8 @@ android:id="@+id/lay_stream_fingerprint" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginBottom="@dimen/activity_horizontal_margin"> @@ -77,8 +73,8 @@ android:id="@+id/lay_stream_alpn" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginBottom="@dimen/activity_horizontal_margin"> @@ -110,9 +104,7 @@ @@ -120,7 +112,7 @@ android:id="@+id/lay_public_key" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" + android:layout_marginBottom="@dimen/activity_horizontal_margin" android:orientation="vertical"> @@ -141,7 +133,7 @@ android:id="@+id/lay_short_id" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" + android:layout_marginBottom="@dimen/activity_horizontal_margin" android:orientation="vertical"> @@ -162,7 +154,7 @@ android:id="@+id/lay_spider_x" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" + android:layout_marginBottom="@dimen/activity_horizontal_margin" android:orientation="vertical"> diff --git a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml index fc279bcb..3180f666 100644 --- a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml +++ b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml @@ -2,14 +2,14 @@ @@ -21,9 +21,7 @@ @@ -33,7 +31,7 @@ android:id="@+id/lay_sni" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/padding_spacing_dp16" + android:layout_marginBottom="@dimen/activity_horizontal_margin" android:orientation="vertical"> @@ -65,16 +63,14 @@ diff --git a/V2rayNG/app/src/main/res/layout/layout_transport.xml b/V2rayNG/app/src/main/res/layout/layout_transport.xml index 85712ff8..bda1e11c 100644 --- a/V2rayNG/app/src/main/res/layout/layout_transport.xml +++ b/V2rayNG/app/src/main/res/layout/layout_transport.xml @@ -7,7 +7,7 @@ + android:layout_height="@dimen/edit_height" /> @@ -80,7 +76,7 @@ @@ -100,7 +96,7 @@ android:id="@+id/layout_extra" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/padding_spacing_dp16" + android:layout_marginTop="@dimen/layout_margin_top_height" android:orientation="vertical"> + android:padding="@dimen/activity_horizontal_margin"> diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml index 99abc068..bf0bfc71 100644 --- a/V2rayNG/app/src/main/res/layout/widget_switch.xml +++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml @@ -18,7 +18,7 @@ android:id="@+id/image_switch" android:layout_width="45dp" android:layout_height="45dp" - android:padding="@dimen/padding_spacing_dp16" + android:padding="@dimen/padding" app:srcCompat="@drawable/ic_stat_name" /> @@ -26,6 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@android:color/white" /> + android:textColor="@android:color/white" + android:textSize="10sp" /> diff --git a/V2rayNG/app/src/main/res/menu/action_server.xml b/V2rayNG/app/src/main/res/menu/action_server.xml index 62785bca..e0b34e39 100644 --- a/V2rayNG/app/src/main/res/menu/action_server.xml +++ b/V2rayNG/app/src/main/res/menu/action_server.xml @@ -5,10 +5,10 @@ android:id="@+id/del_config" android:icon="@drawable/ic_delete_24dp" android:title="@string/menu_item_del_config" - app:showAsAction="ifRoom" /> + app:showAsAction="always" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/action_sub_setting.xml b/V2rayNG/app/src/main/res/menu/action_sub_setting.xml index fa77aa07..3179cb1a 100644 --- a/V2rayNG/app/src/main/res/menu/action_sub_setting.xml +++ b/V2rayNG/app/src/main/res/menu/action_sub_setting.xml @@ -5,10 +5,10 @@ android:id="@+id/add_config" android:icon="@drawable/ic_add_24dp" android:title="@string/menu_item_add_config" - app:showAsAction="ifRoom" /> + app:showAsAction="always" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_asset.xml b/V2rayNG/app/src/main/res/menu/menu_asset.xml index fc351ece..bec6fe3b 100644 --- a/V2rayNG/app/src/main/res/menu/menu_asset.xml +++ b/V2rayNG/app/src/main/res/menu/menu_asset.xml @@ -24,5 +24,5 @@ android:id="@+id/download_file" android:icon="@drawable/ic_cloud_download_24dp" android:title="@string/menu_item_download_file" - app:showAsAction="ifRoom" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml index 8d950208..63fed36e 100644 --- a/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml +++ b/V2rayNG/app/src/main/res/menu/menu_bypass_list.xml @@ -6,7 +6,7 @@ android:icon="@drawable/ic_description_24dp" android:title="@string/menu_item_search" app:actionViewClass="androidx.appcompat.widget.SearchView" - app:showAsAction="ifRoom" /> + app:showAsAction="always" /> + android:id="@+id/settings" + android:icon="@drawable/ic_settings_24dp" + android:title="@string/title_settings" /> - - @@ -35,10 +27,6 @@ android:id="@+id/logcat" android:icon="@drawable/ic_logcat_24dp" android:title="@string/title_logcat" /> - - + app:showAsAction="always" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/menu/menu_main.xml b/V2rayNG/app/src/main/res/menu/menu_main.xml index ce231ae7..1144010e 100644 --- a/V2rayNG/app/src/main/res/menu/menu_main.xml +++ b/V2rayNG/app/src/main/res/menu/menu_main.xml @@ -20,10 +20,6 @@ android:id="@+id/import_clipboard" android:title="@string/menu_item_import_config_clipboard" app:showAsAction="never" /> - + + + + + + + + + + + app:showAsAction="always" /> + app:showAsAction="always" /> \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index d74011e9..e2bbb68d 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -1,5 +1,6 @@ + v2rayNG التبديل التبديل أول استخدام لهذه الميزة، يرجى استخدام التطبيق لإضافة خادم @@ -7,7 +8,6 @@ إغلاق درج التنقل نجحت عملية ترحيل البيانات! فشلت عملية ترحيل البيانات! - Please pull down to refresh! إيقاف @@ -26,7 +26,6 @@ حذف التكوين استيراد التكوين من رمز الاستجابة السريعة (QRcode) استيراد التكوين من الحافظة - Import config from locally الكتابة يدويًا [VMess] الكتابة يدويًا [VLESS] الكتابة يدويًا [Shadowsocks] @@ -35,6 +34,11 @@ الكتابة يدويًا [Trojan] الكتابة يدويًا [Wireguard] Type manually[Hysteria2] + تكوين مخصص + استيراد تكوين مخصص من الحافظة + استيراد تكوين مخصص من الجهاز + استيراد تكوين مخصص من عنوان URL + استيراد تكوين مخصص مسح عنوان URL تأكيد الحذف؟ Please test before deleting! Confirm delete ? ملاحظات @@ -101,17 +105,6 @@ تأكد من أن منفذ الاتصالات الواردة يتوافق مع الإعدادات تكوين مشوه مضيف (SNI) (اختياري) - الإجراء غير مسموح به - Obfs password - Port Hopping - Port Hopping Interval - pinSHA256 - Bandwidth down (units) - Bandwidth up (units) - XHTTP Mode - XHTTP Extra raw JSON, format: { XHTTPObject } - - فشل نسخ الملف، يرجى استخدام مدير الملفات إضافة أصل إضافة ملفات @@ -122,7 +115,13 @@ إضافة عنوان URL للأصل الملف غير موجود الملاحظات موجودة بالفعل - Geo files source (optional) + الإجراء غير مسموح به + Obfs password + Port Hopping + Port Hopping Interval + pinSHA256 + XHTTP Mode + XHTTP Extra raw JSON, format: { XHTTPObject } جار التحميل @@ -134,14 +133,11 @@ جارٍ تنزيل المحتوى تصدير إلى الحافظة استيراد من الحافظة - Per-app settings - Enable per-app الإعدادات إعدادات متقدمة - إعدادات النواة إعدادات VPN الوكيل لكل تطبيق عام: التطبيق المحدد هو وكيل، غير المحدد اتصال مباشر؛ \nوضع التجاوز: التطبيق المحدد متصل مباشرة، غير المحدد وكيل. \nخيار تحديد تطبيق الوكيل تلقائيًا في القائمة @@ -180,9 +176,6 @@ DNS VPN DNS (IPv4/v6 فقط) - Does VPN bypass LAN - - VPN Interface Address DNS المحلي (اختياري) DNS @@ -215,10 +208,6 @@ Append HTTP Proxy to VPN HTTP proxy will be used directly from (browser/ some supported apps), without going through the virtual NIC device (Android 10+) - Enable double column display - The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect. - - ملاحظات ملاحظات التحسينات أو الأخطاء إلى GitHub الانضمام إلى مجموعة Telegram @@ -241,7 +230,6 @@ فاصل التحديث التلقائي (بالدقائق، الحد الأدنى للقيمة 15) مستوى السجل - Outbound domain pre-resolve method الوضع انقر هنا للحصول على مزيد من المساعدة اللغة @@ -262,14 +250,13 @@ Remarks regular filter تفعيل التحديث تفعيل التحديث التلقائي - Allow insecure HTTP address - Previous proxy configuration remarks - Next proxy configuration remarks - The configuration remarks exists and is unique + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique تحديث الاشتراك (أول خطوة) Tcping لجميع الإعدادات اختبر جميع الإعدادات (3) - Asset files + ملفات أصول جغرافية الفرز حسب نتائج الاختبار (5) تصفية ملف التكوين جميع مجموعات الاشتراك @@ -282,7 +269,6 @@ بدء الخدمة تأكيد - استراتيجية النطاق إعدادات التوجيه مفصولة بفواصل (،)، تذكر الحفظ @@ -315,27 +301,12 @@ فاصل الجزء (الحد الأدنى - الحد الأقصى) تفعيل الجزء - Check for update - Already on the latest version - New version found: %s - Update now - Check Pre-release - Checking for update… - رمز استجابة سريعة (QRcode) تصدير إلى الحافظة تصدير التكوين الكامل إلى الحافظة - - QRcode - Export to clipboard - Export full configuration to clipboard - Edit - Delete - - رمز استجابة سريعة (QRcode) تصدير إلى الحافظة @@ -352,16 +323,4 @@ داكن - - Follow config - Bypass - Not Bypass - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - - diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index f36c9d3a..59e68679 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -1,5 +1,6 @@ + v2rayNG সুইচ সুইচ এই ফিচারটি প্রথম ব্যবহার করা হচ্ছে, সার্ভার যোগ করতে অ্যাপটি ব্যবহার করুন @@ -7,7 +8,6 @@ নেভিগেশন ড্রয়ার বন্ধ করুন ডেটা স্থানান্তর সফল! ডেটা স্থানান্তর ব্যর্থ! - Please pull down to refresh! বন্ধ করুন @@ -26,7 +26,6 @@ কনফিগারেশন মুছুন QR কোড থেকে কনফিগারেশন আমদানি করুন ক্লিপবোর্ড থেকে কনফিগারেশন আমদানি করুন - Import config from locally ম্যানুয়ালি টাইপ করুন [VMess] ম্যানুয়ালি টাইপ করুন [VLESS] ম্যানুয়ালি টাইপ করুন [Shadowsocks] @@ -35,6 +34,11 @@ ম্যানুয়ালি টাইপ করুন [Trojan] ম্যানুয়ালি টাইপ করুন [Wireguard] Type manually[Hysteria2] + কাস্টম কনফিগারেশন + ক্লিপবোর্ড থেকে কাস্টম কনফিগারেশন আমদানি করুন + স্থানীয়ভাবে কাস্টম কনফিগারেশন আমদানি করুন + URL থেকে কাস্টম কনফিগারেশন আমদানি করুন + কাস্টম কনফিগারেশন স্ক্যান URL আমদানি করুন মুছে ফেলুন নিশ্চিত করুন？ Please test before deleting! Confirm delete ? মন্তব্য @@ -100,17 +104,6 @@ ইনবাউন্ড পোর্ট নিশ্চিত করুন সেটিংসের সাথে সামঞ্জস্যপূর্ণ কনফিগারেশন বিকৃত হোস্ট (SNI) (ঐচ্ছিক) - অ্যাকশন অনুমোদিত নয় - Obfs password - Port Hopping - Port Hopping Interval - pinSHA256 - Bandwidth down (units) - Bandwidth up (units) - XHTTP Mode - XHTTP Extra raw JSON, format: { XHTTPObject } - - ফাইল কপি ব্যর্থ, অনুগ্রহ করে ফাইল ম্যানেজার ব্যবহার করুন অ্যাসেট যোগ করুন ফাইল যোগ করুন @@ -121,7 +114,13 @@ অ্যাসেট URL যোগ করুন ফাইল খুঁজে পাওয়া যায়নি মন্তব্য ইতিমধ্যে বিদ্যমান - Geo files source (optional) + অ্যাকশন অনুমোদিত নয় + Obfs password + Port Hopping + Port Hopping Interval + pinSHA256 + XHTTP Mode + XHTTP Extra raw JSON, format: { XHTTPObject } লোড হচ্ছে @@ -133,13 +132,10 @@ বিষয়বস্তু ডাউনলোড হচ্ছে ক্লিপবোর্ডে রপ্তানি করুন ক্লিপবোর্ড থেকে আমদানি করুন - Per-app settings - Enable per-app সেটিংস এডভান্সড সেটিংস - কোর সেটিংস VPN সেটিংস প্রতি-অ্যাপ প্রক্সি সাধারণ: চেকড অ্যাপ প্রক্সি, আনচেকড সরাসরি সংযোগ; \nবাইপাস মোড: চেকড অ্যাপ সরাসরি সংযুক্ত, আনচেকড প্রক্সি। \nমেনুতে প্রক্সি অ্যাপ্লিকেশন স্বয়ংক্রিয়ভাবে নির্বাচন করার বিকল্প @@ -180,9 +176,6 @@ DNS VPN DNS (শুধুমাত্র IPv4/v6) - Does VPN bypass LAN - - VPN Interface Address ঘরোয়া DNS (ঐচ্ছিক) DNS @@ -215,10 +208,6 @@ Append HTTP Proxy to VPN HTTP proxy will be used directly from (browser/ some supported apps), without going through the virtual NIC device (Android 10+) - Enable double column display - The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect. - - মতামত মতামত উন্নয়ন বা বাগগুলি GitHub-এ পাঠান টেলিগ্রাম গ্রুপে যোগদান করুন @@ -241,7 +230,6 @@ অটো আপডেট ইন্টারভ্যাল (মিনিট, সর্বনিম্ন মান ১৫) লগ স্তর - Outbound domain pre-resolve method মোড আরো সাহায্যের জন্য ক্লিক করুন ভাষা @@ -262,14 +250,13 @@ Remarks regular filter আপডেট সক্রিয় করুন স্বয়ংক্রিয় আপডেট সক্রিয় করুন - Allow insecure HTTP address - Previous proxy configuration remarks - Next proxy configuration remarks - The configuration remarks exists and is unique + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique সাবস্ক্রিপশন আপডেট সব কনফিগারেশন TCPing সব কনফিগারেশন প্রকৃত বিলম্ব - Asset files + জিও অ্যাসেট ফাইলগুলি টেস্ট ফলাফল দ্বারা সাজানো কনফিগারেশন ফাইল ফিল্টার করুন সব সাবস্ক্রিপশন গ্রুপ @@ -281,7 +268,6 @@ সার্ভিস শুরু করুন নিশ্চিত করুন - ডোমেইন কৌশল রাউটিং সেটিংস কমা (,) দ্বারা আলাদা করুন, মনে রাখবেন সেভ করতে @@ -313,28 +299,12 @@ ফ্র্যাগমেন্ট দৈর্ঘ্য (ন্যূনতম-সর্বাধিক) ফ্র্যাগমেন্ট ইন্টারভ্যাল (ন্যূনতম-সর্বাধিক) ফ্র্যাগমেন্ট সক্রিয় করুন - - Check for update - Already on the latest version - New version found: %s - Update now - Check Pre-release - Checking for update… - QR কোড ক্লিপবোর্ডে রপ্তানি করুন পূর্ণ কনফিগারেশন ক্লিপবোর্ডে রপ্তানি করুন - - QRcode - Export to clipboard - Export full configuration to clipboard - Edit - Delete - - QR কোড ক্লিপবোর্ডে রপ্তানি করুন @@ -357,16 +327,5 @@ ইরান হোয়াইটলিস্ট - - Follow config - Bypass - Not Bypass - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml index 90e5cc26..a58d9ec9 100644 --- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml +++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml @@ -1,5 +1,6 @@ + v2rayNG آلشت آلشت سی کرت ٱولی و کار بوردن ای ویژیی، ز برنومه سی ازاف کردن سرور استفاڌه کۊنین @@ -7,9 +8,8 @@ بستن نومگه کشاری مووفقیت من جاگورویی داده جاگورویی داده ٱنجوم نگرؽڌ - سی وانۊ کردن، بکشینس بلم! - ↓ + واڌاشتن گرؽڌن موجوز مومکن نؽڌ گرؽڌن موجوز وارسۊوی مومکن نؽڌ @@ -26,7 +26,6 @@ پاک کردن کانفیگ و من ٱووردن کانفیگ ز QRcode و من ٱووردن کانفیگ ز کلیپ بورد - و من ٱووردن کانفیگ ز مهلی هؽل دستی[VMess] هؽل دستی[VLESS] هؽل دستی[Shadowsocks] @@ -35,17 +34,22 @@ هؽل دستی[Trojan] هؽل دستی[Wireguard] هؽل دستی[Hysteria2] + کانفیگ سفارشی + کانفیگ سفارشین ز کلیپ بورد و من بیار + کانفیگ سفارشین ز مهلی و من بیار + کانفیگ سفارشین ز آدرس اینترنتی و من بیار + نشۊوی اینترنتی اسکن کانفیگ سفارشین بزݩ پاک بۊ؟ - پؽش ز پاک کردن کانفیگ نا موئتبر واجۊری کوݩ! پاک کردن کانفیگن قوۊل اکۊنی؟ + پؽش ز پاک کردن کانفیگ نا موئتبر قوۊل کوݩ! پاک کردن کانفیگن قوۊل اکۊنی؟ نیشتنا - نشۊوی + آدرس پورت - نوم منتوری - شناسه جایگۊزین + نوم من توری + alterId ٱمنیت شبکه جاگورو - نوء سر بلگ + نوء head هالت gRPC هاست هاست http @@ -54,36 +58,36 @@ هاست xhttp هاست h2 ٱمنیت QUIC - Authority gRPC + اختیار gRPC تور - تور WS - تور HTTPUpgrade - تور XHTTP - تور H2 - تور QUIC - KCP seed + تور ws + تور httpupgrade + تور xhttp + تور h2 + کیلیت QUIC + سید kcp نوم خدمات gRPC TLS Fingerprint Alpn اجازه نا ٱمن SNI - نشۊوی + آدرس پورت رزم ٱمنیت رزم (اختیاری) - نوم منتوری (اختیاری) + نوم من توری (اختیاری) رزم نگاری جریان کیلیت پوی وولاتی - کیلیت رزم ناهاڌن ازاف (اختیاری) - ShortID + کیلیت رمز ناهاڌن ازاف (اختیاری) + ShortId SpiderX کیلیت سیخومی Reserved(اختیاری، وا کاما ز یک جوڌا ابۊن) - نشۊوی مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن) - Mtu(اختیاری، پؽش فرز 1420) + آدرس مهلی (اختیاری IPv4/IPv6، وا کاما ز یک جوڌا ابۊن) + Mtu(اختیاری، خوتکار 1420) وا مووفقیت ٱنجوم وابی شکست خرد هیچ داده ای وۊجۊڌ نڌاره @@ -96,51 +100,43 @@ موئتوا هیچ داده ای من کلیپ بورد وۊجۊڌ نڌاره نشۊوی اینترنتی نا موئتبر هڌ - نشۊوی اشتراک پوروتوکول نا ٱمن HTTP ن و کار مبرین + آدرس اشتراک پوروتوکول نا ٱمن HTTP ن و کار مبرین موتمعن بۊین ک پورت وۊرۊڌی وا سامووا ی جۊر هڌ کانفیگ زبال نؽڌ هاست(SNI)(اختیاری) - ای کار ممنۊع هڌ - رزم obfs - پورت گوم (درگا سرورن ز نۊ هؽل اکونه) - فاسله پورت گوم (سانیه) - pinSHA256 - ب لم ٱووڌن پئنا باند (واهڌ) - وا روء رئڌن پئنا باند (واهڌ) - هالت XHTTP - XHTTP Extra خام JSON، قالوو: { XHTTPObject } - - لف گیری فایل ٱنجوم نوابی، ز ی برنومه دؽوۉداری فایل هیاری بگرین ازاف کردن دارایی ازاف کردن فایل - ازاف کردن لینگ + ازاف کردن آدرس اینترنتی اسکن QRcode - نشۊوی اینترنتی + آدرس اینترنتی دانلود فایلا - نشۊوی اینترنتی دارایین ازاف کۊنین + آدرس اینترنتی دارایین ازاف کۊنین فایلن نجوست - نوم ز زیتر بیڌس - بونچک فایلا جوقرافیایی (اختیاری) + ائزارات ز زیتر بیڌسۉݩ + ای کار ممنۊ هڌ + رزم Obfs + پورت گوم (درگا سرورن ز نۊ هؽل اکونه) + فاسله پورت گوم (سانیه) + pinSHA256 + هالت XHTTP + XHTTP Extra خام JSON، قالوو: { XHTTPObject } - هونی بار ونی بۊ + هون بار ونی بۊ پیتینیڌن پسند پوی - رزما ن بزنین + رزمان بزنین هالت Bypass پسند خوتکار پروکسی برنومه موئتوا هونی دانلود ابۊن و در کشیڌن من کلیپ بورد و من ٱووردن ز کلیپ بورد - سامووا ب تفکیک برنومه - ر وندن ب تفکیک برنومه سامووا سامووا پؽش رئڌه - سامووا هسته سامووا VPN پروکسی و ری برنومه پوی وولاتی: برنومه واجۊری بیڌه پروکسی هڌ، منپیز موستقیم بؽ نشووه هڌ. هالت دور زیڌن: برنومه نشووک ناڌه موستقیمن منپیز هڌ، پروکسی نشووک زیڌه نؽڌ. گۊزینه پسند خوتکار برنومه پروکسی من نومگه @@ -149,10 +145,10 @@ سامووا Mux ر وندن Mux - زل تر، ٱما گاشڌ منپیز زی قت بۊ\nمخزن ترافیک TCP وا 8 منپیز پؽش فرز، بارت دؽوۉداری UDP وو QUIC ن ای لم سفارشی کۊنین. + زل تر، ٱما گاشڌ منپیز زی قت بۊ بارت دؽوۉداری، TCP، UDP و QUIC ن ای لم سفارشی کۊنین. منپیزا TCP (تلایه منجا 1-1024) منپیزا XUDP (تلایه منجا 1-1024) - دؽوۉداری QUIC من تۊنل mux + دؽوۉداری QUIC من تونل mux رڌ کردن موجاز @@ -165,40 +161,37 @@ ر وندن Sniffing دامنه sniff ن ز کتن امتهۉݩ کۊنین (پؽش فرز رۊشن) ر وندن routeOnly - ز نوم دامنه sniffed تینا سی تور جوستن استفاڌه کۊنین وو نشۊوی مۉرد نزرن و عونوان نشۊوی IP ووردارین. + ز نوم دامنه sniffed تینا سی تور جوستن استفاڌه کۊنین وو آدرس مورد نزرن و عونوان آدرس IP ووردارین. ر وندن DNS مهلی - درخاستا DNS و هسته و من ایان وو و دست ماژول DNS پردازشت ابۊن (پؽشنهاڌ ابۊ ٱر لنگ تور جوستن سی دور زیڌن نشۊویا LAN وو وولات ٱسلی هڌین فعال بۊ) + DNS پردازشت وابیڌه و دس هسته ماژول DNS (پؽشنهاڌ ابۊ، ٱر نیاز هڌ ک جوستن تور وو ولات ٱسلین دور زنی) ر وندن DNS جئلی - DNS مهلی نشۊویا IP جئلی ن وورگنه (زل تر، ٱما گاشڌ من یقرد ز برنومه یل کار نکونه) + DNS مهلی آدرسا IP جئلی ن وورگنه (زل تر، ٱما گاشڌ من یقرد ز برنومیل کار نکونه) ترجی IPv6 - تورا IPv6 ن فعال کۊنین وو نشۊویا IPv6 ن ترجی بڌین + ترجی داڌن نشۊوی وو تورا IPv6 - ز ر دیر (اختیاری) DNS (udp/tcp/https/quic) (اختیاری) + DNS ز ر دیر (اختیاری) (udp/tcp/https/quic) (اختیاری) DNS VPN DNS (تینا IPv4/v6) - ز شبکه مهلی اگوڌرته؟ VPN - نشۊوی رابت VPN - - منی (اختیاری) DNS + DNS منی (اختیاری) DNS - هاست موستقیم (قالوو: دامنه: نشۊوی،...) DNS - دامنه:نشۊوی،... + DNS هاست موستقیم (قالوو: دامنه: آدرس،...) + دامنه:آدرس،... - نشۊوی اینترنتی آزمایش تئخیر واقعی (http/https) + آدرس اینترنتی آزمایش تئخیر واقعی (http/https) نشۊوی اینترنتی - هشتن منپیزا ز شبکه مهلی - پوی دسگایل ترن وا نشۊوی IP ایسا، ز ر socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز غیر موجاز جلو گری بۊ. - منپیزا ز شبکه مهلی ن موجار کۊنین، موتمعن بۊین ک من ی شبکه قابل ائتماڌ هڌین. + هشتن منپیزا ز LAN + پوی دسگایل ترن وا آدرس IP ایسا، ز ر socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل اعتماد فعال بۊ تا ز منپیز ؛یر موجاز جلو گری بۊ. + منپیزا ز LAN ن موجار کۊنین، موتمعن بۊین ک من ی شبکه قابل ائتماڌ هڌین. اجازه نا ٱمن - مجال و کار بوردن TLS ب تۉر پؽش فرز، موجوز نا ٱمن فعال هڌ. + مجال و کار بردن TLS ب تۉر پؽش فرز، موجوز نا ٱمن فعال هڌ. پورت پروکسی مهلی پورت پروکسی مهلی @@ -207,20 +200,16 @@ پورت DNS مهلی قوۊل کردن پاک کردن کانفیگ - سی پاک وابیڌن فایل کانفیگ نیاز به قوۊل کردن دووارته ز سمت منتور هڌ. + سی پاک وابیڌن فایل کانفیگ نیاز به قوۊل کردن دووارته ز سمت منتور هڌ زی اسکنن ر ون - شؽواتگرن سی اسکن، زی مجال ر وندن بۊگۊشین، ٱندی ترین کودن اسکن کۊنین یا شؽواتی ن منه نوار ٱوزار پسند کۊنین. + شؽواتگرن سی اسکن، زی مجال ر وندن بۊگۊشین، اندی ترین کودن اسکن کۊنین یا شؽواتی ن منه نوار ٱوزار پسند کۊنین. پروکسی HTTP ن و VPN ازاف کۊنین - پروکسی HTTP ن موسقیمن ز (مۊرۊرگر/ی قرد ز برنومه یل لادراری بیڌه)، بؽ استفاڌه ز دسگا NIC مجازی (Android 10+) استفاڌه ابۊ. + پروکسی HTTP ن موسقیمن ز (مۊرۊرگر/ی قرد ز برنومیل لادراری بیڌه)، بؽ استفاڌه ز دسگا NIC مجازی (Android 10+) استفاڌه ابۊ. - ر وندن نشۉݩ داڌن دو سۊتۊنی - نومگه نمایه یل من دو سۊتۊن نشۉݩ داڌه ابۊن وو چینۉ ترین موئتوا بیشتری ن سیل کۊنین. سی ر وستن، وا برنومه ن ز نۊ ر ونین. - - فشناڌن منشڌ - فشناڌن منشڌ یا داسووݩ موشکلا من Github + فشناڌن منشڌ یا داسوو موشکلا من Github ٱووڌن من جرگه تلگرام برنومه تلگرامن نجوست هریم سیخومی @@ -241,9 +230,8 @@ فاسله ورۊ کردن خوتکار (اقلن وا 15 دؽقه بۊ) سئت داسووا - بارت پؽش هل دامنه دری هالت - سی دووسمندیا وو هیاری بیشتر، ری ای هؽل بزݩ + سی هیاری بیشتر ری ای هؽل بزݩ زۉݩ سامووا رابت منتوری سامووا هالت رابت منتوری @@ -259,20 +247,19 @@ سامووا جرگه اشتراک نیشتنا نشۊوی اینترنتی اختیاری - نوم موستعار فیلتر + نیشتنا فیلتر مئمۊلی فعال بیڌن ورۊ کردن فعال بیڌن ورۊ کردن خوتکار - موجاز کردن نشۊوی HTTP نا ٱمن - نوم موستعار پروکسی دیندایی - نوم موستعار پروکسی نیایی - موتمعن بۊ ک نوم موستعار هڌس وو جۊرس نی + نیشتنا پروکسی پؽشی + نیشتنا پروکسی نیایی + نیشتنا هڌسۉݩ وو هرف نارن ورۊ کردن اشتراک جرگه سکویی Tcping کانفیگا جرگه سکویی تئخیر واقعی کانفیگا جرگه سکویی - فایلا بونچک جوقرافیایی - ترتیب و ری نتیجه یل آزمایش + فایلا دارایی جوقرافیایی + ترتیب و ری نتیجیل آزمایش فیلتر کردن کانفیگا - پوی جرگه یل کانفیگ + پوی جرگیل پاک کردن %d کانفیگ تکراری پاک کردن %d کانفیگ @@ -282,7 +269,6 @@ ر وندن خدمات قوۊل - نشقه دامنه سامووا تور جوستن وا کاما ز یک جوڌا ابۊن (،) پسند دامنه یا آی پی @@ -308,7 +294,7 @@ منپیزن واجۊری کوݩ هونی آزمایش ابۊ… %d کانفیگ هونی آزمایش ابۊ... - مووفق بی: منپیز %dms تۊل کشی + مووفق بی: منپیز HTTP %dms تۊل کشی منپیز و اینترنتن نجوست: %s اینترنت من دسرس نؽ کود ختا: #%d @@ -317,18 +303,11 @@ اشتراک وا مووفقیت زفت زابی اشتراک زفت نوابی - سامووا فرگمنت - کتنا فرگمنت - تۊل کتنا فرگمنت (هدقل-هدکسر) - فاسله منجا کتنا فرگمنت (هدقل-هدکسر) - ر وندن فرگمنت - - واجۊری سی ورۊ رسۊوی - سکو نوسخه دیندایی پۊرنیڌه هڌ - نوسخه نۊ ن جوست: %s - سکو ورۊ رسۊوی کۊنین - واجۊری نوسخه یل پؽش ز تیجنیڌن - ورۊ رسۊوی ن هونی واجۊری اکونه... + سامووا Fragment + Fragment Packets + Fragment Length (min-max) + Fragment Interval (min-max) + ر وندن Fragment QRcode @@ -336,14 +315,6 @@ و در کشیڌن پوی کانفیگ من کلیپ بورد - - QRcode - و در کشیڌن من کلیپ بورد - و در کشیڌن پوی کانفیگ من کلیپ بورد - آلشت - پاک کردن - - QRcode و در کشیڌن من کلیپ بورد @@ -367,16 +338,4 @@ نومگه اسبؽڌ ایران - - پؽش فرز کانفیگ - دور زیڌه بۊ - دور زیڌه نبۊ - - - - هل وو فسل مکۊنین - هل وو ٱووردن و میزبووݩ یل دامنه DNS - هل وو جایونی دامنه - - diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index 081571a3..c43f4fd1 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -1,5 +1,6 @@ + v2rayNG تعویض تعویض برای اولین بار از این ویژگی استفاده می‌کنید، لطفا از برنامه برای افزودن سرور استفاده کنید @@ -7,7 +8,6 @@ بستن منو کشویی موفقیت در انتقال داده انتقال داده انجام نشد! - لطفاً برای تازه کردن، پایین بکشید! توقف @@ -26,7 +26,6 @@ حذف کانفیگ کانفیگ را از QRcode وارد کنید کانفیگ را از کلیپ ‌بورد وارد کنید - کانفیگ را از محلی وارد کنید تایپ دستی[VMESS] تایپ دستی[VLESS] تایپ دستی[SHADOWSOCKS] @@ -35,37 +34,42 @@ تایپ دستی[TROJAN] ‌تایپ دستی[WIREGUARD] تایپ دستی[HYSTERIA2] + کانفیگ سفارشی + کانفیگ سفارشی را از کلیپ ‌بورد وارد کنید + کانفیگ سفارشی را به صورت محلی وارد کنید + کانفیگ سفارشی را از طریق نشانی اینترنتی وارد کنید + نشانی اینترنتی اسکن کانفیگ سفارشی را وارد کنید حذف شود؟ - لطفا قبل از حذف کانفیگ نامعتبر بررسی کنید! حذف کانفیگ را تایید می کنید؟ + لطفا قبل از حذف کانفیگ نامعتبر تایید کنید! حذف کانفیگ را تایید می کنید؟ ملاحظات نشانی پورت شناسه - شناسه جایگزین + alterId امنیت شبکه انتقال - نوع سربرگ - حالت gRPC - هاست - هاست HTTP - هاست WS - هاست HTTPUpgrade - هاست XHTTP - هاست H2 + نوع HEAD + حالت GRPC + HOST + HTTP HOST + WS HOST + HTTPUPGRADE HOST + XHTTP HOST + H2 HOST QUIC security - gRPC Authority - مسیر - مسیر WS - مسیر HTTPUpgrade - مسیر XHTTP - مسیر H2 - مسیر QUIC - KCP seed - gRPC ServiceName + GRPC Authority + PATH + WS PATH + HTTPUPGRADE PATH + XHTTP PATH + H2 PATH + QUIC key + KCP SEED + GRPC SERVICENAME TLS اثرانگشت - Alpn + AlPN اعطای مجوز ناامن SNI نشانی @@ -78,12 +82,12 @@ جریان کلید عمومی کلید رمزگذاری اضافی (اختیاری) - ShortID - SpiderX + SHORTID + SPIDERX کلید خصوصی - Reserved (اختیاری، جدا شده با کاما) - آدرس محلی (IPv4/IPv6 اختیاری، جدا شده با کاما) - MTU (اختیاری، پیش‌فرض 1420) + Reserved (اختیاری) + آدرس محلی IPV4(اختیاری) + MTU (اختیاری، پیش فرض: 1420) با موفقیت انجام شد شکست هیچ داده ای وجود ندارد @@ -96,51 +100,43 @@ محتوا هیچ داده‌ ای در کلیپ ‌بورد وجود ندارد نشانی اینترنتی معتبر نیست - لطفاً از آدرس های اشتراک پروتکل HTTP ناامن استفاده نکنید + لطفاً از آدرس اشتراک پروتکل HTTP ناامن استفاده نکنید اطمینان حاصل کنید که پورت ورودی با تنظیمات مطابقت دارد کانفیگ درست نیست - هاست (SNI) (اختیاری) - این عمل ممنوع است - رمز عبور obfs - پورت پرش (درگاه سرور را بازنویسی می کند) - فاصله پورت پرش (ثانیه) - pinSHA256 - کاهش پهنای باند (واحد) - افزایش پهنای باند (واحد) - حالت XHTTP - خام JSON XHTTP Extra، قالب: { XHTTPObject } - - + میزبان (SNI) (اختیاری) کپی فایل انجام نشد، لطفا از برنامه مدیریت فایل استفاده کنید افزودن فایل ‌ها اسکن QRcode URL دانلود فایل‌ ها + این عمل ممنوع است + رمز عبور OBFS + پورت پرش (درگاه سرور را بازنویسی می کند) + فاصله پورت پرش (ثانیه) + PINSHA256 + حالت XHTTP + خام JSON XHTTP Extra، قالب: { XHTTPObject } + + آدرس اینترنتی را اضافه کنید فایل پیدا نشد نام قبلاً وجود دارد - منبع فایل های جغرافیایی (اختیاری) - - بارگذاری جستجو انتخاب همه کلیدواژه‌ ها را وارد کنید - حالت دور زدن + حالت Bypass انتخاب خودکار پروکسی برنامه در حال دانلود محتوا خروجی گرفتن در کلیپ‌ بورد وارد کردن از کلیپ‌ بورد - تنظیمات به تفکیک برنامه - فعال کردن به تفکیک برنامه تنظیمات تنظیمات پیشرفته - تنظیمات هسته تنظیمات VPN پروکسی به تفکیک برنامه - عمومی: برنامه انتخاب شده از طریق یک پروکسی متصل می شود، برنامه انتخاب نشده مستقیماً متصل می شود. \nحالت دور زدن: برنامه انتخاب شده مستقیماً متصل می شود، برنامه انتخاب نشده از طریق یک پروکسی متصل می شود. \nانتخاب خودکار برنامه های پراکسی در منو امکان پذیر است. + عمومی: برنامه بررسی شده پروکسی است، اتصال مستقیم بدون بررسی است. \nحالت bypass: برنامه بررسی شده مستقیما متصل است، پراکسی بررسی نشده است. \nگزینه‌ای برای انتخاب خودکار پروکسی برنامه در منو است. اتصال خودکار هنگام راه اندازی هنگام راه اندازی به طور خودکار به سرور انتخابی متصل می شود که ممکن است ناموفق باشد. @@ -157,12 +153,12 @@ فعال کردن نمایش سرعت - نمایش سرعت فعلی در قسمت اعلان. \nآیکون اعلان بر اساس استفاده تغییر می‌کند. + نمایش سرعت فعلی در قسمت آگاه‌سازی. \nآیکون آگاه‌سازی بر اساس استفاده تغییر می‌کند. - فعال کردن تجزیه و تحلیل بسته ها (Sniffing) - استفاده از تشخیص نام دامنه (Sniff) در بسته ها (به طور پیش فرض فعال است) - فعال کردن دامنه فقط مسیر یابی (RouteOnly) - از نام دامنه (Snnifed) فقط برای مسیریابی استفاده کنید و آدرس مقصد را به عنوان IP ذخیره کنید. + فعال کردن SNIFFING + دامنه SNIFF را از بسته امتحان کنید (پیش‌فرض روشن) + فعال کردن ROUTEONLY + از نام دامنه SNIFFED فقط برای مسیریابی استفاده کنید و آدرس مورد نظر را به عنوان آدرس IP نگه دارید. فعال کردن DNS محلی @@ -172,28 +168,25 @@ دی ان اس محلی آدرس های آیپی جعلی را بر می گرداند (سریع تر می باشد و تاخیر را کاهش می دهد اما ممکن است برای برخی از برنامه ها کار نکند) ترجیح دادن IPV6 - مسیرهای IPv6 را فعال کنید و آدرس‌های IPv6 را ترجیح دهید + ترجیح دادن نشانی و مسیر های IPv6 DNS از راه دور (اختیاری) (udp/tcp/https/quic) DNS VPN DNS (فقط IPv4/v6) - آیا VPN از شبکه محلی عبور می کند؟ - - VPN Interface Address DNS داخلی (اختیاری) DNS - DNS مستقیم هاست (فرمت: دامنه:آدرس،…) - دامنه:آدرس،… + DNS مستقیم هاست(فرمت: دامنه: آدرس،…) + دامنه: آدرس، … آدرس اینترنتی آزمایش تاخیر واقعی کانفیگ ها (HTTP/HTTPS) URL - اجازه اتصالات از طریق شبکه محلی - سایر دستگاه ها می توانند با استفاده از آدرس آیپی شما برای استفاده از یک پروکسی محلی متصل شوند. فقط در یک شبکه قابل اعتماد برای جلوگیری از اتصالات غیرمجاز استفاده کنید. - اتصالات از طریق شبکه محلی را مجاز کنید، مطمئن شوید که در یک شبکه قابل اعتماد هستید. + اجازه اتصالات از طریق LAN + سایر دستگاه‌ها می‌توانند با آدرس آی‌پی شما از طریق پراکسی محلی به پروکسی متصل شوند، فقط در شبکه قابل اعتماد فعال شود تا از اتصال غیرمجاز جلوگیری شود. + اتصالات از طریق LAN را مجاز کنید، مطمئن شوید که در یک شبکه قابل اعتماد هستید اعطای مجوز ناامن هنگام استفاده از TLS، به طور پیش‌ فرض مجوز ناامن فعال است. @@ -213,10 +206,6 @@ پروکسی HTTP را به VPN اضافه کنید پروکسی HTTP مستقیماً از (مرورگر/برخی برنامه‌های پشتیبانی‌شده)، بدون استفاده از دستگاه NIC مجازی (Android 10+) استفاده می‌شود. - فعال کردن نمایش دو ستون - لیست نمایه در دو ستون نمایش داده می شود و امکان نمایش محتوای بیشتری را بر روی صفحه نمایش می دهد. برای اجرا باید برنامه را مجددا راه اندازی کنید. - - بازخورد بازخورد یا گزارش اشکالات در گیت‌ هاب عضویت در گروه تلگرام @@ -238,11 +227,10 @@ اشتراک های خود را به طور خودکار با فاصله زمانی در پس زمینه به روز کنید. بسته به دستگاه، این ویژگی ممکن است همیشه کار نکند. فاصله به‌ روزرسانی خودکار ( حداقل مقدار ، 15 دقیقه ) سطح گزارشات - Outbound domain pre-resolve method حالت - برای اطلاعات و راهنمایی بیشتر، روی این متن کلیک کنید + برای راهنمایی بیشتر روی این متن، کلیک کنید زبان - تنظیمات رابط کاربری + تنظیمات رابط کاربری تنظیمات حالت رابط کاربری گزارشات @@ -256,17 +244,16 @@ تنظیمات گروه‌ اشتراک ملاحظات نشانی اینترنتی اختیاری - نام مستعار فیلتر + REMARKS REGULAR FILTER فعال کردن به‌روزرسانی فعال سازی به‌روزرسانی خودکار - مجاز کردن آدرس HTTP ناامن - نام مستعار پروکسی قبلی - نام مستعار پروکسی بعدی - لطفاً مطمئن شوید که نام مستعار وجود دارد و منحصر به فرد است + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique به‌روزرسانی گروه فعلی اشتراک TCPING کانفیگ های گروه فعلی تاخیر واقعی کانفیگ های گروه فعلی - فایل های منبع جغرافیایی + فایل ‌های دارایی جغرافیا مرتب‌ سازی بر اساس نتایج آزمایش فیلتر کردن کانفیگ‌ها همه گروه‌های اشتراک @@ -279,7 +266,6 @@ شروع خدمات تایید - استراتژی دامنه تنظیمات مسیریابی با کاما (،) از هم جدا شوند، ذخیره کردن فراموش نشود @@ -305,7 +291,7 @@ اتصال را بررسی کنید در حال آزمایش... تست کردن %d کانفیگ… - موفقیت: اتصال %dms طول کشید + موفقیت: اتصال HTTP %dms طول کشید اتصال به اینترنت شناسایی نشد: %s اینترنت در دسترس نیست کد خطا: #%d @@ -319,28 +305,12 @@ طول بسته های فرگمنت (حداقل-حداکثر) فاصله بین بسته های فرگمنت (حداقل-حداکثر) فعال کردن فرگمنت - - بررسی به روز رسانی - در حال حاضر آخرین نسخه نصب شده است - نسخه جدید پیدا شد: %s - اکنون به روز رسانی کنید - بررسی نسخه پیش از انتشار - در حال بررسی برای به‌روزرسانی… - QRcode خروجی گرفتن در کلیپ‌ بورد خروجی گرفتن کانفیگ کامل در کلیپ بورد - - QRcode - صادر کردن به کلیپ بورد - صادر کردن پیکربندی کامل به کلیپ بورد - ویرایش کردن - حذف کردن - - QRcode خروجی گرفتن در کلیپ‌ بورد @@ -360,22 +330,10 @@ - لیست سفید چین ( دور زدن سرزمین اصلی ) + لیست سفید چین لیست سیاه چین جهانی(GLOBAL) ایران - - پیش فرض کانفیگ - دور زده شود - دور زده نشود - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - - diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml index ff1c835f..35b55f82 100644 --- a/V2rayNG/app/src/main/res/values-night/colors.xml +++ b/V2rayNG/app/src/main/res/values-night/colors.xml @@ -3,7 +3,6 @@ #f97910 #646464 #BDBDBD - #424242 #212121 #FFFFFF diff --git a/V2rayNG/app/src/main/res/values-night/themes.xml b/V2rayNG/app/src/main/res/values-night/themes.xml index d24634ef..828ffe7c 100644 --- a/V2rayNG/app/src/main/res/values-night/themes.xml +++ b/V2rayNG/app/src/main/res/values-night/themes.xml @@ -3,10 +3,9 @@ diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index c71054a0..e98eec4c 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -7,7 +7,6 @@ Закрыть панель навигации Успешный перенос данных! Перенос данных не выполнен! - Потяните вниз для обновления! Остановить @@ -26,7 +25,6 @@ Удалить профиль Импорт из QR-кода Импорт из буфера обмена - Импорт из файла Ручной ввод VMess Ручной ввод VLESS Ручной ввод Shadowsocks @@ -35,6 +33,11 @@ Ручной ввод Trojan Ручной ввод WireGuard Ручной ввод Hysteria2 + Другой профиль + Импорт из буфера обмена + Импорт из файла + Импорт из URL + Импорт сканированием URL Подтверждаете удаление? Выполните проверку перед удалением! Подтверждаете удаление? Название @@ -100,17 +103,6 @@ Убедитесь, что входящий порт соответствует настройкам Профиль повреждён Узел (SNI) (необязательно) - Это действие запрещено - Пароль obfs - Смена портов (переопределяет порт) - Интервал смены портов - pinSHA256 - Входящая пропускная способность (единицы) - Исходящая пропускная способность (единицы) - Режим XHTTP - Необработанный JSON XHTTP Extra, формат: { XHTTPObject } - - Невозможно скопировать файл, используйте файловый менеджер Добавить ресурс Добавить файлы @@ -121,7 +113,13 @@ Добавить URL ресурса Файл не найден Название уже существует - Источник геофайлов (необязательно) + Это действие запрещено + Пароль obfs + Смена портов (переопределяет порт) + Интервал смены портов + pinSHA256 + Режим XHTTP + Необработанный JSON XHTTP Extra, формат: { XHTTPObject } Загрузка… @@ -129,20 +127,18 @@ Выбрать все Введите ключевые слова Режим обхода - Автовыбор приложений + Автовыбор проксируемых приложений Загрузка данных Экспорт в буфер обмена Импорт из буфера обмена - Выбор приложений - Использовать выбор приложений + Настройки Расширенные настройки - Настройки ядра Настройки VPN Прокси для выбранных приложений - Основной: выбранное приложение соединяется через прокси, не выбранное — напрямую;\nРежим обхода: выбранное приложение соединяется напрямую, не выбранное — через прокси.\nЕсть возможность автоматического выбора проксируемых приложений в меню. + Основной: выделенное приложение соединяется через прокси, не выделенное — напрямую;\nРежим обхода: выделенное приложение соединяется напрямую, не выделенное — через прокси.\nЕсть возможность автоматического выбора проксируемых приложений в меню. Автоподключение при запуске Автоматически подключаться к выбранному серверу при запуске приложения (может оказаться неудачным) @@ -170,18 +166,15 @@ Обслуживание выполняется DNS-модулем ядра (в настройках маршрутизации рекомендуется выбрать режим «Все, кроме LAN и Китая») Использовать поддельную DNS - Локальная DNS возвращает поддельные IP-адреса (быстрее, но может не работать с некоторыми приложениями) + Локальная DNS возвращает поддельный IP-адрес (быстрее, но может не работать с некоторыми приложениями) Предпочитать IPv6 - Использовать маршрутизацию IPv6 предпочитать IPv6-адреса + Предпочитать IPv6-адреса и маршрутизацию Удалённая DNS (UDP/TCP/HTTPS/QUIC) (необязательно) DNS VPN DNS (только IPv4/v6) - VPN пропускает LAN - - VPN частный IP Внутренняя DNS (необязательно) DNS @@ -214,10 +207,6 @@ Дополнительный HTTP-прокси HTTP-прокси будет использоваться напрямую (из браузера и других поддерживающих приложений), минуя виртуальный сетевой адаптер (Android 10+) - Отображение в два столбца - Список профилей выводится в виде двух столбцов, что позволяет показать больше информации на экране. Требуется перезапуск приложения. - - Обратная связь Предложить улучшение или сообщить об ошибке на GitHub Присоединиться к группе в Telegram @@ -240,7 +229,6 @@ Интервал автообновления (минут, не менее 15) Подробность ведения журнала - Outbound domain pre-resolve method Режим Нажмите для получения дополнительной информации Язык @@ -261,14 +249,13 @@ Название фильтра Использовать обновление Использовать автообновление - Разрешать незащищённые HTTP-адреса - Предыдущая конфигурация прокси - Следующая конфигурация прокси - Конфигурация должна быть уникальной + Название предыдущего прокси + Название следующего прокси + Название должно существовать и быть уникальным Обновить подписку группы Проверка профилей группы Время отклика профилей группы - Файлы ресурсов + Файлы георесурсов Сортировка по результатам теста Фильтр групп Все группы @@ -281,7 +268,6 @@ Запуск службы Подтвердить - Доменная стратегия Маршрутизация Введите требуемые домены/IP через запятую @@ -306,8 +292,8 @@ Проверить подключение Проверка… - Проверка профилей (%d) - Успешно: соединение заняло %d мс + Проверка профилей: %d + Успешно: HTTP-соединение заняло %d мс Сбой проверки интернет-соединения: %s Интернет недоступен Код ошибки: #%d @@ -322,27 +308,12 @@ Интервал фрагментов (от - до) Использовать фрагментирование - Проверить обновление - Установлена последняя версия - Найдена новая версия: %s - Обновить - Искать предварительный выпуск - Проверка обновления… - QR-код Экспорт в буфер обмена Экспорт всей конфигурации в буфер обмена - - QR-код - Экспорт в буфер обмена - Экспорт всей конфигурации в буфер обмена - Изменить - Удалить - - QR-код Экспорт в буфер обмена @@ -366,16 +337,4 @@ Белый список Ирана - - Как в профиле - Пропускает - Не пропускает - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - - diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 86238b79..c7cd80e4 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -7,7 +7,6 @@ Đóng Menu ứng dụng Đã chuyển dữ liệu! Không thể chuyển dữ liệu! - Please pull down to refresh! Ngắt kết nối v2rayNG @@ -26,7 +25,6 @@ Xoá cấu hình Nhập cấu hình từ mã QR Nhập cấu hình từ Clipboard - Import config from locally Nhập thủ công [VMess] Nhập thủ công [VLESS] Nhập thủ công [ShadowSocks] @@ -35,6 +33,11 @@ Nhập thủ công [Trojan] Nhập thủ công [WireGuard] Type manually[Hysteria2] + Nâng cao / Cấu hình tùy chỉnh + Nhập cấu hình tùy chỉnh từ Clipboard + Nhập cấu hình tùy chỉnh từ Tệp + Nhập cấu hình tùy chỉnh từ URL + Nhập cấu hình tùy chỉnh quét URL Xác nhận xóa? Please test before deleting! Confirm delete ? Tên cấu hình @@ -100,28 +103,23 @@ Vui lòng đảm bảo cấu hình tùy chỉnh này không bị lỗi trước khi sử dụng! Cấu hình không hợp lệ! Host (SNI) (Không bắt buộc) - Hành động này bị cấm! - Obfs password - Port Hopping - Port Hopping Interval - pinSHA256 - Bandwidth down (units) - Bandwidth up (units) - XHTTP Mode - XHTTP Extra raw JSON, format: { XHTTPObject } - - Không thể sao chép tệp tin, hãy dùng trình quản lý tệp! Thêm tệp Quét mã QR URL Tải xuống tệp tin + Hành động này bị cấm! + Obfs password + Port Hopping + Port Hopping Interval + pinSHA256 + XHTTP Mode + XHTTP Extra raw JSON, format: { XHTTPObject } + + Thêm URL nội dung Không tìm thấy tập tin! Nhận xét đã tồn tại! - Geo files source (optional) - - Đang tải... Tìm kiếm Chọn tất cả @@ -131,14 +129,11 @@ Đang tải xuống nội dung... Xuất và Sao chép Nhập từ Clipboard - Per-app settings - Enable per-app Cài đặt Cài đặt nâng cao - Cài đặt lõi Cài đặt VPN Proxy theo Ứng dụng - Bình thường: Ứng dụng đã chọn sẽ kết nối thông qua Proxy, chưa chọn sẽ kết nối trực tiếp. \n- Chế độ Bypass: Ứng dụng đã chọn sẽ kết nối trực tiếp, chưa chọn sẽ kết nối qua Proxy. \n- Nếu bạn đang ở Trung Quốc thì vào Menu, chọn Tự động chọn ứng dụng Proxy. @@ -180,9 +175,6 @@ DNS VPN DNS (Chỉ IPv4 / IPv6) - Does VPN bypass LAN - - VPN Interface Address DNS nội địa (Không bắt buộc) DNS @@ -215,10 +207,6 @@ Append HTTP Proxy to VPN HTTP proxy will be used directly from (browser/ some supported apps), without going through the virtual NIC device (Android 10+) - Enable double column display - The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect. - - Phản hồi lỗi Phản hồi cải tiến hoặc lỗi lên GitHub Tham gia nhóm Telegram @@ -241,7 +229,6 @@ Thời gian cập nhật tự động (Phút, giá trị tối thiểu là 15) Cấp độ nhật ký - Outbound domain pre-resolve method Chế độ kết nối Nhấn vào đây nếu bạn cần trợ giúp! Ngôn ngữ @@ -262,14 +249,13 @@ Remarks regular filter Sử dụng gói đăng ký này Bật tự động cập nhật - Allow insecure HTTP address - Previous proxy configuration remarks - Next proxy configuration remarks - The configuration remarks exists and is unique + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique Cập nhật các gói đăng ký Ping tất cả máy chủ Kiểm tra HTTP tất cả máy chủ - Asset files + Tệp Geo Asset Sắp xếp lại theo lần kiểm tra cuối cùng Lọc cấu hình theo các gói đăng ký Hiển thị tất cả các gói đăng ký @@ -282,7 +268,6 @@ Khởi động v2rayNG Xác nhận - Chiến lược tên miền (DomainStrategy) Cài đặt định tuyến Phân cách bằng dấu phẩy (,). Có thể tải xuống Rules mặc định để tham khảo ở menu ba chấm. @@ -310,33 +295,12 @@ Nhập gói đăng ký thành công! Nhập gói đăng ký không thành công! - Fragment Settings - Fragment Packets - Fragment Length (min-max) - Fragment Interval (min-max) - Enable Fragment - - Check for update - Already on the latest version - New version found: %s - Update now - Check Pre-release - Checking for update… - Xuất ra mã QR (Chụp màn hình để lưu) Sao chép vào Clipboard Sao chép thành cấu hình tùy chỉnh - - QRcode - Export to clipboard - Export full configuration to clipboard - Edit - Delete - - Xuất gói ra mã QR (Chụp màn hình để lưu) Xuất gói vào Clipboard @@ -354,16 +318,10 @@ Sáng Tối - - Follow config - Bypass - Not Bypass - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - + Fragment Settings + Fragment Packets + Fragment Length (min-max) + Fragment Interval (min-max) + Enable Fragment diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index a8eec856..d0f3df99 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -2,12 +2,11 @@ 开关 开关 - 初次使用此功能请先用 APP 添加配置 + 初次使用此功能请先用APP添加配置 Open navigation drawer Close navigation drawer 数据迁移成功! 数据迁移失败啦! - 请下拉刷新! 停止 @@ -26,28 +25,32 @@ 删除配置 扫描二维码 从剪贴板导入 - 从本地导入 - 手动输入 [VMess] - 手动输入 [VLESS] - 手动输入 [Shadowsocks] - 手动输入 [SOCKS] - 手动输入 [HTTP] - 手动输入 [Trojan] - 手动输入 [Wireguard] - 手动输入 [Hysteria2] + 手动输入[VMess] + 手动输入[VLESS] + 手动输入[Shadowsocks] + 手动输入[SOCKS] + 手动输入[HTTP] + 手动输入[Trojan] + 手动输入[Wireguard] + 手动输入[Hysteria2] + 自定义配置 + 从剪贴板导入自定义配置 + 从本地导入自定义配置 + 剪贴板URL导入自定义配置 + 扫描URL导入自定义配置 确认删除？ 删除前请先测试！确认删除？ - 别名 (remarks) - 地址 (address) - 端口 (port) - 用户 ID (id) - 额外 ID (alterId) - 加密方式 (security) - 传输协议 (network) - 底层传输方式 (transport) - 伪装类型 (type) - gRPC 传输模式 (mode) - 伪装域名 (host) + 别名(remarks) + 地址(address) + 端口(port) + 用户ID(id) + 额外ID(alterId) + 加密方式(security) + 传输协议(network) + 底层传输方式(transport) + 伪装类型(type) + gRPC 传输模式(mode) + 伪装域名(host) http host ws host httpupgrade host @@ -58,32 +61,32 @@ path ws path httpupgrade path - xhttp path + xhttp path h2 path QUIC 加密密钥 kcp seed gRPC serviceName - 传输层安全 (TLS) + 传输层安全(TLS) Fingerprint Alpn - 跳过证书验证 (allowInsecure) + 跳过证书验证(allowInsecure) SNI 服务器地址 服务器端口 密码 加密方式 - 密码 (可选) - 用户名 (可选) - 加密方式 (encryption) - 流控 (flow) + 密码(可选) + 用户名(可选) + 加密方式(encryption) + 流控(flow) PublicKey - PreSharedKey (optional) + PreSharedKey(optional) ShortId SpiderX SecretKey - Reserved (可选，逗号隔开) - 本地地址 (可选 IPv4/IPv6，逗号隔开) - Mtu (可选, 默认 1420) + Reserved(可选，逗号隔开) + 本地地址(可选IPv4/IPv6，逗号隔开) + Mtu(可选, 默认1420) 成功 失败 没有数据 @@ -96,32 +99,27 @@ 内容 剪贴板中没有数据 无效的网址 - 请不要使用不安全的 HTTP 协议订阅地址 - 确保 inbounds port 和设置中的一致 + 请不要使用不安全的HTTP协议订阅地址 + 确保inbounds port和设置中的一致 配置格式错误 - Host (SNI) (可选) - 禁止此项操作 - 混淆密码 - 跳跃端口 (会覆盖服务器端口) - 端口跳跃间隔 (秒) - SHA256 证书指纹 - 带宽下行 (单位) - 带宽上行 (单位) - XHTTP 模式 - XHTTP Extra 原始 JSON，格式： { XHTTPObject } - - + Host(SNI)(可选) 失败, 请使用文件管理器 添加文件 扫描 QRcode URL 下载文件 + 禁止此项操作 + 混淆密码 + 跳跃端口(会覆盖服务器端口) + 端口跳跃间隔(秒) + SHA256证书指纹 + XHTTP 模式 + XHTTP Extra 原始 JSON，格式： { XHTTPObject } + + 添加资产网址 文件未找到 备注已经存在 - Geo 文件来源 (可选) - - 正在加载 搜索 全选 @@ -131,16 +129,13 @@ 正在下载内容 导出至剪贴板 从剪贴板导入 - 分应用设置 - 启用分应用 设置 进阶设置 - 核心设置 VPN 设置 - 分应用 - 常规: 勾选的 App 被代理, 未勾选的直连;\n绕行模式: 勾选的 App 直连, 未勾选的被代理.\n不明白者在菜单中选择自动选中需代理应用 + 分应用代理 + 常规:勾选的App被代理,未勾选的直连;\n绕行模式:勾选的App直连,未勾选的被代理.\n不明白者在菜单中选择自动选中需代理应用 开机时自动连接 开机时自动连接选择的服务器，可能会不成功 @@ -164,44 +159,41 @@ 启用 routeOnly 将嗅探得到的域名仅用于路由，代理目标地址仍为 IP - 启用本地 DNS + 启用本地DNS DNS 请求导入 core 由 DNS 模块处理（推荐启用 如果需要路由绕过局域网及大陆地址) - 启用虚拟 DNS + 启用虚拟DNS 本地返回虚构解析结果 (减低延时 但个别应用可能无法使用) - IPv6 优先 - App 优先使用 IPv6 地址连接服务器, 同时开启 VPN 的 IPv6 路由 + IPv6优先 + App优先使用IPv6地址连接服务器,同时开启VPN的IPv6路由 - 远程 DNS (udp/tcp/https/quic)(可选) + 远程DNS (udp/tcp/https/quic)(可选) DNS VPN DNS (仅支持 IPv4/v6) - VPN 是否绕过局域网 - VPN 接口地址 - - 境内 DNS (可选) + 境内DNS (可选) DNS - DNS hosts (格式: 域名: 地址,…) - domain: address,… + DNS hosts (格式: 域名:地址,…) + domain:address,… 真连接延迟测试网址 (http/https) Url 允许来自局域网的连接 - 其他设备可以使用 socks/http 协议通过您的 IP 地址连接到代理, 仅在受信任的网络中启用以避免未经授权的连接 + 其他设备可以使用socks/http协议通过您的IP地址连接到代理,仅在受信任的网络中启用以避免未经授权的连接 允许来自局域网的连接，请确保处于受信网络 - 跳过证书验证 (allowInsecure) - 传输层安全选 tls 时，默认跳过证书验证 (allowInsecure) + 跳过证书验证(allowInsecure) + 传输层安全选tls时，默认跳过证书验证(allowInsecure) 本地代理端口 本地代理端口 - 本地 DNS 端口 - 本地 DNS 端口 + 本地DNS端口 + 本地DNS端口 删除配置文件确认 删除配置文件是否需要用户二次确认 @@ -212,33 +204,28 @@ 追加 HTTP 代理至 VPN 浏览器 / 一些支持的应用 将直接使用 HTTP 代理, 而不经过虚拟网卡设备 (Android 10+) - 启用双列显示 - 配置文件列表以双列显示，允许在屏幕上显示更多内容。需要重启应用生效。 - - 反馈 反馈改进或漏洞至 GitHub - 加入 Telegram Group - 未找到 Telegram app + 加入Telegram Group + 未找到Telegram app 隐私权政策 关于 源代码 Open Source licenses Telegram 频道 备份配置 - 存储位置: [%s], 卸载 App 或清除存储后备份将被清除 + 存储位置: [%s], 卸载App或清除存储后备份将被清除 还原配置 分享配置 推广 - 一些推广, 点击查看详情 (捐赠可去除) + 一些推广,点击查看详情(捐赠可去除) 自动更新订阅 在后台按一定时间间隔自动更新您的订阅。受设备影响，此功能不一定总是有效 - 自动更新间隔（分钟，最小值 15） + 自动更新间隔（分钟，最小值15） 日志级别 - Outbound 域名预解析方式 模式 点此查看更多帮助 语言 @@ -255,18 +242,17 @@ 导出当前组配置至剪贴板 订阅分组设置 备注 - 可选地址 (url) + 可选地址(url) 别名正则过滤 启用更新 启用自动更新 - 允许不安全的 HTTP 地址 - 前置代理配置文件别名 - 落地代理配置文件別名 - 请确保配置文件别名存在并唯一 + 前置代理别名 + 落地代理別名 + 请确保别名存在并唯一 更新当前组订阅 - 测试当前组配置 Tcping + 测试当前组配置Tcping 测试当前组配置真连接 - 资源文件 + Geo 资源文件 按测试结果排序 过滤配置文件 所有分组 @@ -279,10 +265,9 @@ 启动服务 确定 - 域名策略 路由设置 - 用逗号(,)隔开, domain 和 ip 二选一填写 + 用逗号(,)隔开,domain和ip二选一填写 保存 清空 路由规则设置 @@ -308,33 +293,18 @@ 导入订阅失败 添加 添加链接 - 分片（Fragment）设置 + 分片（Fragment） 设置 分片方式 - 分片包长（最小 - 最大） - 分片间隔（最小 - 最大） + 分片包长（最小-最大） + 分片间隔（最小-最大） 启用分片（Fragment） - 检查更新 - 目前已是最新版本 - 发现新版本: %s - 立即更新 - 检查 Pre-release - 正在检查更新中… - 二维码 导出至剪贴板 导出完整配置至剪贴板 - - 二维码 - 导出至剪贴板 - 导出完整配置至剪贴板 - 编辑 - 删除 - - 二维码 导出至剪贴板 @@ -352,22 +322,10 @@ - 绕过大陆 (Whitelist) - 黑名单 (Blacklist) - 全局 (Global) - 伊朗 (Iran) - - - - 跟随配置文件 - 绕过 - 不绕过 - - - - 不解析 - 解析后添加至 DNS Hosts - 解析后替换原域名 + 绕过大陆(Whitelist) + 黑名单(Blacklist) + 全局(Global) + 伊朗(Iran) diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index f8b938c5..b4305157 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -7,7 +7,6 @@ 關閉導覽匣 資料遷移成功！ 資料遷移失敗！ - 請下拉刷新! 停止 @@ -19,14 +18,13 @@ 啟動服務成功 啟動服務失敗 - + 設定檔 新增設定 儲存設定 刪除設定 從 QR Code 匯入設定 從剪貼簿匯入設定 - 從本地匯入 手動鍵入 [VMess] 手動鍵入 [VLESS] 手動鍵入 [Shadowsocks] @@ -35,6 +33,11 @@ 手動鍵入 [Trojan] 手動鍵入 [Wireguard] 手動鍵入 [Hysteria2] + 自訂設定 + 從剪貼簿匯入自訂設定 + 從本地匯入自訂設定 + 從 URL 匯入自訂設定 + 掃描 URL 匯入自訂設定 確定刪除？ 刪除前請先測試！確認刪除？ 備註 @@ -58,7 +61,7 @@ path ws path httpupgrade path - xhttp path + xhttp path h2 path QUIC 加密金鑰 kcp seed @@ -77,13 +80,13 @@ 加密 (encryption) 流程 (flow) PublicKey - PreSharedKey (optional) + PreSharedKey(optional) ShortId SpiderX SecretKey Reserved (可選，逗號隔開) - 本機位址 (可選 IPv4/IPv6，逗號隔開) - MTU (可選, 預設 1420) + 本機位址(可選IPv4/IPv6，逗號隔開) + MTU(可選, 預設1420) 成功 失敗 無資料 @@ -96,32 +99,27 @@ 內容 剪貼簿內無資料 URL 無效 - 請不要使用不安全的 HTTP 協定訂閱位址 + 請不要使用不安全的HTTP協定訂閱位址 ​​確保 inbounds port 和設定中的一致 設定格式不正確 - Host (SNI) (可選) - 禁止此項操作 - 混淆密碼 - 跳躍連接埠 (會覆蓋伺服器連接埠) - 連接埠跳躍間隔 (秒) - SHA256 憑證指紋 - 頻寬下行 (單位) - 頻寬上行 (單位) - XHTTP 模式 - XHTTP Extra 原始 JSON，格式： { XHTTPObject } - - + Host(SNI)(可選) 失敗，請使用檔案總管 新增檔案 掃描 QRcode URL 下載檔案 + 禁止此項操作 + 混淆密碼 + 跳躍連接埠(會覆蓋伺服器連接埠) + 連接埠跳躍間隔(秒) + SHA256憑證指紋 + XHTTP 模式 + XHTTP Extra 原始 JSON，格式： { XHTTPObject } + + 新增資產網址 文件未找到 備註已經存在 - Geo 檔案來源 (可選) - - 載入 搜尋 全選 @@ -131,14 +129,11 @@ 正在下載內容 匯出至剪貼簿 從剪貼簿匯入 - Per-app settings - Enable per-app 設定 進階 - 核心設定 VPN 設定 Proxy 個別應用程式 常規：勾選的 App 啟用 Proxy，未勾選的直接連線；\n繞行模式：勾選的 App 直接連線，未勾選的啟用 Proxy。\n可在選單中選擇自動選中需 Proxy 應用 @@ -167,24 +162,19 @@ 啟用本機 DNS - DNS 請求匯入 core 由 DNS 模組處理 (建議啟用，如果需要轉送略過區域網路及中國大陸) + DNS 請求匯入 core 由 DNS 模塊處理 (建議啟用，如果需要轉送略過區域網路及中國大陸) 啟用假 DNS 本機退回假解析結果 (減低延時，但個別應用可能無法使用) IPv6 偏好 - App 優先使用 IPv6 位址連線伺服器，同時開啟 VPN 的 IPv6 路由 + App 優先使用 IPv6 位址連線伺服器，同时開啟 VPN 的 IPv6 路由 - 遠端 DNS (udp/tcp/https/quic)(可選) + 遠端DNS (udp/tcp/https/quic)(可選) DNS VPN DNS (僅支援 IPv4/v6) - VPN 是否繞過區域網 - VPN 介面位址 - - DNS - 境内 DNS (可选) DNS hosts (格式: 網域:位址,…) domain:address,… @@ -213,10 +203,6 @@ 追加 HTTP 代理至 VPN 瀏覽器 / 一些支援的應用 將直接使用 HTTP 代理, 而不經過虛擬網卡設備 (Android 10+) - 啟用雙列顯示 - 設定檔清單以雙列顯示，允許在螢幕上顯示更多內容。需要重啟應用生效。 - - 意見回饋 前往 GitHub 回報錯誤 加入 Telegram 群組 @@ -236,15 +222,14 @@ 自動更新訂閱 在後台以一定時間間隔自動更新您的訂閱。受設備影響，此功能不一定總是有效 - 自動更新間隔（分鐘，最小值 15） + 自動更新間隔（分鐘，最小值15） 記錄層級 - Outbound 網域預解析方式 模式 輕觸以檢視說明 語言 介面顏色設定 - 介面顯示模式 + UI mode settings Logcat 複製 @@ -260,26 +245,25 @@ 別名正規過濾 啟用更新 啟用自動更新 - 允許不安全的 HTTP 位址 - 前置代理設定檔别名 - 落地代理設定檔別名 - 请确保設定檔别名存在并唯一 + 前置代理别名 + 落地代理別名 + 请确保别名存在并唯一 更新目前群組訂閱 偵測目前群組設定 Tcping 偵測目前群組設定真延遲 - 資源檔案 + Geo 資源檔案 依偵測結果排序 過濾設定 所有分組 - 刪除 %d 個重複配置 - 刪除 %d 個配置 - 匯入 %d 個配置 - 匯出 %d 個配置 - 更新 %d 個配置 + 删除 %d 个重复配置 + + 删除 %d 个配置 + 导入 %d 个配置 + 导出 %d 个配置 + 更新 %d 个配置 啟動服務 確定 - 網域策略 轉送設定 以半形逗號「,」分隔,domain和ip二選一填寫 @@ -296,7 +280,7 @@ "測試連線能力" "測試中……" - 測試 %d 個配置中… + 測試 %d 个配置中… "成功：%d ms延遲" "測試網際網路連線失敗：%s" "無法使用網際網路" @@ -306,35 +290,20 @@ 匯入訂閱成功 匯入訂閱失敗 - 新增資源 - 新增連結 + 添加 + 添加連結 分片（Fragment） 設定 分片方式 分片包長（最小-最大） 分片間隔（最小-最大） 啟用分片（Fragment） - 檢查更新 - 当前已是最新版本 - 發現新版本: %s - 立即更新 - 檢查 Pre-release - 正在檢查更新中… - QR Code 匯出至剪貼簿 匯出完整設定至剪貼簿 - - QR Code - 匯出至剪貼簿 - 匯出完整設定至剪貼簿 - 編輯 - 刪除 - - QR Code 匯出至剪貼簿 @@ -352,22 +321,10 @@ - 繞過大陸 (Whitelist) - 黑名單 (Blacklist) - 全域 (Global) - 伊朗 (Iran) - - - - 跟隨設定檔 - 繞過 - 不繞過 - - - - 不解析 - 解析後加入 DNS Hosts - 解析後替換原網域名稱 + 繞過大陸(Whitelist) + 黑名單(Blacklist) + 全域(Global) + 伊朗(Iran) diff --git a/V2rayNG/app/src/main/res/values/arrays.xml b/V2rayNG/app/src/main/res/values/arrays.xml index 27f0846e..addd526e 100644 --- a/V2rayNG/app/src/main/res/values/arrays.xml +++ b/V2rayNG/app/src/main/res/values/arrays.xml @@ -43,7 +43,6 @@ wechat-video dtls wireguard - dns @@ -124,6 +123,43 @@ xtls-rprx-vision-udp443 + + + + 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 + + + auto English @@ -175,37 +211,4 @@ stream-up stream-one - - - 0 - 1 - 2 - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - - - - 10.10.14.x - 10.1.0.x - 10.0.0.x - 172.31.0.x - 172.20.0.x - 172.16.0.x - 192.168.100.x - - - - 0 - 1 - 2 - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index 8e328f84..4d6f262c 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -7,7 +7,6 @@ #f97910 #9C9C9C #727272 - #E0E0E0 #F5F5F5 #000000 diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml index 9de2f26f..84a8a180 100644 --- a/V2rayNG/app/src/main/res/values/dimens.xml +++ b/V2rayNG/app/src/main/res/values/dimens.xml @@ -1,11 +1,21 @@ - 4dp - 8dp - 16dp - 24dp - 36dp - 48dp - 64dp - 160dp + 50dp + 16dp + 16dp + 8dp + 50dp + 24dp + 72dp + 90dp + 60dp + 16dp + 16dp + 16dp + 3dp + + 16dp + 16dp + 8dp + 160dp diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 57106306..7f0ca85c 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -8,13 +8,12 @@ Close navigation drawer Data migration success! Data migration failed! - Please pull down to refresh! Stop Unable to obtain the permission Unable to obtain the notification permission - Click for more + click for more Start Services Stop Services Start Services Success @@ -27,7 +26,6 @@ Delete config Import config from QRcode Import config from Clipboard - Import config from locally Type manually[VMess] Type manually[VLESS] Type manually[Shadowsocks] @@ -36,6 +34,11 @@ Type manually[Trojan] Type manually[Wireguard] Type manually[Hysteria2] + Custom config + Import custom config from Clipboard + Import custom config from locally + Import custom config from URL + Import custom config scan URL Confirm delete ? Please test before deleting! Confirm delete ? remarks @@ -59,7 +62,7 @@ path ws path httpupgrade path - xhttp path + xhttp path h2 path QUIC key kcp seed @@ -101,17 +104,6 @@ Ensure inbounds port is consistent with the settings Config malformed Host(SNI)(Optional) - Action not allowed - Obfs password - Port Hopping(will override the port) - Port Hopping Interval - pinSHA256 - Bandwidth down (units) - Bandwidth up (units) - XHTTP Mode - XHTTP Extra raw JSON, format: { XHTTPObject } - - File copy failed, please use File Manager Add asset Add files @@ -122,7 +114,13 @@ Add asset URL File not found The remarks already exists - Geo files source (optional) + Action not allowed + Obfs password + Port Hopping(will override the port) + Port Hopping Interval + pinSHA256 + XHTTP Mode + XHTTP Extra raw JSON, format: { XHTTPObject } Loading @@ -134,22 +132,20 @@ Downloading content Export to Clipboard Import from Clipboard - Per-app settings - Enable per-app + Settings Advanced Settings - Core Settings VPN Settings Per-app proxy - General: Checked apps use proxy, unchecked apps connect directly; \nBypass mode: checked apps connect directly, unchecked apps use proxy. \nThe option to automatically select proxy applications is in the menu + General: Checked App is proxy, unchecked direct connection; \nbypass mode: checked app directly connected, unchecked proxy. \nThe option to automatically select the proxy application in the menu Auto connect at startup Automatically connects to the selected server at startup, which may be unsuccessful Mux Settings Enable Mux - Faster, but it may cause unstable connectivity\nCustomize how to handle TCP, UDP and QUIC below + Faster, but it may cause unstable connectivity\ncustomize how to handle TCP, UDP and QUIC below TCP connections（range -1 to 1024） XUDP connections（range -1 to 1024） Handling of QUIC in mux tunnel @@ -169,21 +165,19 @@ Use the sniffed domain name for routing only, and keep the target address as the IP address. Enable local DNS - DNS processed by core‘s DNS module (Recommended if you need routing bypassing LAN and mainland addresses) + DNS processed by core‘s DNS module (Recommended, if need routing Bypassing LAN and + mainland address) Enable fake DNS - Local DNS returns fake IP addresses (faster, but it may not work for some apps) + local DNS returns fake IP address (faster, but it may not work for some apps) Prefer IPv6 - Enable IPv6 routes and Prefer IPv6 addresses + Prefer IPv6 address and routes Remote DNS (udp/tcp/https/quic)(Optional) DNS VPN DNS (only IPv4/v6) - Does VPN bypass LAN - - VPN Interface Address Domestic DNS (Optional) DNS @@ -195,11 +189,11 @@ Url Allow connections from the LAN - Other devices can connect to proxy by your IP address through local proxy. Only enable in trusted networks to avoid unauthorized connections - Allow connections from the LAN. Make sure you are in a trusted network + Other devices can connect to proxy by your ip address through local proxy, Only enable in trusted network to avoid unauthorized connection + Allow connections from the LAN, Make sure you are in a trusted network allowInsecure - When TLS is selected, allow insecure connections by default + When TLS, the default allowInsecure Local proxy port Local proxy port @@ -216,10 +210,6 @@ Append HTTP Proxy to VPN HTTP proxy will be used directly from (browser/ some supported apps), without going through the virtual NIC device (Android 10+) - Enable double column display - The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect. - - Feedback Feedback enhancements or bugs to GitHub Join Telegram Group @@ -238,11 +228,10 @@ Promotion,click for details(Donation can be removed) Automatic update subscriptions - Update your subscriptions automatically at set intervals in the background. Depending on the device, this feature may not always work + Update your subscriptions automatically with an interval in background. Depending on the device, this feature may not always work Auto Update Interval (Minutes, Min value 15) Log Level - Outbound domain pre-resolve method Mode Click me for more help Language @@ -263,14 +252,13 @@ Remarks regular filter Enable update Enable automatic update - Allow insecure HTTP address - Previous proxy configuration remarks - Next proxy configuration remarks - The configuration remarks exists and is unique + Previous proxy remarks + Next proxy remarks + The remarks exists and is unique Update current group subscription Tcping current group configuration Real delay current group configuration - Asset files + Geo asset files Sorting by test results Filter configuration file All groups @@ -283,10 +271,9 @@ Start Service Confirm - Domain strategy Routing Settings - Separated by commas(,), choose domain or ip + Separated by commas(,),choose domain or ip Save Clear Routing Rule Settings @@ -302,14 +289,14 @@ port protocol [http,tls,bittorrent] - network + network"[udp|tcp]" [udp|tcp] outboundTag Check Connectivity Testing… Testing %d configurations… - Success: Connection took %dms + Success: HTTP connection took %dms Fail to detect internet connection: %s Internet Unavailable Error code: #%d @@ -324,27 +311,12 @@ Fragment Interval (min-max) Enable Fragment - Check for update - Already on the latest version - New version found: %s - Update now - Check Pre-release - Checking for update… - QRcode Export to clipboard Export full configuration to clipboard - - QRcode - Export to clipboard - Export full configuration to clipboard - Edit - Delete - - QRcode Export to clipboard @@ -368,16 +340,4 @@ Iran Whitelist - - Follow config - Bypass - Not Bypass - - - - Do not resolve - Resolve and add to DNS Hosts - Resolve and replace domain - - diff --git a/V2rayNG/app/src/main/res/values/themes.xml b/V2rayNG/app/src/main/res/values/themes.xml index 6ad204c0..d6558e07 100644 --- a/V2rayNG/app/src/main/res/values/themes.xml +++ b/V2rayNG/app/src/main/res/values/themes.xml @@ -2,10 +2,9 @@ diff --git a/V2rayNG/app/src/main/res/xml/app_widget_provider.xml b/V2rayNG/app/src/main/res/xml/app_widget_provider.xml index 877b1385..f457545f 100644 --- a/V2rayNG/app/src/main/res/xml/app_widget_provider.xml +++ b/V2rayNG/app/src/main/res/xml/app_widget_provider.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/xml/network_security_config.xml b/V2rayNG/app/src/main/res/xml/network_security_config.xml deleted file mode 100644 index 24579b10..00000000 --- a/V2rayNG/app/src/main/res/xml/network_security_config.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/V2rayNG/app/src/main/res/xml/pref_settings.xml b/V2rayNG/app/src/main/res/xml/pref_settings.xml index b5ee7aab..f4cd7577 100644 --- a/V2rayNG/app/src/main/res/xml/pref_settings.xml +++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml @@ -19,11 +19,6 @@ android:title="@string/title_pref_is_booted" /> - - - - - - @@ -88,11 +67,6 @@ android:summary="@string/summary_pref_start_scan_immediate" android:title="@string/title_pref_start_scan_immediate" /> - - - + + + + + - - - - - - - - + - - \ No newline at end of file diff --git a/V2rayNG/app/src/test/java/com/v2ray/ang/UtilsTest.kt b/V2rayNG/app/src/test/java/com/v2ray/ang/AngUnitTest.kt similarity index 68% rename from V2rayNG/app/src/test/java/com/v2ray/ang/UtilsTest.kt rename to V2rayNG/app/src/test/java/com/v2ray/ang/AngUnitTest.kt index 77dd53ab..61de199e 100644 --- a/V2rayNG/app/src/test/java/com/v2ray/ang/UtilsTest.kt +++ b/V2rayNG/app/src/test/java/com/v2ray/ang/AngUnitTest.kt @@ -1,17 +1,16 @@ package com.v2ray.ang import com.v2ray.ang.util.Utils -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue import org.junit.Test +import org.junit.Assert.* + /** * Example local unit test, which will execute on the development machine (host). * * See [testing documentation](http://d.android.com/tools/testing). */ -class UtilsTest { +class AngUnitTest { @Test fun test_parseInt() { @@ -45,18 +44,4 @@ class UtilsTest { assertTrue(Utils.isIpAddress("240e:1234:abcd:12::/64")) } - @Test - fun test_IsIpInCidr() { - assertTrue(Utils.isIpInCidr("192.168.1.1", "192.168.1.0/24")) - assertTrue(Utils.isIpInCidr("192.168.1.254", "192.168.1.0/24")) - assertFalse(Utils.isIpInCidr("192.168.2.1", "192.168.1.0/24")) - - assertTrue(Utils.isIpInCidr("10.0.0.0", "10.0.0.0/8")) - assertTrue(Utils.isIpInCidr("10.255.255.255", "10.0.0.0/8")) - assertFalse(Utils.isIpInCidr("11.0.0.0", "10.0.0.0/8")) - - assertFalse(Utils.isIpInCidr("invalid-ip", "192.168.1.0/24")) - assertFalse(Utils.isIpInCidr("192.168.1.1", "invalid-cidr")) - } - } \ No newline at end of file diff --git a/V2rayNG/app/src/test/java/com/v2ray/ang/HttpUtilTest.kt b/V2rayNG/app/src/test/java/com/v2ray/ang/HttpUtilTest.kt deleted file mode 100644 index 07d87f4d..00000000 --- a/V2rayNG/app/src/test/java/com/v2ray/ang/HttpUtilTest.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.v2ray.ang - -import com.v2ray.ang.util.HttpUtil -import org.junit.Assert.assertEquals -import org.junit.Test - -class HttpUtilTest { - - @Test - fun testIdnToASCII() { - // Regular URL remains unchanged - val regularUrl = "https://example.com/path" - assertEquals(regularUrl, HttpUtil.toIdnUrl(regularUrl)) - - // Non-ASCII URL converts to ASCII (Punycode) - val nonAsciiUrl = "https://例子.测试/path" - val expectedNonAscii = "https://xn--fsqu00a.xn--0zwm56d/path" - assertEquals(expectedNonAscii, HttpUtil.toIdnUrl(nonAsciiUrl)) - - // Mixed URL only converts the host part - val mixedUrl = "https://例子.com/测试" - val expectedMixed = "https://xn--fsqu00a.com/测试" - assertEquals(expectedMixed, HttpUtil.toIdnUrl(mixedUrl)) - - // URL with Basic Authentication using regular domain - val basicAuthUrl = "https://user:password@example.com/path" - assertEquals(basicAuthUrl, HttpUtil.toIdnUrl(basicAuthUrl)) - - // URL with Basic Authentication using non-ASCII domain - val basicAuthNonAscii = "https://user:password@例子.测试/path" - val expectedBasicAuthNonAscii = "https://user:password@xn--fsqu00a.xn--0zwm56d/path" - assertEquals(expectedBasicAuthNonAscii, HttpUtil.toIdnUrl(basicAuthNonAscii)) - - // URL with non-ASCII username and password - val nonAsciiAuth = "https://用户:密码@example.com/path" - // Basic auth credentials should remain unchanged as they're percent-encoded separately - assertEquals(nonAsciiAuth, HttpUtil.toIdnUrl(nonAsciiAuth)) - } - - -} \ No newline at end of file diff --git a/V2rayNG/gradle/libs.versions.toml b/V2rayNG/gradle/libs.versions.toml index 04900e8c..9b26cf04 100644 --- a/V2rayNG/gradle/libs.versions.toml +++ b/V2rayNG/gradle/libs.versions.toml @@ -1,36 +1,35 @@ [versions] -agp = "8.10.1" -desugarJdkLibs = "2.1.5" +agp = "8.7.2" +desugar_jdk_libs = "2.1.4" gradleLicensePlugin = "0.9.8" -kotlin = "2.1.21" -coreKtx = "1.16.0" +kotlin = "2.1.0" +coreKtx = "1.15.0" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" -appcompat = "1.7.1" +appcompat = "1.7.0" material = "1.12.0" -activity = "1.10.1" -constraintlayout = "2.2.1" -mmkvStatic = "1.3.12" -gson = "2.12.1" -quickieFoss = "1.14.0" -kotlinxCoroutinesAndroid = "1.10.2" -kotlinxCoroutinesCore = "1.10.2" -swiperefreshlayout = "1.1.0" -toasty = "1.5.2" +activity = "1.9.3" +constraintlayout = "2.2.0" +mmkvStatic = "1.3.11" +gson = "2.11.0" +quickieFoss = "1.13.1" +rxjava = "3.1.9" +rxandroid = "3.0.2" +rxpermissions = "0.12" +toastcompat = "1.1.0" editorkit = "2.9.0" core = "3.5.3" -workRuntimeKtx = "2.10.2" -lifecycleViewmodelKtx = "2.9.1" +workRuntimeKtx = "2.10.0" +lifecycleViewmodelKtx = "2.8.7" multidex = "2.0.1" -mockitoMockitoInline = "5.2.0" +mockitoMockitoInline = "4.0.0" flexbox = "3.0.0" preferenceKtx = "1.2.1" -recyclerview = "1.4.0" +recyclerview = "1.3.2" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } -desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugarJdkLibs" } +desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } gradle-license-plugin = { module = "com.jaredsburrows:gradle-license-plugin", version.ref = "gradleLicensePlugin" } junit = { group = "junit", name = "junit", version.ref = "junit" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } @@ -42,9 +41,10 @@ androidx-constraintlayout = { group = "androidx.constraintlayout", name = "const mmkv-static = { module = "com.tencent:mmkv-static", version.ref = "mmkvStatic" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } quickie-foss = { module = "com.github.T8RIN.QuickieExtended:quickie-foss", version.ref = "quickieFoss" } -kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" } -toasty = { module = "com.github.GrenderG:Toasty", version.ref = "toasty" } +rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" } +rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" } +rxpermissions = { module = "com.github.tbruyelle:rxpermissions", version.ref = "rxpermissions" } +toastcompat = { module = "me.drakeet.support:toastcompat", version.ref = "toastcompat" } editorkit = { module = "com.blacksquircle.ui:editorkit", version.ref = "editorkit" } language-base = { module = "com.blacksquircle.ui:language-base", version.ref = "editorkit" } language-json = { module = "com.blacksquircle.ui:language-json", version.ref = "editorkit" } @@ -64,3 +64,4 @@ preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = android-application = { id = "com.android.application", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } android-library = { id = "com.android.library", version.ref = "agp" } + diff --git a/V2rayNG/gradle/wrapper/gradle-wrapper.properties b/V2rayNG/gradle/wrapper/gradle-wrapper.properties index b2eeb9db..7e8d8ede 100644 --- a/V2rayNG/gradle/wrapper/gradle-wrapper.properties +++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Nov 14 12:42:51 BDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/badvpn b/badvpn deleted file mode 160000 index e6848008..00000000 --- a/badvpn +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e68480088a48c8930d29f54e30e9d6deaaf32c47 diff --git a/compile-tun2socks.sh b/compile-tun2socks.sh deleted file mode 100644 index c0db6218..00000000 --- a/compile-tun2socks.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -o errexit -set -o pipefail -set -o nounset -# Set magic variables for current file & dir -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -__file="${__dir}/$(basename "${BASH_SOURCE[0]}")" -__base="$(basename ${__file} .sh)" -if [[ ! -d $NDK_HOME ]]; then - echo "Android NDK: NDK_HOME not found. please set env \$NDK_HOME" - exit 1 -fi -TMPDIR=$(mktemp -d) -clear_tmp () { - rm -rf $TMPDIR -} -trap 'echo -e "Aborted, error $? in command: $BASH_COMMAND"; trap ERR; clear_tmp; exit 1' ERR INT -install -m644 $__dir/tun2socks.mk $TMPDIR/ -pushd $TMPDIR -ln -s $__dir/badvpn badvpn -ln -s $__dir/libancillary libancillary -$NDK_HOME/ndk-build \ - NDK_PROJECT_PATH=. \ - APP_BUILD_SCRIPT=./tun2socks.mk \ - APP_ABI=all \ - APP_PLATFORM=android-21 \ - NDK_LIBS_OUT=$TMPDIR/libs \ - NDK_OUT=$TMPDIR/tmp \ - APP_SHORT_COMMANDS=false LOCAL_SHORT_COMMANDS=false -B -j4 -cp -r $TMPDIR/libs $__dir/ -popd -rm -rf $TMPDIR diff --git a/hysteria b/hysteria deleted file mode 160000 index 2adeec29..00000000 --- a/hysteria +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2adeec2900a7a0e3689f118580174cc528f9995a diff --git a/libancillary b/libancillary deleted file mode 160000 index 232d69a5..00000000 --- a/libancillary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 232d69a5ebb4461b572bd3f3b97088091e01c243 diff --git a/libhysteria2.sh b/libhysteria2.sh deleted file mode 100644 index 1bd88967..00000000 --- a/libhysteria2.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -targets=( - "aarch64-linux-android21 arm64 arm64-v8a" - "armv7a-linux-androideabi21 arm armeabi-v7a" - "x86_64-linux-android21 amd64 x86_64" - "i686-linux-android21 386 x86" -) - -cd "hysteria" || exit - -for target in "${targets[@]}"; do - IFS=' ' read -r ndk_target goarch abi <<< "$target" - - echo "Building for ${abi} with ${ndk_target} (${goarch})" - - CC="${NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ndk_target}-clang" CGO_ENABLED=1 GOOS=android GOARCH=$goarch go build -o libs/$abi/libhysteria2.so -trimpath -ldflags "-s -w -buildid=" -buildvcs=false ./app - - echo "Built libhysteria2.so for ${abi}" -done diff --git a/tun2socks.mk b/tun2socks.mk deleted file mode 100644 index 1fab134e..00000000 --- a/tun2socks.mk +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -LOCAL_PATH := $(call my-dir) -ROOT_PATH := $(LOCAL_PATH) -######################################################## -## libancillary -######################################################## -include $(CLEAR_VARS) -ANCILLARY_SOURCE := fd_recv.c fd_send.c -LOCAL_MODULE := libancillary -#LOCAL_CFLAGS += -I$(LOCAL_PATH)/libancillary -LOCAL_C_INCLUDES := $(LOCAL_PATH)/libancillary -LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE)) -include $(BUILD_STATIC_LIBRARY) -######################################################## -## tun2socks -######################################################## -include $(CLEAR_VARS) -LOCAL_CFLAGS := -std=gnu99 -LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR_BADVPN -D_GNU_SOURCE -LOCAL_CFLAGS += -DBADVPN_USE_SIGNALFD -DBADVPN_USE_EPOLL -LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN -DBADVPN_THREAD_SAFE -LOCAL_CFLAGS += -DNDEBUG -DANDROID -LOCAL_CFLAGS += -I -LOCAL_STATIC_LIBRARIES := libancillary -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/badvpn/lwip/src/include/ipv4 \ - $(LOCAL_PATH)/badvpn/lwip/src/include/ipv6 \ - $(LOCAL_PATH)/badvpn/lwip/src/include \ - $(LOCAL_PATH)/badvpn/lwip/custom \ - $(LOCAL_PATH)/badvpn \ - $(LOCAL_PATH)/libancillary -TUN2SOCKS_SOURCES := \ - base/BLog_syslog.c \ - system/BReactor_badvpn.c \ - system/BSignal.c \ - system/BConnection_common.c \ - system/BConnection_unix.c \ - system/BTime.c \ - system/BUnixSignal.c \ - system/BNetwork.c \ - system/BDatagram_common.c \ - system/BDatagram_unix.c \ - flow/StreamRecvInterface.c \ - flow/PacketRecvInterface.c \ - flow/PacketPassInterface.c \ - flow/StreamPassInterface.c \ - flow/SinglePacketBuffer.c \ - flow/BufferWriter.c \ - flow/PacketBuffer.c \ - flow/PacketStreamSender.c \ - flow/PacketPassConnector.c \ - flow/PacketProtoFlow.c \ - flow/PacketPassFairQueue.c \ - flow/PacketProtoEncoder.c \ - flow/PacketProtoDecoder.c \ - socksclient/BSocksClient.c \ - tuntap/BTap.c \ - lwip/src/core/udp.c \ - lwip/src/core/memp.c \ - lwip/src/core/init.c \ - lwip/src/core/pbuf.c \ - lwip/src/core/tcp.c \ - lwip/src/core/tcp_out.c \ - lwip/src/core/netif.c \ - lwip/src/core/def.c \ - lwip/src/core/ip.c \ - lwip/src/core/mem.c \ - lwip/src/core/tcp_in.c \ - lwip/src/core/stats.c \ - lwip/src/core/inet_chksum.c \ - lwip/src/core/timeouts.c \ - lwip/src/core/ipv4/icmp.c \ - lwip/src/core/ipv4/igmp.c \ - lwip/src/core/ipv4/ip4_addr.c \ - lwip/src/core/ipv4/ip4_frag.c \ - lwip/src/core/ipv4/ip4.c \ - lwip/src/core/ipv4/autoip.c \ - lwip/src/core/ipv6/ethip6.c \ - lwip/src/core/ipv6/inet6.c \ - lwip/src/core/ipv6/ip6_addr.c \ - lwip/src/core/ipv6/mld6.c \ - lwip/src/core/ipv6/dhcp6.c \ - lwip/src/core/ipv6/icmp6.c \ - lwip/src/core/ipv6/ip6.c \ - lwip/src/core/ipv6/ip6_frag.c \ - lwip/src/core/ipv6/nd6.c \ - lwip/custom/sys.c \ - tun2socks/tun2socks.c \ - base/DebugObject.c \ - base/BLog.c \ - base/BPending.c \ - flowextra/PacketPassInactivityMonitor.c \ - tun2socks/SocksUdpGwClient.c \ - udpgw_client/UdpGwClient.c \ - socks_udp_client/SocksUdpClient.c -LOCAL_MODULE := tun2socks -LOCAL_LDLIBS := -ldl -llog -LOCAL_LDFLAGS=-Wl,--build-id=none -LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES)) -LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE -LOCAL_MAKEFILE := $(local-makefile) -$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT)) -$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE)) -$(call check-LOCAL_MODULE_FILENAME) -# we are building target objects -my := TARGET_ -$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION)) -$(call handle-module-built) -LOCAL_MODULE_CLASS := EXECUTABLE -include $(BUILD_SYSTEM)/build-module.mk