From 3dde6b0ca31a41e8b891548c31fbc112368b5863 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:32:05 +0800
Subject: [PATCH] Fix Automatic update subscriptions

---
 .../app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt | 5 +++--
 V2rayNG/app/src/main/res/values-zh-rCN/strings.xml           | 5 +++++
 V2rayNG/app/src/main/res/values-zh-rTW/strings.xml           | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

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 70da3308..452f0983 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
@@ -78,9 +78,9 @@ class SettingsActivity : BaseActivity() {
             autoUpdateInterval?.setOnPreferenceChangeListener { _, any ->
                 val nval = any as String
                 autoUpdateInterval?.summary =
-                    if (TextUtils.isEmpty(nval) or (nval.toLong() < 15)) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
+                    if (TextUtils.isEmpty(nval) or (nval.toLong() < 1)) AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL else nval
                 configureUpdateTask(nval.toLong())
-                false
+                true
             }
 
 //            licenses.onClick {
@@ -178,6 +178,7 @@ class SettingsActivity : BaseActivity() {
             updateMux(defaultSharedPreferences.getBoolean(AppConfig.PREF_MUX_ENABLED, false))
             muxXudpConcurrency?.summary = defaultSharedPreferences.getString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "8")
             autoUpdateInterval?.summary = defaultSharedPreferences.getString(AppConfig.SUBSCRIPTION_AUTO_UPDATE_INTERVAL,AppConfig.SUBSCRIPTION_DEFAULT_UPDATE_INTERVAL)
+            autoUpdateInterval?.isEnabled = defaultSharedPreferences.getBoolean(AppConfig.SUBSCRIPTION_AUTO_UPDATE, false)
 
             if (TextUtils.isEmpty(remoteDnsString)) {
                 remoteDnsString = AppConfig.DNS_AGENT
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 346ea0b6..4ceb4ad0 100644
--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -164,6 +164,10 @@
     <string name="title_pref_promotion">推广</string>
     <string name="summary_pref_promotion">一些推广,点击查看详情(捐赠可去除)</string>
 
+    <string name="title_pref_auto_update_subscription">自动更新订阅</string>
+    <string name="summary_pref_auto_update_subscription">在后台按一定时间间隔自动更新您的订阅</string>
+    <string name="title_pref_auto_update_interval">订阅自动更新间隔（分钟）</string>
+
     <string name="title_core_loglevel">日志级别</string>
     <string name="title_mode">模式</string>
     <string name="title_mode_help">点此查看更多帮助</string>
@@ -182,6 +186,7 @@
     <string name="sub_setting_remarks">备注</string>
     <string name="sub_setting_url">可选地址(url)</string>
     <string name="sub_setting_enable">启用更新</string>
+    <string name="sub_auto_update">自动更新</string>
     <string name="title_sub_update">更新订阅</string>
     <string name="title_ping_all_server">测试全部配置Tcping</string>
     <string name="title_real_ping_all_server">测试全部配置真连接</string>
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 d2ff9e90..c1050ae8 100644
--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -164,6 +164,10 @@
     <string name="title_pref_promotion">推廣</string>
     <string name="summary_pref_promotion">一些推廣，輕觸以檢視 (捐贈可去除)</string>
 
+    <string name="title_pref_auto_update_subscription">自動更新訂閱</string>
+    <string name="summary_pref_auto_update_subscription">在後台以一定時間間隔自動更新您的訂閱</string>
+    <string name="title_pref_auto_update_interval">訂閱自動更新間隔（分鐘）</string>
+
     <string name="title_core_loglevel">記錄層級</string>
     <string name="title_mode">模式</string>
     <string name="title_mode_help">輕觸以檢視說明</string>
@@ -182,6 +186,7 @@
     <string name="sub_setting_remarks">備註</string>
     <string name="sub_setting_url">Optional URL</string>
     <string name="sub_setting_enable">啟用更新</string>
+    <string name="sub_auto_update">自動更新</string>
     <string name="title_sub_update">更新訂閱</string>
     <string name="title_ping_all_server">偵測所有組態 Tcping</string>
     <string name="title_real_ping_all_server">偵測所有組態真延遲</string>