up 1.10.30

Update AndroidLibXrayLite
Update IP API URL in AppConfig
2025-12-07 15:59:33 +08:00 · 2025-12-07 15:59:25 +08:00 · 2025-12-06 18:51:53 +08:00 · 2025-12-06 18:48:15 +08:00 · 2025-12-03 09:38:08 +08:00 · 2025-12-03 09:36:47 +08:00
30 changed files with 101 additions and 52 deletions
@@ -43,19 +43,19 @@ jobs:
      uses: actions/cache/restore@v4
      with:
        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }}

    - name: Build libtun2socks
      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
      run: |
-        bash compile-tun2socks.sh
+        bash compile-tun2socks.sh && bash compile-hevtun.sh
    
    - name: Save libtun2socks
      if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true'
      uses: actions/cache/save@v4
      with:
        path: ${{ github.workspace }}/libs
-        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}
+        key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }}

    - name: Copy libtun2socks
      run: |
@@ -13,4 +13,3 @@
 [submodule "hev-socks5-tunnel"]
 	path = hev-socks5-tunnel
 	url = https://github.com/heiher/hev-socks5-tunnel
-	branch = master
@@ -3,7 +3,7 @@
 A V2Ray client for Android, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)

 [![API](https://img.shields.io/badge/API-21%2B-yellow.svg?style=flat)](https://developer.android.com/about/versions/lollipop)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.0-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.21-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)
@@ -12,8 +12,8 @@ android {
        applicationId = "com.v2ray.ang"
        minSdk = 21
        targetSdk = 35
-        versionCode = 679
-        versionName = "1.10.28"
+        versionCode = 682
+        versionName = "1.10.30"
        multiDexEnabled = true

        val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')
@@ -112,7 +112,8 @@ object AppConfig {
    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 IP_API_URL = "https://speed.cloudflare.com/meta"
+    const val IP_API_URL = "https://api.ip.sb/geoip"

    /** DNS server addresses. */
    const val DNS_PROXY = "1.1.1.1"
@@ -13,5 +13,6 @@ data class SubscriptionItem(
    var filter: String? = null,
    var intelligentSelectionFilter: String? = null,
    var allowInsecureUrl: Boolean = false,
+    var userAgent: String? = null,
 )

@@ -73,7 +73,7 @@ open class FmtBase {
            config.security = null
        }
        // Support multiple possible query keys for allowInsecure like the C# implementation
-        val allowInsecureKeys = arrayOf("insecure", "allowInsecure", "allow_insecure", "verify")
+        val allowInsecureKeys = arrayOf("insecure", "allowInsecure", "allow_insecure")
        config.insecure = when {
            allowInsecureKeys.any { queryParam[it] == "1" } -> true
            allowInsecureKeys.any { queryParam[it] == "0" } -> false
@@ -425,17 +425,18 @@ object AngConfigManager {
                }
            }
            Log.i(AppConfig.TAG, url)
+            val userAgent = it.second.userAgent

            var configText = try {
                val httpPort = SettingsManager.getHttpPort()
-                HttpUtil.getUrlContentWithUserAgent(url, 15000, httpPort)
+                HttpUtil.getUrlContentWithUserAgent(url, userAgent, 15000, httpPort)
            } catch (e: Exception) {
                Log.e(AppConfig.ANG_PACKAGE, "Update subscription: proxy not ready or other error", e)
                ""
            }
            if (configText.isEmpty()) {
                configText = try {
-                    HttpUtil.getUrlContentWithUserAgent(url)
+                    HttpUtil.getUrlContentWithUserAgent(url, userAgent)
                } catch (e: Exception) {
                    Log.e(AppConfig.TAG, "Update subscription: Failed to get URL content with user agent", e)
                    ""
@@ -72,11 +72,9 @@ class TProxyService(
            appendLine("  udp: 'udp'")

            appendLine("misc:")
-            appendLine("  read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
-            val hevTunLogLevel = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "none"
-            if (hevTunLogLevel != "none") {
-                appendLine("  log-level: $hevTunLogLevel")
-            }
+            appendLine("  tcp-read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
+            appendLine("  udp-read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
+            appendLine("  log-level: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "warn"}")
        }
    }

@@ -44,6 +44,7 @@ class SubEditActivity : BaseActivity() {
    private fun bindingServer(subItem: SubscriptionItem): Boolean {
        binding.etRemarks.text = Utils.getEditable(subItem.remarks)
        binding.etUrl.text = Utils.getEditable(subItem.url)
+        binding.etUserAgent.text = Utils.getEditable(subItem.userAgent)
        binding.etFilter.text = Utils.getEditable(subItem.filter)
        binding.etIntelligentSelectionFilter.text = Utils.getEditable(subItem.intelligentSelectionFilter)
        binding.chkEnable.isChecked = subItem.enabled
@@ -76,6 +77,7 @@ class SubEditActivity : BaseActivity() {

        subItem.remarks = binding.etRemarks.text.toString()
        subItem.url = binding.etUrl.text.toString()
+        subItem.userAgent = binding.etUserAgent.text.toString()
        subItem.filter = binding.etFilter.text.toString()
        subItem.intelligentSelectionFilter = binding.etIntelligentSelectionFilter.text.toString()
        subItem.enabled = binding.chkEnable.isChecked
@@ -128,7 +128,7 @@ object HttpUtil {
     * @throws IOException If an I/O error occurs.
     */
    @Throws(IOException::class)
-    fun getUrlContentWithUserAgent(url: String?, timeout: Int = 15000, httpPort: Int = 0): String {
+    fun getUrlContentWithUserAgent(url: String?, userAgent: String?,  timeout: Int = 15000, httpPort: Int = 0): String {
        var currentUrl = url
        var redirects = 0
        val maxRedirects = 3
@@ -136,7 +136,12 @@ object HttpUtil {
        while (redirects++ < maxRedirects) {
            if (currentUrl == null) continue
            val conn = createProxyConnection(currentUrl, httpPort, timeout, timeout) ?: continue
-            conn.setRequestProperty("User-agent", "v2rayNG/${BuildConfig.VERSION_NAME}")
+            val finalUserAgent = if (userAgent.isNullOrBlank()) {
+                "v2rayNG/${BuildConfig.VERSION_NAME}"
+            } else {
+                userAgent
+            }
+            conn.setRequestProperty("User-agent", finalUserAgent)
            conn.connect()

            val responseCode = conn.responseCode
@@ -74,6 +74,25 @@

            </LinearLayout>

+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/padding_spacing_dp16"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/sub_setting_user_agent" />
+
+                <EditText
+                    android:id="@+id/et_user_agent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="text" />
+
+            </LinearLayout>
+
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@@ -265,6 +265,7 @@
    <string name="title_sub_setting">إعداد مجموعة الاشتراك</string>
    <string name="sub_setting_remarks">ملاحظات</string>
    <string name="sub_setting_url">عنوان URL اختياري</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">تفعيل التحديث</string>
    <string name="sub_auto_update">تفعيل التحديث التلقائي</string>
@@ -265,6 +265,7 @@
    <string name="title_sub_setting">সাবস্ক্রিপশন গ্রুপ সেটিং</string>
    <string name="sub_setting_remarks">মন্তব্য</string>
    <string name="sub_setting_url">ঐচ্ছিক URL</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">আপডেট সক্রিয় করুন</string>
    <string name="sub_auto_update">স্বয়ংক্রিয় আপডেট সক্রিয় করুন</string>
@@ -265,6 +265,7 @@
    <string name="title_sub_setting">سامووا بونکۊ اشتراک</string>
    <string name="sub_setting_remarks">نیشتنا</string>
    <string name="sub_setting_url">نشۊوی اینترنتی اختیاری</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">نوم موستعار فیلتر</string>
    <string name="sub_setting_enable">فعال بیڌن ورۊ کردن</string>
    <string name="sub_auto_update">فعال بیڌن ورۊ کردن خوتکار</string>
@@ -262,6 +262,7 @@
    <string name="title_sub_setting">تنظیمات گروه‌ اشتراک</string>
    <string name="sub_setting_remarks">ملاحظات</string>
    <string name="sub_setting_url">نشانی اینترنتی اختیاری</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">نام مستعار فیلتر</string>
    <string name="sub_setting_enable">فعال کردن به‌روزرسانی</string>
    <string name="sub_auto_update">فعال سازی به‌روزرسانی خودکار</string>
@@ -264,6 +264,7 @@
    <string name="title_sub_setting">Группы</string>
    <string name="sub_setting_remarks">Название</string>
    <string name="sub_setting_url">URL (необязательно)</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">Название фильтра</string>
    <string name="sub_setting_enable">Использовать обновление</string>
    <string name="sub_auto_update">Использовать автообновление</string>
@@ -265,6 +265,7 @@
    <string name="title_sub_setting">Các gói đăng ký</string>
    <string name="sub_setting_remarks">Tên gói đăng ký</string>
    <string name="sub_setting_url">URL gói đăng ký</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">Sử dụng gói đăng ký này</string>
    <string name="sub_auto_update">Bật tự động cập nhật</string>
@@ -262,6 +262,7 @@
    <string name="title_sub_setting">订阅分组设置</string>
    <string name="sub_setting_remarks">备注</string>
    <string name="sub_setting_url">可选地址 (url)</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">别名正则过滤</string>
    <string name="sub_setting_enable">启用更新</string>
    <string name="sub_auto_update">启用自动更新</string>
@@ -263,6 +263,7 @@
    <string name="title_sub_setting">訂閱分組設定</string>
    <string name="sub_setting_remarks">備註</string>
    <string name="sub_setting_url">可選位址(url)</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">別名正規過濾</string>
    <string name="sub_setting_enable">啟用更新</string>
    <string name="sub_auto_update">啟用自動更新</string>
@@ -119,9 +119,9 @@
    </string-array>

    <string-array name="hev_tunnel_loglevel" translatable="false">
-        <item>none</item>
        <item>error</item>
        <item>warn</item>
+        <item>info</item>
        <item>debug</item>
    </string-array>

@@ -268,6 +268,7 @@
    <string name="title_sub_setting">Subscription group setting</string>
    <string name="sub_setting_remarks">remarks</string>
    <string name="sub_setting_url">Optional URL</string>
+    <string name="sub_setting_user_agent">User Agent</string>
    <string name="sub_setting_filter">Remarks regular filter</string>
    <string name="sub_setting_enable">Enable update</string>
    <string name="sub_auto_update">Enable automatic update</string>
@@ -85,7 +85,7 @@
            android:title="@string/title_pref_use_hev_tunnel" />

        <ListPreference
-            android:defaultValue="none"
+            android:defaultValue="warn"
            android:entries="@array/hev_tunnel_loglevel"
            android:entryValues="@array/hev_tunnel_loglevel"
            android:key="pref_hev_tunnel_loglevel"
@@ -1,8 +1,8 @@
 [versions]
-agp = "8.12.3"
+agp = "8.13.1"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
@@ -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-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -0,0 +1,40 @@
+#!/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
+
+#build hev-socks5-tunnel
+mkdir -p "$TMPDIR/jni"
+pushd "$TMPDIR"
+
+echo 'include $(call all-subdir-makefiles)' > jni/Android.mk
+
+ln -s "$__dir/hev-socks5-tunnel" jni/hev-socks5-tunnel
+
+"$NDK_HOME/ndk-build" \
+    NDK_PROJECT_PATH=. \
+    APP_BUILD_SCRIPT=jni/Android.mk \
+	"APP_ABI=armeabi-v7a arm64-v8a x86 x86_64" \
+	APP_PLATFORM=android-21 \
+    NDK_LIBS_OUT="$TMPDIR/libs" \
+    NDK_OUT="$TMPDIR/obj" \
+    "APP_CFLAGS=-O3 -DPKGNAME=com/v2ray/ang/service" \
+    "APP_LDFLAGS=-Wl,--build-id=none -Wl,--hash-style=gnu" \
+
+cp -r "$TMPDIR/libs/"* "$__dir/libs/"
+
+popd
+rm -rf $TMPDIR
@@ -30,29 +30,3 @@ $NDK_HOME/ndk-build \
 cp -r $TMPDIR/libs $__dir/
 popd
 rm -rf $TMPDIR
-
-#build hev-socks5-tunnel
-HEVTUN_TMP=$(mktemp -d)
-trap 'rm -rf "$HEVTUN_TMP"' EXIT
-
-mkdir -p "$HEVTUN_TMP/jni"
-pushd "$HEVTUN_TMP"
-
-echo 'include $(call all-subdir-makefiles)' > jni/Android.mk
-
-ln -s "$__dir/hev-socks5-tunnel" jni/hev-socks5-tunnel
-
-"$NDK_HOME/ndk-build" \
-    NDK_PROJECT_PATH=. \
-    APP_BUILD_SCRIPT=jni/Android.mk \
-	"APP_ABI=armeabi-v7a arm64-v8a x86 x86_64" \
-	APP_PLATFORM=android-21 \
-    NDK_LIBS_OUT="$HEVTUN_TMP/libs" \
-    NDK_OUT="$HEVTUN_TMP/obj" \
-    "APP_CFLAGS=-O3 -DPKGNAME=com/v2ray/ang/service" \
-    "APP_LDFLAGS=-WI,--build-id=none -WI,--hash-style=gnu" \
-
-cp -r "$HEVTUN_TMP/libs/"* "$__dir/libs/"
-popd
-
-rm -rf "$HEVTUN_TMP"
Author	SHA1	Message	Date
2dust	e5d14bada9	up 1.10.30	2025-12-07 15:59:33 +08:00
2dust	80fb265960	Update AndroidLibXrayLite	2025-12-07 15:59:25 +08:00
2dust	f5493b08ae	Update IP API URL in AppConfig https://github.com/2dust/v2rayNG/issues/5073	2025-12-06 18:51:53 +08:00
Skh-web6982	4f7d6db361	Update kotlin to version 2.2.21 (#5077 ) * Update kotlin to version 2.2.21 * Update kotlin to version 2.2.21 * Update gradle-wrapper.properties * Update libs.versions.toml	2025-12-06 18:48:15 +08:00
2dust	636b20290a	Update submodules AndroidLibXrayLite and hev-socks5-tunnel	2025-12-03 09:38:08 +08:00
2dust	7ead97079c	up 1.10.29	2025-12-03 09:36:47 +08:00
fuilloi	e42cc3a60a	fix hevtun loglevel (#5062 )	2025-11-27 19:14:22 +08:00
fuilloi	d231490917	update libtun build script (#5055 ) * Update compile-tun2socks.sh * update libtun build script	2025-11-26 15:21:32 +08:00
fuilloi	521d61acb3	update hev config option (#5056 )	2025-11-26 13:43:44 +08:00
2dust	ed9c26b012	Add user agent support for subscription updates https://github.com/2dust/v2rayNG/issues/5043	2025-11-22 18:01:49 +08:00
2dust	e782da7c71	Update hev-socks5-tunnel and hysteria submodules Advanced the hev-socks5-tunnel and hysteria submodules to their latest commits to incorporate recent upstream changes.	2025-11-19 16:59:34 +08:00
2dust	6fd0f7f0db	Update .gitmodules	2025-11-19 16:54:44 +08:00
2dust	7c14a0c200	Bug fix	2025-11-17 17:46:15 +08:00