Skip to content

Commit

Permalink
Bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
2dust committed Feb 17, 2024
1 parent a32ae5b commit fba4c03
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion V2rayNG/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
applicationId = "com.v2ray.ang"
minSdk = 21
targetSdk = 34
versionCode = 546
versionCode = 547
versionName = "1.8.16"
multiDexEnabled = true
}
Expand Down
16 changes: 8 additions & 8 deletions V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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"))
Expand All @@ -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"))
Expand Down
4 changes: 2 additions & 2 deletions V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@
<string name="import_subscription_failure">导入订阅失败</string>
<string name="menu_item_add_asset">添加</string>
<string name="menu_item_add_url">添加链接</string>
<string name="title_fragment_settings">分片(fragment) 设置</string>
<string name="title_fragment_settings">分片(Fragment) 设置</string>
<string name="title_pref_fragment_packets">分片方式</string>
<string name="title_pref_fragment_length">分片包长(最小-最大)</string>
<string name="title_pref_fragment_interval">分片间隔(最小-最大)</string>
<string name="title_pref_fragment_enabled">启用分片(fragment)</string>
<string name="title_pref_fragment_enabled">启用分片(Fragment)</string>

<string-array name="share_method">
<item>二维码</item>
Expand Down
4 changes: 2 additions & 2 deletions V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@
<string name="import_subscription_failure">導入訂閱失敗</string>
<string name="menu_item_add_asset">添加</string>
<string name="menu_item_add_url">添加連結</string>
<string name="title_fragment_settings">分片(fragment) 設定</string>
<string name="title_fragment_settings">分片(Fragment) 設定</string>
<string name="title_pref_fragment_packets">分片方式</string>
<string name="title_pref_fragment_length">分片包长(最小-最大)</string>
<string name="title_pref_fragment_interval">分片间隔(最小-最大)</string>
<string name="title_pref_fragment_enabled">启用分片(fragment)</string>
<string name="title_pref_fragment_enabled">启用分片(Fragment)</string>

<string-array name="share_method">
<item>QR Code</item>
Expand Down

0 comments on commit fba4c03

Please sign in to comment.