Add detailed subscription update result

2026-06-05 21:04:47 +08:00 · 2026-02-27 17:44:40 +08:00 · 2026-02-27 17:44:40 +08:00 · 7475d1757b
commit 7475d1757b
parent 5a16614a7b
14 changed files with 101 additions and 34 deletions
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionUpdateResult.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/SubscriptionUpdateResult.kt
@ -0,0 +1,24 @@
+package com.v2ray.ang.dto
+
+/**
+ * Result of subscription update operation
+ */
+data class SubscriptionUpdateResult(
+    val configCount: Int = 0,      // Total configs updated
+    val successCount: Int = 0,     // Subscriptions updated successfully
+    val failureCount: Int = 0,     // Subscriptions failed to update
+    val skipCount: Int = 0         // Subscriptions skipped (disabled)
+) {
+    /**
+     * Combine two results by adding their counts
+     */
+    operator fun plus(other: SubscriptionUpdateResult): SubscriptionUpdateResult {
+        return SubscriptionUpdateResult(
+            configCount = this.configCount + other.configCount,
+            successCount = this.successCount + other.successCount,
+            failureCount = this.failureCount + other.failureCount,
+            skipCount = this.skipCount + other.skipCount
+        )
+    }
+}
+
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt
@ -10,6 +10,7 @@ import com.v2ray.ang.R
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.SubscriptionUpdateResult
 import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.fmt.CustomFmt
@ -433,45 +434,48 @@ object AngConfigManager {
    /**
     * Updates the configuration via all subscriptions.
     *
-     * @return The number of configurations updated.
+     * @return Detailed result of the subscription update operation.
     */
-    fun updateConfigViaSubAll(): Int {
-        var count = 0
-        try {
-            MmkvManager.decodeSubscriptions().forEach {
-                count += updateConfigViaSub(it)
+    fun updateConfigViaSubAll(): SubscriptionUpdateResult {
+        return try {
+            val subscriptions = MmkvManager.decodeSubscriptions()
+            subscriptions.fold(SubscriptionUpdateResult()) { acc, subscription ->
+                acc + updateConfigViaSub(subscription)
            }
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to update config via all subscriptions", e)
-            return 0
+            SubscriptionUpdateResult()
        }
-        return count
    }

    /**
     * Updates the configuration via a subscription.
     *
     * @param it The subscription item.
-     * @return The number of configurations updated.
+     * @return Subscription update result.
     */
-    fun updateConfigViaSub(it: SubscriptionCache): Int {
+    fun updateConfigViaSub(it: SubscriptionCache): SubscriptionUpdateResult {
        try {
+            // Check if disabled
+            if (!it.subscription.enabled) {
+                return SubscriptionUpdateResult(skipCount = 1)
+            }
+
+            // Validate subscription info
            if (TextUtils.isEmpty(it.guid)
                || TextUtils.isEmpty(it.subscription.remarks)
                || TextUtils.isEmpty(it.subscription.url)
            ) {
-                return 0
-            }
-            if (!it.subscription.enabled) {
-                return 0
+                return SubscriptionUpdateResult(skipCount = 1)
            }
+
            val url = HttpUtil.toIdnUrl(it.subscription.url)
            if (!Utils.isValidUrl(url)) {
-                return 0
+                return SubscriptionUpdateResult(failureCount = 1)
            }
            if (!it.subscription.allowInsecureUrl) {
                if (!Utils.isValidSubUrl(url)) {
-                    return 0
+                    return SubscriptionUpdateResult(failureCount = 1)
                }
            }
            Log.i(AppConfig.TAG, url)
@ -493,18 +497,25 @@ object AngConfigManager {
                }
            }
            if (configText.isEmpty()) {
-                return 0
+                return SubscriptionUpdateResult(failureCount = 1)
            }
+
            val count = parseConfigViaSub(configText, it.guid, false)
            if (count > 0) {
                it.subscription.lastUpdated = System.currentTimeMillis()
                MmkvManager.encodeSubscription(it.guid, it.subscription)
                Log.i(AppConfig.TAG, "Subscription updated: ${it.subscription.remarks}, $count configs")
+                return SubscriptionUpdateResult(
+                    configCount = count,
+                    successCount = 1
+                )
+            } else {
+                // Got response but no valid configs parsed
+                return SubscriptionUpdateResult(failureCount = 1)
            }
-            return count
        } catch (e: Exception) {
            Log.e(AppConfig.TAG, "Failed to update config via subscription", e)
-            return 0
+            return SubscriptionUpdateResult(failureCount = 1)
        }
    }

--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainActivity.kt
@ -437,14 +437,23 @@ class MainActivity : HelperBaseActivity(), NavigationView.OnNavigationItemSelect
        showLoading()

        lifecycleScope.launch(Dispatchers.IO) {
-            val count = mainViewModel.updateConfigViaSubAll()
+            val result = mainViewModel.updateConfigViaSubAll()
            delay(500L)
            launch(Dispatchers.Main) {
-                if (count > 0) {
-                    toast(getString(R.string.title_update_config_count, count))
-                    mainViewModel.reloadServerList()
+                if (result.successCount + result.failureCount + result.skipCount == 0) {
+                    toast(R.string.title_update_subscription_no_subscription)
+                } else if (result.successCount > 0 && result.failureCount + result.skipCount == 0) {
+                    toast(getString(R.string.title_update_config_count, result.configCount))
                } else {
-                    toastError(R.string.toast_failure)
+                    toast(
+                        getString(
+                            R.string.title_update_subscription_result,
+                            result.configCount, result.successCount, result.failureCount, result.skipCount
+                        )
+                    )
+                }
+                if (result.configCount > 0) {
+                    mainViewModel.reloadServerList()
                }
                hideLoading()
            }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingActivity.kt
@ -18,8 +18,6 @@ import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ActivitySubSettingBinding
 import com.v2ray.ang.databinding.ItemQrcodeBinding
 import com.v2ray.ang.extension.toast
-import com.v2ray.ang.extension.toastError
-import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
@ -77,14 +75,20 @@ class SubSettingActivity : BaseActivity() {
            showLoading()

            lifecycleScope.launch(Dispatchers.IO) {
-                val count = AngConfigManager.updateConfigViaSubAll()
+                val result = AngConfigManager.updateConfigViaSubAll()
                delay(500L)
                launch(Dispatchers.Main) {
-                    if (count > 0) {
-                        toastSuccess(R.string.toast_success)
-                        refreshData()
+                    if (result.successCount + result.failureCount + result.skipCount == 0) {
+                        toast(R.string.title_update_subscription_no_subscription)
+                    } else if (result.successCount > 0 && result.failureCount + result.skipCount == 0) {
+                        toast(getString(R.string.title_update_config_count, result.configCount))
                    } else {
-                        toastError(R.string.toast_failure)
+                        toast(
+                            getString(
+                                R.string.title_update_subscription_result,
+                                result.configCount, result.successCount, result.failureCount, result.skipCount
+                            )
+                        )
                    }
                    hideLoading()
                }
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
@ -17,6 +17,7 @@ import com.v2ray.ang.R
 import com.v2ray.ang.dto.GroupMapItem
 import com.v2ray.ang.dto.ServersCache
 import com.v2ray.ang.dto.SubscriptionCache
+import com.v2ray.ang.dto.SubscriptionUpdateResult
 import com.v2ray.ang.extension.serializable
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
@ -183,13 +184,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {

    /**
     * Updates the configuration via subscription for all servers.
-     * @return The number of updated configurations.
+     * @return Detailed result of the subscription update operation.
     */
-    fun updateConfigViaSubAll(): Int {
+    fun updateConfigViaSubAll(): SubscriptionUpdateResult {
        if (subscriptionId.isEmpty()) {
            return AngConfigManager.updateConfigViaSubAll()
        } else {
-            val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return 0
+            val subItem = MmkvManager.decodeSubscription(subscriptionId) ?: return SubscriptionUpdateResult()
            return AngConfigManager.updateConfigViaSub(SubscriptionCache(subscriptionId, subItem))
        }
    }
--- a/V2rayNG/app/src/main/res/values-ar/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ar/strings.xml
@ -297,6 +297,8 @@
    <string name="title_import_config_count">Import %d configurations</string>
    <string name="title_export_config_count">Export %d configurations</string>
    <string name="title_update_config_count">Update %d configurations</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>
    <string name="tasker_start_service">بدء الخدمة</string>
    <string name="tasker_setting_confirm">تأكيد</string>

--- a/V2rayNG/app/src/main/res/values-bn/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bn/strings.xml
@ -296,6 +296,8 @@
    <string name="title_import_config_count">Import %d configurations</string>
    <string name="title_export_config_count">Export %d configurations</string>
    <string name="title_update_config_count">Update %d configurations</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>
    <string name="tasker_start_service">সার্ভিস শুরু করুন</string>
    <string name="tasker_setting_confirm">নিশ্চিত করুন</string>

--- a/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+++ b/V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
@ -297,6 +297,8 @@
    <string name="title_import_config_count">و من ٱووردن %d کانفیگ</string>
    <string name="title_export_config_count">و در کشیڌن %d کانفیگ</string>
    <string name="title_update_config_count">ورۊ کردن %d کانفیگ</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>
    <string name="tasker_start_service">ره وندن خدمات</string>
    <string name="tasker_setting_confirm">قوۊل</string>

--- a/V2rayNG/app/src/main/res/values-fa/strings.xml
+++ b/V2rayNG/app/src/main/res/values-fa/strings.xml
@ -294,6 +294,8 @@
    <string name="title_import_config_count">وارد کردن %d کانفیگ</string>
    <string name="title_export_config_count">صادر کردن %d کانفیگ</string>
    <string name="title_update_config_count">آپدیت کردن %d کانفیگ</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>
    <string name="tasker_start_service">شروع خدمات</string>
    <string name="tasker_setting_confirm">تایید</string>

--- a/V2rayNG/app/src/main/res/values-ru/strings.xml
+++ b/V2rayNG/app/src/main/res/values-ru/strings.xml
@ -295,6 +295,8 @@
    <string name="title_import_config_count">Импортировано профилей: %d</string>
    <string name="title_export_config_count">Экспортировано профилей: %d</string>
    <string name="title_update_config_count">Обновлено профилей: %d</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>

    <string name="tasker_start_service">Запуск службы</string>
    <string name="tasker_setting_confirm">Подтвердить</string>
--- a/V2rayNG/app/src/main/res/values-vi/strings.xml
+++ b/V2rayNG/app/src/main/res/values-vi/strings.xml
@ -297,6 +297,8 @@
    <string name="title_import_config_count">Import %d configurations</string>
    <string name="title_export_config_count">Export %d configurations</string>
    <string name="title_update_config_count">Update %d configurations</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>
    <string name="tasker_start_service">Khởi động v2rayNG</string>
    <string name="tasker_setting_confirm">Xác nhận</string>

--- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@ -295,6 +295,8 @@
    <string name="title_import_config_count">导入 %d 个配置</string>
    <string name="title_export_config_count">导出 %d 个配置</string>
    <string name="title_update_config_count">更新 %d 个配置</string>
+    <string name="title_update_subscription_result">更新了 %1$d 个配置（%2$d 个成功，%3$d 个失败，%4$d 个跳过）</string>
+    <string name="title_update_subscription_no_subscription">无订阅</string>
    <string name="tasker_start_service">启动服务</string>
    <string name="tasker_setting_confirm">确定</string>

--- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@ -295,6 +295,8 @@
    <string name="title_import_config_count">匯入 %d 個配置</string>
    <string name="title_export_config_count">匯出 %d 個配置</string>
    <string name="title_update_config_count">更新 %d 個配置</string>
+    <string name="title_update_subscription_result">更新了 %1$d 個配置（%2$d 個成功，%3$d 個失敗，%4$d 個跳過）</string>
+    <string name="title_update_subscription_no_subscription">無訂閱</string>
    <string name="tasker_start_service">啟動服務</string>
    <string name="tasker_setting_confirm">確定</string>

--- a/V2rayNG/app/src/main/res/values/strings.xml
+++ b/V2rayNG/app/src/main/res/values/strings.xml
@ -301,6 +301,8 @@
    <string name="title_import_config_count">Import %d configs</string>
    <string name="title_export_config_count">Export %d configs</string>
    <string name="title_update_config_count">Update %d configs</string>
+    <string name="title_update_subscription_result">Updated %1$d configs (%2$d success, %3$d failed, %4$d skipped)</string>
+    <string name="title_update_subscription_no_subscription">No subscriptions</string>

    <string name="tasker_start_service">Start Service</string>
    <string name="tasker_setting_confirm">Confirm</string>