From fba4c03bb5269625d4d8a34bda3d4d9d4fd6b275 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 17 Feb 2024 09:55:26 +0800
Subject: [PATCH] Bug fix
---
V2rayNG/app/build.gradle.kts | 2 +-
.../kotlin/com/v2ray/ang/ui/SettingsActivity.kt | 16 ++++++++--------
.../app/src/main/res/values-zh-rCN/strings.xml | 4 ++--
.../app/src/main/res/values-zh-rTW/strings.xml | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts
index 35cadf606..ce59bb25b 100644
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -11,7 +11,7 @@ android {
applicationId = "com.v2ray.ang"
minSdk = 21
targetSdk = 34
- versionCode = 546
+ versionCode = 547
versionName = "1.8.16"
multiDexEnabled = true
}
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
index 83fa9eeea..d38bf86d6 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
@@ -81,10 +81,10 @@ class SettingsActivity : BaseActivity() {
autoUpdateInterval?.setOnPreferenceChangeListener { _, any ->
var nval = any as String
- autoUpdateInterval?.summary = nval
// It must be greater than 15 minutes because WorkManager couldn't run tasks under 15 minutes intervals
nval =
- if (TextUtils.isEmpty(nval) or (nval.toLong() < 15)) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
+ if (TextUtils.isEmpty(nval) || (nval.toLong() < 15)) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
+ autoUpdateInterval?.summary = nval
configureUpdateTask(nval.toLong())
true
}
@@ -286,9 +286,9 @@ class SettingsActivity : BaseActivity() {
private fun updateMux(enabled: Boolean) {
val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity())
- muxConcurrency?.isVisible = enabled
- muxXudpConcurrency?.isVisible = enabled
- muxXudpQuic?.isVisible = enabled
+ muxConcurrency?.isEnabled = enabled
+ muxXudpConcurrency?.isEnabled = enabled
+ muxXudpQuic?.isEnabled = enabled
if (enabled) {
updateMuxConcurrency(defaultSharedPreferences.getString(AppConfig.PREF_MUX_CONCURRENCY, "8"))
updateMuxXudpConcurrency(defaultSharedPreferences.getString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8"))
@@ -315,9 +315,9 @@ class SettingsActivity : BaseActivity() {
private fun updateFragment(enabled: Boolean) {
val defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity())
- fragmentPackets?.isVisible = enabled
- fragmentLength?.isVisible = enabled
- fragmentInterval?.isVisible = enabled
+ fragmentPackets?.isEnabled = enabled
+ fragmentLength?.isEnabled = enabled
+ fragmentInterval?.isEnabled = enabled
if (enabled) {
updateFragmentPackets(defaultSharedPreferences.getString(AppConfig.PREF_FRAGMENT_PACKETS, "tlshello"))
updateFragmentLength(defaultSharedPreferences.getString(AppConfig.PREF_FRAGMENT_LENGTH, "50-100"))
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 5208b8643..17b907bfd 100644
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -230,11 +230,11 @@
导入订阅失败
添加
添加链接
- 分片(fragment) 设置
+ 分片(Fragment) 设置
分片方式
分片包长(最小-最大)
分片间隔(最小-最大)
- 启用分片(fragment)
+ 启用分片(Fragment)
- 二维码
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 d865928d2..e63a0560b 100644
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -230,11 +230,11 @@
導入訂閱失敗
添加
添加連結
- 分片(fragment) 設定
+ 分片(Fragment) 設定
分片方式
分片包长(最小-最大)
分片间隔(最小-最大)
- 启用分片(fragment)
+ 启用分片(Fragment)
- QR Code