From fe812c4456a580dda8a771e100035afa82f1c23a Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 1 Jun 2026 15:04:26 +0800 Subject: [PATCH] Remove allowInsecure preference and default to secure --- V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt | 1 - V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt | 5 ++--- V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt | 3 +-- V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt | 5 ++--- V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt | 3 +-- V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt | 6 ++---- .../app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt | 3 +-- V2rayNG/app/src/main/res/values-ar/strings.xml | 3 --- V2rayNG/app/src/main/res/values-bn/strings.xml | 3 --- V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml | 3 --- V2rayNG/app/src/main/res/values-fa/strings.xml | 3 --- V2rayNG/app/src/main/res/values-ru/strings.xml | 3 --- V2rayNG/app/src/main/res/values-vi/strings.xml | 3 --- V2rayNG/app/src/main/res/values-zh-rCN/strings.xml | 5 +---- V2rayNG/app/src/main/res/values-zh-rTW/strings.xml | 3 --- V2rayNG/app/src/main/res/values/strings.xml | 3 --- V2rayNG/app/src/main/res/xml/pref_settings.xml | 5 ----- 17 files changed, 10 insertions(+), 50 deletions(-) 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 5508380b..eeb71629 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt @@ -55,7 +55,6 @@ object AppConfig { const val PREF_IPV6_ENABLED = "pref_ipv6_enabled" const val PREF_PREFER_IPV6 = "pref_prefer_ipv6" const val PREF_PROXY_SHARING = "pref_proxy_sharing_enabled" - const val PREF_ALLOW_INSECURE = "pref_allow_insecure" const val PREF_ENABLE_LOCAL_PROXY = "pref_enable_local_proxy" const val PREF_SOCKS_PORT = "pref_socks_port" const val PREF_DYNAMIC_SOCKS_PORT = "pref_dynamic_socks_port" 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 201c5b88..791d8714 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 @@ -50,9 +50,8 @@ open class FmtBase { * * @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) { + fun getItemFormQuery(config: ProfileItem, queryParam: Map) { config.network = queryParam["type"] ?: NetworkType.TCP.type config.headerType = queryParam["headerType"] config.host = queryParam["host"] @@ -79,7 +78,7 @@ open class FmtBase { config.insecure = when { allowInsecureKeys.any { queryParam[it] == "1" } -> true allowInsecureKeys.any { queryParam[it] == "0" } -> false - else -> allowInsecure + else -> false } config.sni = queryParam["sni"] config.fingerPrint = queryParam["fp"] 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 ed750200..5d080ffb 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 @@ -19,7 +19,6 @@ object Hysteria2Fmt : FmtBase() { * @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)) @@ -33,7 +32,7 @@ object Hysteria2Fmt : FmtBase() { if (!uri.rawQuery.isNullOrEmpty()) { val queryParam = getQueryParam(uri) - getItemFormQuery(config, queryParam, allowInsecure) + getItemFormQuery(config, queryParam) config.security = queryParam["security"] ?: AppConfig.TLS config.obfsPassword = queryParam["obfs-password"] 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 a60ff471..83c715d3 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 @@ -17,7 +17,6 @@ object TrojanFmt : FmtBase() { * @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)) @@ -29,11 +28,11 @@ object TrojanFmt : FmtBase() { if (uri.rawQuery.isNullOrEmpty()) { config.network = NetworkType.TCP.type config.security = AppConfig.TLS - config.insecure = allowInsecure + config.insecure = false } else { val queryParam = getQueryParam(uri) - getItemFormQuery(config, queryParam, allowInsecure) + getItemFormQuery(config, queryParam) config.security = queryParam["security"] ?: AppConfig.TLS } 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 9e41167f..1369d526 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 @@ -17,7 +17,6 @@ object VlessFmt : FmtBase() { * @return the parsed ProfileItem object, or null if parsing fails */ fun parse(str: String): ProfileItem? { - var allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false) val config = ProfileItem.create(EConfigType.VLESS) val uri = URI(Utils.fixIllegalUrl(str)) @@ -30,7 +29,7 @@ object VlessFmt : FmtBase() { config.password = uri.userInfo config.method = queryParam["encryption"] ?: "none" - getItemFormQuery(config, queryParam, allowInsecure) + getItemFormQuery(config, queryParam) return config } 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 b156bd0e..15c04c05 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 @@ -26,7 +26,6 @@ object VmessFmt : FmtBase() { return parseVmessStd(str) } - val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false) val config = ProfileItem.create(EConfigType.VMESS) var result = str.replace(EConfigType.VMESS.protocolScheme, "") @@ -87,7 +86,7 @@ object VmessFmt : FmtBase() { config.insecure = when (vmessQRCode.insecure) { "1" -> true "0" -> false - else -> allowInsecure + else -> false } return config } @@ -154,7 +153,6 @@ object VmessFmt : FmtBase() { * @return the parsed ProfileItem object, or null if parsing fails */ fun parseVmessStd(str: String): ProfileItem? { - val allowInsecure = MmkvManager.decodeSettingsBool(AppConfig.PREF_ALLOW_INSECURE, false) val config = ProfileItem.create(EConfigType.VMESS) val uri = URI(Utils.fixIllegalUrl(str)) @@ -167,7 +165,7 @@ object VmessFmt : FmtBase() { config.password = uri.userInfo config.method = AppConfig.DEFAULT_SECURITY - getItemFormQuery(config, queryParam, allowInsecure) + getItemFormQuery(config, queryParam) return config } 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 5f5320ad..f81c0e77 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 @@ -14,7 +14,6 @@ import android.widget.TextView import androidx.appcompat.app.AlertDialog import com.v2ray.ang.AppConfig 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 @@ -618,7 +617,7 @@ class ServerActivity : BaseActivity() { val allowInsecure = if (allowInsecureField == null || allowinsecures[allowInsecureField].isBlank()) { - MmkvManager.decodeSettingsBool(PREF_ALLOW_INSECURE) + false } else { allowinsecures[allowInsecureField].toBoolean() } diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index 2c4fafde..ce3b198f 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -220,9 +220,6 @@ يمكن للأجهزة الأخرى الاتصال بالبروكسي بواسطة عنوان IP الخاص بك من خلال socks/http، يتم التمكين فقط في الشبكة الموثوقة لتجنب الاتصال غير المصرح به السماح بالاتصالات من الشبكة المحلية، تأكد من أنك في شبكة موثوقة - السماح غير الآمن - عند TLS، الافتراضي هو السماح غير الآمن - منفذ بروكسي Local تفعيل الوكيل المحلي When disabled, no SOCKS proxy is available, so subscription updates and similar actions cannot use the proxy diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index 5db4c69c..eea4d6ba 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -220,9 +220,6 @@ অন্যান্য ডিভাইসগুলি আপনার আইপি ঠিকানা ব্যবহার করে প্রক্সিতে সংযুক্ত হতে পারে, শুধুমাত্র বিশ্বস্ত নেটওয়ার্কে সক্রিয় করুন যাতে অনুমোদিত সংযোগ এড়ানো যায় LAN থেকে সংযোগ অনুমোদন করুন, নিশ্চিত করুন যে আপনি একটি বিশ্বস্ত নেটওয়ার্কে আছেন - allowInsecure - যখন TLS, ডিফল্টভাবে allowInsecure - Local প্রক্সি পোর্ট লোকাল প্রক্সি সক্ষম করুন When disabled, no SOCKS proxy is available, so subscription updates and similar actions cannot use the proxy 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 35a2546c..95087d46 100644 --- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml +++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml @@ -220,9 +220,6 @@ پوی دسگایل ترن وا نشۊوی IP ایسا، ز ره socks/http و پروکسی منپیز بۊن، تینا من شبکه قابل ائتماد ره ونده بۊ تا ز منپیز قیر موجاز جلو گری بۊ. منپیزا ز شبکه مهلی ن موجار کۊنین، موتمعن بۊین ک من ی شبکه قابل ائتماڌ هڌین. - اجازه نا ٱمن - مجال و کار بوردن TLS ب تۉر پؽش فرز، موجوز نا ٱمن ره ونده هڌ. - پورت پروکسی مهلی ره وندن پروکسی مهلی هرسا ره نوسته بۊ، هیچ پروکسی SOCKS من دسرس نؽ، سی دل هیمو ورۊ رسۊوی یل اشتراک وو کارا جۊر یو نترن پروکسی ن و کار گرن. diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index d3e71d42..071e5053 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -218,9 +218,6 @@ سایر دستگاه ها می توانند با استفاده از آدرس آیپی شما برای استفاده از یک پروکسی محلی متصل شوند. فقط در یک شبکه قابل اعتماد برای جلوگیری از اتصالات غیرمجاز استفاده کنید. اتصالات از طریق شبکه محلی را مجاز کنید، مطمئن شوید که در یک شبکه قابل اعتماد هستید. - اعطای مجوز ناامن - هنگام استفاده از TLS، به طور پیش‌ فرض مجوز ناامن فعال است. - پورت پروکسی محلی فعال‌سازی پروکسی محلی When disabled, no SOCKS proxy is available, so subscription updates and similar actions cannot use the proxy diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index e6f77504..fc56badf 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -224,9 +224,6 @@ Другие устройства могут подключаться, используя ваш IP-адрес, чтобы использовать локальный прокси. Используйте только в доверенной сети, чтобы избежать несанкционированного подключения. Доступ из LAN разрешён, убедитесь, что вы находитесь в доверенной сети - Разрешать небезопасные соединения - Для TLS по умолчанию разрешены небезопасные соединения - Порт локального прокси Использовать локальный прокси Если отключено, SOCKS-прокси недоступен, поэтому обновления подписки и подобные действия не смогут использовать прокси diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index efb79ece..76abec8f 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -220,9 +220,6 @@ Các thiết bị khác trong cùng mạng LAN có thể kết nối đến SOCKS / HTTP proxy trên thiết bị của bạn. \nChỉ bật tính năng này trong các mạng đáng tin cậy để tránh kết nối trái phép. Đang bật cho phép kết nối từ mạng LAN - Bỏ qua xác minh chứng chỉ - Khi nhập những cấu hình có bảo mật TLS, mặc định sẽ không xác minh chứng chỉ. - Cổng Proxy Local Bật proxy cục bộ When disabled, no SOCKS proxy is available, so subscription updates and similar actions cannot use the proxy 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 7bac4db8..bcc48458 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -219,10 +219,7 @@ 其他设备可以使用 socks/http 协议通过您的 IP 地址连接到代理, 仅在受信任的网络中启用以避免未经授权的连接 允许来自局域网的连接,请确保处于受信网络 - 跳过证书验证 (allowInsecure) - 传输层安全选 tls 时,默认跳过证书验证 (allowInsecure) - - 本地代理端口 + 本地代理端口 启用本地代理 不开启时没有 socks 代理,无法通过代理更新订阅等 SOCKS5 UDP 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 6c8727e4..286da850 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -218,9 +218,6 @@ 其他裝置可以使用 socks/http 協定透過您的 IP 位址連線到 Proxy,僅在受信任的網路中啟用以避免未經授權的連線 允許來自區域網路的連線,請確保處於受信網路 - 跳過憑證驗證 (allowInsecure) - 傳輸層安全選 tls 時,預設跳過憑證驗證 (allowInsecure) - 本地代理埠 啟用本地代理 未開啟時沒有 socks 代理,無法透過代理更新訂閱等 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 8e9584e4..b8075557 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -226,9 +226,6 @@ 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 - allowInsecure - When TLS is selected, allow insecure connections by default - Local proxy port Enable local proxy When disabled, no SOCKS proxy is available, so subscription updates and similar actions cannot use the proxy diff --git a/V2rayNG/app/src/main/res/xml/pref_settings.xml b/V2rayNG/app/src/main/res/xml/pref_settings.xml index f43d0fe6..5d4652b2 100644 --- a/V2rayNG/app/src/main/res/xml/pref_settings.xml +++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml @@ -144,11 +144,6 @@ android:summary="@string/summary_pref_route_only_enabled" android:title="@string/title_pref_route_only_enabled" /> - -