up 2.0.11

Introduce subscription-based server storage and migration from legacy KEY_ANG_CONFIGS. Added DEFAULT_SUBSCRIPTION_ID and new MmkvManager APIs to encode/decode server lists per subscription, decodeAllServerList, and readLegacyServerList; included helper getSubscriptionId and protection against deleting the default subscription. Refactored SettingsManager into initApp to ensure defaults, create a default subscription, initialize routing rulesets and perform server-list migration and other migrations. Updated callers (V2rayConfigManager, BackupActivity, GroupServerFragment, SubEditActivity, SubSettingRecyclerAdapter, TaskerActivity, MainViewModel) to use the new APIs and to handle subscriptionId where appropriate (including UI changes to hide delete for default subscription). Preserved legacy logic as commented references and added migration markers to avoid repeated migrations. Overall change enables grouping servers by subscription and provides a migration path for existing installations.

V2rayNG/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.v2ray.ang"
         minSdk = 24
         targetSdk = 36
-        versionCode = 709
-        versionName = "2.0.9"
+        versionCode = 711
+        versionName = "2.0.11"
         multiDexEnabled = true
 
         val abiFilterList = (properties["ABI_FILTERS"] as? String)?.split(';')

V2rayNG/app/src/main/java/com/v2ray/ang/AngApplication.kt

@@ -34,17 +34,15 @@ class AngApplication : MultiDexApplication() {
 
         MMKV.initialize(this)
 
-        // Ensure critical preference defaults are present in MMKV early
-        SettingsManager.ensureDefaultSettings()
-        SettingsManager.setNightMode()
         // Initialize WorkManager with the custom configuration
         WorkManager.initialize(this, workManagerConfiguration)
 
-        SettingsManager.initRoutingRulesets(this)
-        SettingsManager.migrateHysteria2PinSHA256()
+        // Ensure critical preference defaults are present in MMKV early
+        SettingsManager.initApp(this)
+        SettingsManager.setNightMode()
 
         es.dmoral.toasty.Toasty.Config.getInstance()
-            .setGravity(android.view.Gravity.BOTTOM, 0, 200)
+            .setGravity(android.view.Gravity.BOTTOM, 0, 300)
             .apply()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt

@@ -16,6 +16,9 @@ object AppConfig {
     /** Legacy configuration keys. */
     const val ANG_CONFIG = "ang_config"
 
+    // Default subscription ID for ungrouped servers
+    const val DEFAULT_SUBSCRIPTION_ID = "__default_subscription__"
+
     /** Preferences mapped to MMKV storage. */
     const val PREF_SNIFFING_ENABLED = "pref_sniffing_enabled"
     const val PREF_ROUTE_ONLY_ENABLED = "pref_route_only_enabled"
@@ -48,6 +51,7 @@ object AppConfig {
     const val PREF_CONFIRM_REMOVE = "pref_confirm_remove"
     const val PREF_START_SCAN_IMMEDIATE = "pref_start_scan_immediate"
     const val PREF_DOUBLE_COLUMN_DISPLAY = "pref_double_column_display"
+    const val PREF_GROUP_ALL_DISPLAY = "pref_group_all_display"
     const val PREF_LANGUAGE = "pref_language"
     const val PREF_UI_MODE_NIGHT = "pref_ui_mode_night"
     const val PREF_PREFER_IPV6 = "pref_prefer_ipv6"

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/CustomFmt.kt

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.util.JsonUtil
 
 object CustomFmt : FmtBase() {

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.HttpUtil

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.V2rayConfigManager
 

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/Hysteria2Fmt.kt

@@ -1,11 +1,11 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean.FinalMaskBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.nullIfBlank

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt

@@ -2,10 +2,10 @@ package com.v2ray.ang.fmt
 
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.V2rayConfigManager
 import com.v2ray.ang.util.Utils

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt

@@ -1,8 +1,8 @@
 package com.v2ray.ang.fmt
 
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.handler.V2rayConfigManager

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt

@@ -1,10 +1,10 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt

@@ -1,9 +1,9 @@
 package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2rayConfigManager

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt

@@ -3,11 +3,11 @@ package com.v2ray.ang.fmt
 import android.text.TextUtils
 import android.util.Log
 import com.v2ray.ang.AppConfig
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.VmessQRCode
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.handler.MmkvManager

V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt

@@ -2,9 +2,9 @@ package com.v2ray.ang.fmt
 
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.idnHost
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.extension.removeWhiteSpace

V2rayNG/app/src/main/java/com/v2ray/ang/handler/AngConfigManager.kt

@@ -7,10 +7,11 @@ import android.util.Log
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.HY2
 import com.v2ray.ang.R
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.SubscriptionCache
 import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.fmt.CustomFmt
 import com.v2ray.ang.fmt.Hysteria2Fmt
 import com.v2ray.ang.fmt.ShadowsocksFmt
@@ -237,23 +238,77 @@ object AngConfigManager {
             }
 
             val subItem = MmkvManager.decodeSubscription(subid)
-            var count = 0
+
+            // Parse all configs first (no I/O during parsing)
+            val configs = mutableListOf<ProfileItem>()
             servers.lines()
                 .distinct()
                 .reversed()
                 .forEach {
-                    val resId = parseConfig(it, subid, subItem, removedSelectedServer)
-                    if (resId == 0) {
-                        count++
+                    val config = parseConfig(it, subid, subItem)
+                    if (config != null) {
+                        configs.add(config)
                     }
                 }
-            return count
+
+            // Batch save all parsed configs (only one serverList read/write)
+            if (configs.isNotEmpty()) {
+                val keys = batchSaveConfigs(configs, subid)
+
+                // Handle removed selected server
+                removedSelectedServer?.let { removed ->
+                    val matchKey = keys.find { key ->
+                        val savedConfig = MmkvManager.decodeServerConfig(key)
+                        savedConfig != null &&
+                                savedConfig.server == removed.server &&
+                                savedConfig.serverPort == removed.serverPort
+                    }
+                    matchKey?.let { MmkvManager.setSelectServer(it) }
+                }
+            }
+
+            return configs.size
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to parse batch config", e)
         }
         return 0
     }
 
+    /**
+     * Batch save configurations to reduce serverList read/write operations.
+     * Reads serverList once, saves all configs, then writes serverList once.
+     *
+     * @param configs The list of ProfileItem to save.
+     * @param subid The subscription ID.
+     * @return The list of generated keys.
+     */
+    private fun batchSaveConfigs(configs: List<ProfileItem>, subid: String): List<String> {
+        val keys = mutableListOf<String>()
+
+        // Read serverList once
+        val serverList = MmkvManager.decodeServerList(subid)
+        var needSetSelected = MmkvManager.getSelectServer().isNullOrBlank()
+
+        configs.forEach { config ->
+            val key = Utils.getUuid()
+            // Save profile directly without updating serverList
+            MmkvManager.encodeProfileDirect(key, JsonUtil.toJson(config))
+
+            if (!serverList.contains(key)) {
+                serverList.add(0, key)
+                if (needSetSelected) {
+                    MmkvManager.setSelectServer(key)
+                    needSetSelected = false
+                }
+            }
+            keys.add(key)
+        }
+
+        // Write serverList once
+        MmkvManager.encodeServerList(serverList, subid)
+        return keys
+    }
+
     /**
      * Parses a custom configuration server.
      *
@@ -319,22 +374,21 @@ object AngConfigManager {
 
     /**
      * Parses the configuration from a QR code or string.
+     * Only parses and returns ProfileItem, does not save.
      *
      * @param str The configuration string.
      * @param subid The subscription ID.
      * @param subItem The subscription item.
-     * @param removedSelectedServer The removed selected server.
-     * @return The result code.
+     * @return The parsed ProfileItem or null if parsing fails or filtered out.
      */
     private fun parseConfig(
         str: String?,
         subid: String,
-        subItem: SubscriptionItem?,
-        removedSelectedServer: ProfileItem?
-    ): Int {
+        subItem: SubscriptionItem?
+    ): ProfileItem? {
         try {
             if (str == null || TextUtils.isEmpty(str)) {
-                return R.string.toast_none_data
+                return null
             }
 
             val config = if (str.startsWith(EConfigType.VMESS.protocolScheme)) {
@@ -356,28 +410,24 @@ object AngConfigManager {
             }
 
             if (config == null) {
-                return R.string.toast_incorrect_protocol
+                return null
             }
-            //filter
-            if (subItem?.filter != null && subItem.filter?.isNotEmpty() == true && config.remarks.isNotEmpty()) {
-                val matched = Regex(pattern = subItem.filter ?: "")
+
+            // Apply filter
+            if (subItem?.filter.isNotNullEmpty() && config.remarks.isNotNullEmpty()) {
+                val matched = Regex(pattern = subItem?.filter.orEmpty())
                     .containsMatchIn(input = config.remarks)
-                if (!matched) return -1
+                if (!matched) return null
             }
 
             config.subscriptionId = subid
             config.description = generateDescription(config)
-            val guid = MmkvManager.encodeServerConfig("", config)
-            if (removedSelectedServer != null &&
-                config.server == removedSelectedServer.server && config.serverPort == removedSelectedServer.serverPort
-            ) {
-                MmkvManager.setSelectServer(guid)
-            }
+
+            return config
         } catch (e: Exception) {
             Log.e(AppConfig.TAG, "Failed to parse config", e)
-            return -1
+            return null
         }
-        return 0
     }
 
     /**

V2rayNG/app/src/main/java/com/v2ray/ang/handler/MmkvManager.kt

@@ -1,6 +1,7 @@
 package com.v2ray.ang.handler
 
 import com.tencent.mmkv.MMKV
+import com.v2ray.ang.AppConfig.DEFAULT_SUBSCRIPTION_ID
 import com.v2ray.ang.AppConfig.PREF_IS_BOOTED
 import com.v2ray.ang.AppConfig.PREF_ROUTING_RULESET
 import com.v2ray.ang.dto.AssetUrlCache
@@ -28,6 +29,7 @@ object MmkvManager {
     private const val ID_SETTING = "SETTING"
     private const val KEY_SELECTED_SERVER = "SELECTED_SERVER"
     private const val KEY_ANG_CONFIGS = "ANG_CONFIGS"
+    private const val KEY_SUB_SERVER_PREFIX = "SUB_SERVERS_"
     private const val KEY_SUB_IDS = "SUB_IDS"
     private const val KEY_WEBDAV_CONFIG = "WEBDAV_CONFIG"
 
@@ -44,6 +46,24 @@ object MmkvManager {
 
     //region Server
 
+    /**
+     * Reads the legacy server list from KEY_ANG_CONFIGS for migration.
+     * This method is for migration purposes only.
+     *
+     * @return The JSON string of legacy server list, or null if not exists.
+     */
+    fun readLegacyServerList(): String? {
+        return mainStorage.decodeString(KEY_ANG_CONFIGS)
+    }
+
+//    /**
+//     * Removes the legacy KEY_ANG_CONFIGS after migration.
+//     * This method is for migration purposes only.
+//     */
+//    fun removeLegacyServerListKey() {
+//        mainStorage.remove(KEY_ANG_CONFIGS)
+//    }
+
     /**
      * Gets the selected server GUID.
      *
@@ -63,19 +83,65 @@ object MmkvManager {
     }
 
     /**
-     * Encodes the server list.
+     * Encodes the server list for a given subscription.
+     * Saves to the subscription's serverList (including default subscription for ungrouped servers).
      *
      * @param serverList The list of server GUIDs.
+     * @param subscriptionId The subscription ID.
      */
+    fun encodeServerList(serverList: MutableList<String>, subscriptionId: String) {
+        val subId = getSubscriptionId(subscriptionId)
+        val key = "$KEY_SUB_SERVER_PREFIX$subId"
+        mainStorage.encode(key, JsonUtil.toJson(serverList))
+    }
+
+    // Legacy method for compatibility
+    // TODO: Remove after migration and update all callers
+    /*
     fun encodeServerList(serverList: MutableList<String>) {
         mainStorage.encode(KEY_ANG_CONFIGS, JsonUtil.toJson(serverList))
     }
+    */
 
     /**
-     * Decodes the server list.
+     * Decodes the server list for a given subscription.
+     * If subscriptionId is empty, returns ungrouped servers.
+     * Otherwise, returns servers from the specified subscription's serverList.
      *
+     * @param subscriptionId The subscription ID.
      * @return The list of server GUIDs.
      */
+    fun decodeServerList(subscriptionId: String): MutableList<String> {
+        val subId = getSubscriptionId(subscriptionId)
+        val key = "$KEY_SUB_SERVER_PREFIX$subId"
+        val json = mainStorage.decodeString(key)
+        return if (json.isNullOrBlank()) {
+            mutableListOf()
+        } else {
+            JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList() ?: mutableListOf()
+        }
+    }
+
+    /**
+     * Decodes all server list (merged from all subscriptions including default subscription).
+     * Use this when you need the complete server list.
+     *
+     * @return The list of all server GUIDs.
+     */
+    fun decodeAllServerList(): MutableList<String> {
+        val allServers = mutableListOf<String>()
+
+        // Add servers from all subscriptions (including default subscription)
+        decodeSubsList().forEach { guid ->
+            allServers.addAll(decodeServerList(guid))
+        }
+
+        return allServers
+    }
+
+    // Legacy method for compatibility - reads all servers
+    // TODO: Remove after migration and update all callers
+    /*
     fun decodeServerList(): MutableList<String> {
         val json = mainStorage.decodeString(KEY_ANG_CONFIGS)
         return if (json.isNullOrBlank()) {
@@ -84,6 +150,7 @@ object MmkvManager {
             JsonUtil.fromJson(json, Array<String>::class.java)?.toMutableList() ?: mutableListOf()
         }
     }
+    */
 
     /**
      * Decodes the server configuration.
@@ -123,6 +190,21 @@ object MmkvManager {
     fun encodeServerConfig(guid: String, config: ProfileItem): String {
         val key = guid.ifBlank { Utils.getUuid() }
         profileFullStorage.encode(key, JsonUtil.toJson(config))
+
+        // Use default subscription for servers without subscription
+        val subId = getSubscriptionId(config.subscriptionId)
+        val serverList = decodeServerList(subId)
+
+        if (!serverList.contains(key)) {
+            serverList.add(0, key)
+            encodeServerList(serverList, subId)
+            if (getSelectServer().isNullOrBlank()) {
+                mainStorage.encode(KEY_SELECTED_SERVER, key)
+            }
+        }
+
+        // Legacy code - keep for reference during migration
+        /*
         val serverList = decodeServerList()
         if (!serverList.contains(key)) {
             serverList.add(0, key)
@@ -131,6 +213,7 @@ object MmkvManager {
                 mainStorage.encode(KEY_SELECTED_SERVER, key)
             }
         }
+        */
 //        val profile = ProfileLiteItem(
 //            configType = config.configType,
 //            subscriptionId = config.subscriptionId,
@@ -142,6 +225,16 @@ object MmkvManager {
         return key
     }
 
+    /**
+     * Encodes the server configuration directly without updating serverList.
+     *
+     * @param key The server GUID.
+     * @param configJson The server configuration JSON string.
+     */
+    fun encodeProfileDirect(key: String, configJson: String) {
+        profileFullStorage.encode(key, configJson)
+    }
+
     /**
      * Removes the server configuration.
      *
@@ -151,12 +244,30 @@ object MmkvManager {
         if (guid.isBlank()) {
             return
         }
+
+        // Get config to determine which subscription to update
+        val config = decodeServerConfig(guid)
+        val subId = getSubscriptionId(config?.subscriptionId)
+
+        // Remove from appropriate server list
+        val serverList = decodeServerList(subId)
+        serverList.remove(guid)
+        encodeServerList(serverList, subId)
+
+        // Legacy code - keep for reference during migration
+        /*
         if (getSelectServer() == guid) {
             mainStorage.remove(KEY_SELECTED_SERVER)
         }
         val serverList = decodeServerList()
         serverList.remove(guid)
         encodeServerList(serverList)
+        */
+
+        // Clean up storage
+        if (getSelectServer() == guid) {
+            mainStorage.remove(KEY_SELECTED_SERVER)
+        }
         profileFullStorage.remove(guid)
         //profileStorage.remove(guid)
         serverAffStorage.remove(guid)
@@ -165,12 +276,26 @@ object MmkvManager {
     /**
      * Removes the server configurations via subscription ID.
      *
-     * @param subid The subscription ID.
+     * @param subscriptionId The subscription ID.
      */
-    fun removeServerViaSubid(subid: String) {
-        if (subid.isBlank()) {
-            return
+    fun removeServerViaSubid(subscriptionId: String?) {
+        val subId = getSubscriptionId(subscriptionId)
+        val serverList = decodeServerList(subId)
+
+        // Remove all servers in the list
+        serverList.forEach { guid ->
+            if (getSelectServer() == guid) {
+                mainStorage.remove(KEY_SELECTED_SERVER)
+            }
+            profileFullStorage.remove(guid)
+            serverAffStorage.remove(guid)
         }
+
+        serverList.clear()
+        encodeServerList(serverList, subId)
+
+        // Legacy code - keep for reference during migration
+        /*
         profileFullStorage.allKeys()?.forEach { key ->
             decodeServerConfig(key)?.let { config ->
                 if (config.subscriptionId == subid) {
@@ -178,6 +303,7 @@ object MmkvManager {
                 }
             }
         }
+        */
     }
 
     /**
@@ -292,6 +418,10 @@ object MmkvManager {
 
     //region Subscriptions
 
+    private fun getSubscriptionId(subscriptionId: String?):String {
+        return subscriptionId?.ifEmpty { DEFAULT_SUBSCRIPTION_ID } ?: DEFAULT_SUBSCRIPTION_ID
+    }
+
     /**
      * Initializes the subscription list.
      */
@@ -331,6 +461,11 @@ object MmkvManager {
      * @param subid The subscription ID.
      */
     fun removeSubscription(subid: String) {
+        // Protect default subscription from being deleted
+        if (subid == DEFAULT_SUBSCRIPTION_ID) {
+            return
+        }
+
         subStorage.remove(subid)
         val subsList = decodeSubsList()
         subsList.remove(subid)

V2rayNG/app/src/main/java/com/v2ray/ang/handler/NotificationManager.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
+import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import com.v2ray.ang.AppConfig
@@ -30,6 +31,7 @@ object NotificationManager {
     private const val NOTIFICATION_PENDING_INTENT_STOP_V2RAY = 1
     private const val NOTIFICATION_PENDING_INTENT_RESTART_V2RAY = 2
     private const val NOTIFICATION_ICON_THRESHOLD = 3000
+    private const val QUERY_INTERVAL_MS = 3000L
 
     private var lastQueryTime = 0L
     private var mBuilder: NotificationCompat.Builder? = null
@@ -44,7 +46,6 @@ object NotificationManager {
         if (MmkvManager.decodeSettingsBool(AppConfig.PREF_SPEED_ENABLED) != true) return
         if (speedNotificationJob != null || V2RayServiceManager.isRunning() == false) return
 
-        lastQueryTime = System.currentTimeMillis()
         var lastZeroSpeed = false
         val outboundTags = currentConfig?.getAllOutboundTags()
         outboundTags?.remove(AppConfig.TAG_DIRECT)
@@ -52,7 +53,17 @@ object NotificationManager {
         speedNotificationJob = CoroutineScope(Dispatchers.IO).launch {
             while (isActive) {
                 val queryTime = System.currentTimeMillis()
-                val sinceLastQueryInSeconds = (queryTime - lastQueryTime) / 1000.0
+                val sinceLastQueryIn = (queryTime - lastQueryTime)
+
+                // If the query interval is too short, skip this round to avoid excessive CPU usage
+                if (sinceLastQueryIn < QUERY_INTERVAL_MS) {
+                    Log.w(AppConfig.TAG, "Query interval too short: ${sinceLastQueryIn}ms, skipping")
+                    lastQueryTime = queryTime
+                    delay(QUERY_INTERVAL_MS)
+                    continue
+                }
+                val sinceLastQueryInSeconds = sinceLastQueryIn / 1000.0
+
                 var proxyTotal = 0L
                 val text = StringBuilder()
                 outboundTags?.forEach {
@@ -78,7 +89,7 @@ object NotificationManager {
                 }
                 lastZeroSpeed = zeroSpeed
                 lastQueryTime = queryTime
-                delay(3000)
+                delay(QUERY_INTERVAL_MS)
             }
         }
     }
@@ -89,6 +100,10 @@ object NotificationManager {
      */
     fun showNotification(currentConfig: ProfileItem?) {
         val service = getService() ?: return
+
+        // Reset last query time to avoid querying stats too soon after showing the notification
+        lastQueryTime = System.currentTimeMillis()
+
         val flags = PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
 
         val startMainIntent = Intent(service, MainActivity::class.java)

V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsManager.kt

@@ -7,20 +7,24 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.DEFAULT_SUBSCRIPTION_ID
 import com.v2ray.ang.AppConfig.GEOIP_PRIVATE
 import com.v2ray.ang.AppConfig.GEOSITE_PRIVATE
 import com.v2ray.ang.AppConfig.TAG_DIRECT
 import com.v2ray.ang.AppConfig.VPN
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.dto.RulesetItem
+import com.v2ray.ang.dto.SubscriptionItem
+import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.enums.Language
-import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.enums.RoutingType
-import com.v2ray.ang.dto.RulesetItem
-import com.v2ray.ang.dto.ServersCache
-import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.enums.VpnInterfaceAddressConfig
+import com.v2ray.ang.handler.MmkvManager.decodeAllServerList
 import com.v2ray.ang.handler.MmkvManager.decodeServerConfig
-import com.v2ray.ang.handler.MmkvManager.decodeServerList
+import com.v2ray.ang.handler.MmkvManager.decodeSubsList
+import com.v2ray.ang.handler.MmkvManager.decodeSubscription
+import com.v2ray.ang.handler.MmkvManager.encodeSubscription
 import com.v2ray.ang.util.JsonUtil
 import com.v2ray.ang.util.Utils
 import java.io.File
@@ -30,11 +34,19 @@ import java.util.Locale
 
 object SettingsManager {
 
+    fun initApp(context: Context) {
+        ensureDefaultSettings()
+        ensureDefaultSubscription()
+        initRoutingRulesets(context)
+        migrateServerListToSubscriptions()
+        migrateHysteria2PinSHA256()
+    }
+
     /**
      * Initialize routing rulesets.
      * @param context The application context.
      */
-    fun initRoutingRulesets(context: Context) {
+    private fun initRoutingRulesets(context: Context) {
         val exist = MmkvManager.decodeRoutingRulesets()
         if (exist.isNullOrEmpty()) {
             val rulesetList = getPresetRoutingRulesets(context)
@@ -222,14 +234,10 @@ object SettingsManager {
         if (remarks.isNullOrEmpty()) {
             return null
         }
-        val serverList = decodeServerList()
-        for (guid in serverList) {
-            val profile = decodeServerConfig(guid)
-            if (profile != null && profile.remarks == remarks) {
-                return profile
-            }
-        }
-        return null
+        val serverList = decodeAllServerList()
+        return serverList
+            .mapNotNull { guid -> decodeServerConfig(guid) }
+            .firstOrNull { it.remarks == remarks }
     }
 
     /**
@@ -400,7 +408,7 @@ object SettingsManager {
     /**
      * Ensure default settings are present in MMKV.
      */
-    fun ensureDefaultSettings() {
+    private fun ensureDefaultSettings() {
         // Write defaults in the exact order requested by the user
         ensureDefaultValue(AppConfig.PREF_MODE, AppConfig.VPN)
         ensureDefaultValue(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
@@ -424,14 +432,14 @@ object SettingsManager {
         }
     }
 
-    fun migrateHysteria2PinSHA256() {
+    private fun migrateHysteria2PinSHA256() {
         // Check if migration has already been done
         val migrationKey = "hysteria2_pin_sha256_migrated"
         if (MmkvManager.decodeSettingsBool(migrationKey, false)) {
             return
         }
 
-        val serverList = decodeServerList()
+        val serverList = decodeAllServerList()
 
         for (guid in serverList) {
             val profile = decodeServerConfig(guid) ?: continue
@@ -449,4 +457,76 @@ object SettingsManager {
         MmkvManager.encodeSettings(migrationKey, true)
     }
 
+    /**
+     * Migrates server list from legacy KEY_ANG_CONFIGS to subscription-based storage.
+     * This method should be called once during app initialization after the storage structure change.
+     * Servers are grouped by their subscriptionId into respective subscription's serverList.
+     * Servers without subscription are moved to the default subscription.
+     * After migration, KEY_ANG_CONFIGS is removed.
+     */
+    private fun migrateServerListToSubscriptions() {
+        // Check if migration has already been done
+        val migrationKey = "server_list_to_subscriptions_migrated"
+        if (MmkvManager.decodeSettingsBool(migrationKey, false)) {
+            return
+        }
+
+        // Ensure default subscription exists before migration
+        ensureDefaultSubscription()
+
+        // Read existing server list from legacy KEY_ANG_CONFIGS
+        val oldJson = MmkvManager.readLegacyServerList()
+        if (oldJson.isNullOrBlank()) {
+            // No data to migrate, mark as done
+            MmkvManager.encodeSettings(migrationKey, true)
+            return
+        }
+
+        val guids = JsonUtil.fromJson(oldJson, Array<String>::class.java) ?: run {
+            MmkvManager.encodeSettings(migrationKey, true)
+            return
+        }
+
+        val subscriptionServerMap = mutableMapOf<String, MutableList<String>>()
+
+        // Group servers by subscription (use default subscription for empty subscriptionId)
+        guids.forEach { guid ->
+            val config = decodeServerConfig(guid) ?: return@forEach
+            val subId = config.subscriptionId.ifEmpty { DEFAULT_SUBSCRIPTION_ID }
+
+            subscriptionServerMap.getOrPut(subId) { mutableListOf() }.add(guid)
+        }
+
+        // Update each subscription's serverList (including default subscription)
+        subscriptionServerMap.forEach { (subId, serverGuids) ->
+            MmkvManager.encodeServerList(serverGuids, subId)
+        }
+
+        // Remove legacy KEY_ANG_CONFIGS data
+        // MmkvManager.removeLegacyServerListKey()
+
+        // Mark migration as complete
+        MmkvManager.encodeSettings(migrationKey, true)
+    }
+
+    /**
+     * Ensures the default subscription exists for ungrouped servers.
+     * This subscription is used internally to store servers without a subscription.
+     * Made public for migration in SettingsManager.
+     */
+    private fun ensureDefaultSubscription() {
+        if (decodeSubscription(DEFAULT_SUBSCRIPTION_ID) == null) {
+            val defaultSub = SubscriptionItem(
+                remarks = "Default",
+            )
+            encodeSubscription(DEFAULT_SUBSCRIPTION_ID, defaultSub)
+
+            // Move top
+            val subsList = decodeSubsList()
+            if (subsList.count() > 1) {
+                swapSubscriptions(0, subsList.count() - 1)
+            }
+        }
+    }
+
 }

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2RayServiceManager.kt

@@ -10,10 +10,10 @@ import android.util.Log
 import androidx.core.content.ContextCompat
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.dto.ProfileItem
-import com.v2ray.ang.extension.toast
 import com.v2ray.ang.contracts.ServiceControl
+import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.extension.toast
 import com.v2ray.ang.service.V2RayProxyOnlyService
 import com.v2ray.ang.service.V2RayVpnService
 import com.v2ray.ang.util.MessageUtil

V2rayNG/app/src/main/java/com/v2ray/ang/handler/V2rayConfigManager.kt

@@ -6,8 +6,6 @@ import android.util.Log
 import com.google.gson.JsonArray
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.dto.ConfigResult
-import com.v2ray.ang.enums.EConfigType
-import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.dto.RulesetItem
 import com.v2ray.ang.dto.V2rayConfig
@@ -15,6 +13,8 @@ import com.v2ray.ang.dto.V2rayConfig.OutboundBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.OutSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.OutboundBean.StreamSettingsBean
 import com.v2ray.ang.dto.V2rayConfig.RoutingBean.RulesBean
+import com.v2ray.ang.enums.EConfigType
+import com.v2ray.ang.enums.NetworkType
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.nullIfBlank
 import com.v2ray.ang.fmt.HttpFmt
@@ -139,7 +139,7 @@ object V2rayConfigManager {
     private fun getV2rayGroupConfig(context: Context, guid: String, config: ProfileItem): ConfigResult {
         val result = ConfigResult(false)
 
-        val serverList = MmkvManager.decodeServerList()
+        val serverList = MmkvManager.decodeAllServerList()
         val configList = serverList
             .mapNotNull { id -> MmkvManager.decodeServerConfig(id) }
             .filter { profile ->
@@ -776,13 +776,14 @@ object V2rayConfigManager {
                 || protocol.equals(EConfigType.TROJAN.name, true)
                 || protocol.equals(EConfigType.WIREGUARD.name, true)
                 || protocol.equals(EConfigType.HYSTERIA2.name, true)
+                || protocol.equals(EConfigType.HYSTERIA.name, true)
             ) {
                 muxEnabled = false
             } else if (outbound.streamSettings?.network == NetworkType.XHTTP.type) {
                 muxEnabled = false
             }
 
-            if (muxEnabled == true) {
+            if (muxEnabled) {
                 outbound.mux?.enabled = true
                 outbound.mux?.concurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_CONCURRENCY, "8").orEmpty().toInt()
                 outbound.mux?.xudpConcurrency = MmkvManager.decodeSettingsString(AppConfig.PREF_MUX_XUDP_CONCURRENCY, "16").orEmpty().toInt()

V2rayNG/app/src/main/java/com/v2ray/ang/helper/MmkvPreferenceDataStore.kt

@@ -79,5 +79,6 @@ class MmkvPreferenceDataStore : PreferenceDataStore() {
         }
         // Notify listeners that require service restart or reinit
         SettingsChangeManager.makeRestartService()
+        SettingsChangeManager.makeSetupGroupTab()
     }
 }

V2rayNG/app/src/main/java/com/v2ray/ang/service/V2RayTestService.kt

@@ -6,7 +6,7 @@ import android.os.IBinder
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG
 import com.v2ray.ang.AppConfig.MSG_MEASURE_CONFIG_CANCEL
-import com.v2ray.ang.extension.serializable
+import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.V2RayNativeManager
 import com.v2ray.ang.util.MessageUtil
 import java.util.Collections
@@ -54,8 +54,14 @@ class V2RayTestService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         when (intent?.getIntExtra("key", 0)) {
             MSG_MEASURE_CONFIG -> {
-                val guidsList = intent.serializable<ArrayList<String>>("content")
-                if (guidsList != null && guidsList.isNotEmpty()) {
+                val subscriptionId = intent.getStringExtra("content").orEmpty()
+                val guidsList = if (subscriptionId.isEmpty()) {
+                    MmkvManager.decodeAllServerList()
+                } else {
+                    MmkvManager.decodeServerList(subscriptionId)
+                }
+
+                if (guidsList.isNotEmpty()) {
                     lateinit var worker: RealPingWorkerService
                     worker = RealPingWorkerService(this, guidsList) { status ->
                         // notify UI and remove the worker from active list when finished

V2rayNG/app/src/main/java/com/v2ray/ang/ui/BackupActivity.kt

@@ -18,6 +18,7 @@ import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.handler.SettingsChangeManager
+import com.v2ray.ang.handler.SettingsManager
 import com.v2ray.ang.handler.WebDavManager
 import com.v2ray.ang.util.ZipUtil
 import kotlinx.coroutines.Dispatchers
@@ -124,6 +125,8 @@ class BackupActivity : HelperBaseActivity() {
         val count = MMKV.restoreAllFromDirectory(backupDir)
         SettingsChangeManager.makeSetupGroupTab()
         SettingsChangeManager.makeRestartService()
+
+        SettingsManager.initApp(this)
         return count > 0
     }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/GroupServerFragment.kt

@@ -16,8 +16,8 @@ import com.v2ray.ang.R
 import com.v2ray.ang.contracts.MainAdapterListener
 import com.v2ray.ang.databinding.FragmentGroupServerBinding
 import com.v2ray.ang.databinding.ItemQrcodeBinding
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastError
 import com.v2ray.ang.extension.toastSuccess
@@ -164,6 +164,7 @@ class GroupServerFragment : BaseFragment<FragmentGroupServerBinding>() {
         val intent = Intent().putExtra("guid", guid)
             .putExtra("isRunning", mainViewModel.isRunning.value)
             .putExtra("createConfigType", profile.configType.value)
+            .putExtra("subscriptionId", subId)
         when (profile.configType) {
             EConfigType.CUSTOM -> {
                 ownerActivity.startActivity(intent.setClass(ownerActivity, ServerCustomConfigActivity::class.java))

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerActivity.kt

@@ -20,9 +20,9 @@ import com.v2ray.ang.AppConfig.TLS
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
 import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_MTU
 import com.v2ray.ang.R
+import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.enums.NetworkType
-import com.v2ray.ang.dto.ProfileItem
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerCustomConfigActivity.kt

@@ -11,8 +11,8 @@ import com.blacksquircle.ui.language.json.JsonLanguage
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerCustomConfigBinding
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
 import com.v2ray.ang.fmt.CustomFmt

V2rayNG/app/src/main/java/com/v2ray/ang/ui/ServerGroupActivity.kt

@@ -8,12 +8,11 @@ import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ActivityServerGroupBinding
-import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.dto.ProfileItem
+import com.v2ray.ang.enums.EConfigType
 import com.v2ray.ang.extension.isNotNullEmpty
 import com.v2ray.ang.extension.toast
 import com.v2ray.ang.extension.toastSuccess
-import com.v2ray.ang.handler.AngConfigManager
 import com.v2ray.ang.handler.MmkvManager
 import com.v2ray.ang.util.Utils
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt

@@ -15,8 +15,8 @@ import com.v2ray.ang.AppConfig.VPN
 import com.v2ray.ang.R
 import com.v2ray.ang.extension.toLongEx
 import com.v2ray.ang.handler.MmkvManager
-import com.v2ray.ang.helper.MmkvPreferenceDataStore
 import com.v2ray.ang.handler.SubscriptionUpdater
+import com.v2ray.ang.helper.MmkvPreferenceDataStore
 import com.v2ray.ang.util.Utils
 import java.util.concurrent.TimeUnit
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubEditActivity.kt

@@ -145,7 +145,7 @@ class SubEditActivity : BaseActivity() {
         del_config = menu.findItem(R.id.del_config)
         save_config = menu.findItem(R.id.save_config)
 
-        if (editSubId.isEmpty()) {
+        if (editSubId.isEmpty() || editSubId == AppConfig.DEFAULT_SUBSCRIPTION_ID) {
             del_config?.isVisible = false
         }
 

V2rayNG/app/src/main/java/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt

@@ -5,7 +5,9 @@ import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import com.v2ray.ang.AppConfig
 import com.v2ray.ang.contracts.BaseAdapterListener
 import com.v2ray.ang.databinding.ItemRecyclerSubSettingBinding
 import com.v2ray.ang.helper.ItemTouchHelperAdapter
@@ -37,6 +39,7 @@ class SubSettingRecyclerAdapter(
         holder.itemSubSettingBinding.layoutRemove.setOnClickListener {
             adapterListener?.onRemove(subId, position)
         }
+        holder.itemSubSettingBinding.layoutRemove.isVisible = subId != AppConfig.DEFAULT_SUBSCRIPTION_ID
 
         holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { it, isChecked ->
             if (!it.isPressed) return@setOnCheckedChangeListener

V2rayNG/app/src/main/java/com/v2ray/ang/ui/TaskerActivity.kt

@@ -30,7 +30,7 @@ class TaskerActivity : BaseActivity() {
         lstData.add("Default")
         lstGuid.add(AppConfig.TASKER_DEFAULT_GUID)
 
-        MmkvManager.decodeServerList().forEach { key ->
+        MmkvManager.decodeAllServerList().forEach { key ->
             MmkvManager.decodeServerConfig(key)?.let { config ->
                 lstData.add(config.remarks)
                 lstGuid.add(key)

V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt

@@ -35,7 +35,7 @@ import kotlinx.coroutines.withContext
 import java.util.Collections
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
-    private var serverList = MmkvManager.decodeServerList()
+    private var serverList = mutableListOf<String>() // MmkvManager.decodeServerList()
     var subscriptionId: String = MmkvManager.decodeSettingsString(AppConfig.CACHE_SUBSCRIPTION_ID, "").orEmpty()
 
     //var keywordFilter: String = MmkvManager.MmkvManager.decodeSettingsString(AppConfig.CACHE_KEYWORD_FILTER, "")?:""
@@ -69,10 +69,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     /**
-     * Reloads the server list.
+     * Reloads the server list based on current subscription filter.
      */
     fun reloadServerList() {
-        serverList = MmkvManager.decodeServerList()
+        serverList = if (subscriptionId.isEmpty()) {
+            MmkvManager.decodeAllServerList()
+        } else {
+            MmkvManager.decodeServerList(subscriptionId)
+        }
+
         updateCache()
         updateListAction.value = -1
     }
@@ -129,14 +134,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
      */
     fun swapServer(fromPosition: Int, toPosition: Int) {
         if (subscriptionId.isEmpty()) {
-            Collections.swap(serverList, fromPosition, toPosition)
-        } else {
-            val fromPosition2 = serverList.indexOf(serversCache[fromPosition].guid)
-            val toPosition2 = serverList.indexOf(serversCache[toPosition].guid)
-            Collections.swap(serverList, fromPosition2, toPosition2)
+            return
         }
+
+        Collections.swap(serverList, fromPosition, toPosition)
         Collections.swap(serversCache, fromPosition, toPosition)
-        MmkvManager.encodeServerList(serverList)
+
+        MmkvManager.encodeServerList(serverList, subscriptionId)
     }
 
     /**
@@ -160,9 +164,9 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 //                MmkvManager.encodeServerConfig(guid, config)
 //            }
 
-            if (subscriptionId.isNotEmpty() && subscriptionId != profile.subscriptionId) {
-                continue
-            }
+//            if (subscriptionId.isNotEmpty() && subscriptionId != profile.subscriptionId) {
+//                continue
+//            }
 
             if (keywordFilter.isEmpty() || profile.remarks.lowercase().contains(keywordFilter.lowercase())) {
                 serversCache.add(ServersCache(guid, profile))
@@ -236,13 +240,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         MmkvManager.clearAllTestDelayResults(serversCache.map { it.guid }.toList())
         updateListAction.value = -1
 
-        val serversCopy = serversCache.toList()
         viewModelScope.launch(Dispatchers.Default) {
-            val guids = ArrayList<String>(serversCopy.map { it.guid })
-            if (guids.isEmpty()) {
+            if (serversCache.isEmpty()) {
                 return@launch
             }
-            MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, guids)
+            MessageUtil.sendMsg2TestService(getApplication(), AppConfig.MSG_MEASURE_CONFIG, subscriptionId)
         }
     }
 
@@ -279,14 +281,23 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         }
 
         val groups = mutableListOf<GroupMapItem>()
-        groups.add(
-            GroupMapItem(
-                id = "",
-                remarks = context.getString(R.string.filter_config_all)
+        if (subscriptions.size > 1
+            && MmkvManager.decodeSettingsBool(AppConfig.PREF_GROUP_ALL_DISPLAY)
+        ) {
+            groups.add(
+                GroupMapItem(
+                    id = "",
+                    remarks = context.getString(R.string.filter_config_all)
+                )
             )
-        )
+        }
         subscriptions.forEach { sub ->
-            groups.add(GroupMapItem(id = sub.guid, remarks = sub.subscription.remarks))
+            groups.add(
+                GroupMapItem(
+                    id = sub.guid,
+                    remarks = sub.subscription.remarks
+                )
+            )
         }
         return groups
     }
@@ -368,24 +379,38 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
      * Sorts servers by their test results.
      */
     fun sortByTestResults() {
+        if (subscriptionId.isEmpty()) {
+            MmkvManager.decodeSubsList().forEach { guid ->
+                sortByTestResultsForSub(guid)
+            }
+        } else {
+            sortByTestResultsForSub(subscriptionId)
+        }
+    }
+
+    /**
+     * Sorts servers by their test results for a specific subscription.
+     * @param subId The subscription ID to sort servers for.
+     */
+    private fun sortByTestResultsForSub(subId: String) {
         data class ServerDelay(var guid: String, var testDelayMillis: Long)
 
         val serverDelays = mutableListOf<ServerDelay>()
-        val serverList = MmkvManager.decodeServerList()
-        serverList.forEach { key ->
+        val serverListToSort = MmkvManager.decodeServerList(subId)
+
+        serverListToSort.forEach { key ->
             val delay = MmkvManager.decodeServerAffiliationInfo(key)?.testDelayMillis ?: 0L
             serverDelays.add(ServerDelay(key, if (delay <= 0L) 999999 else delay))
         }
         serverDelays.sortBy { it.testDelayMillis }
 
-        serverDelays.forEach {
-            serverList.remove(it.guid)
-            serverList.add(it.guid)
-        }
+        val sortedServerList = serverDelays.map { it.guid }.toMutableList()
 
-        MmkvManager.encodeServerList(serverList)
+        // Save the sorted list for this subscription
+        MmkvManager.encodeServerList(sortedServerList, subId)
     }
 
+
     /**
      * Initializes assets.
      * @param assets The asset manager.

V2rayNG/app/src/main/res/layout/activity_backup.xml

@@ -29,6 +29,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_backup_24dp" />
 
                 <LinearLayout
@@ -61,6 +62,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_share_24dp" />
 
                 <TextView
@@ -85,6 +87,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_restore_24dp" />
 
                 <TextView
@@ -117,6 +120,7 @@
                 <ImageView
                     android:layout_width="@dimen/image_size_dp24"
                     android:layout_height="@dimen/image_size_dp24"
+                    android:importantForAccessibility="no"
                     app:srcCompat="@drawable/ic_settings_24dp" />
 
                 <LinearLayout

V2rayNG/app/src/main/res/layout/activity_bypass_list.xml

@@ -68,6 +68,7 @@
                         android:layout_height="wrap_content"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/switch_bypass_apps_mode"
                         android:focusable="true"
                         android:gravity="center"
                         android:padding="@dimen/padding_spacing_dp8">

V2rayNG/app/src/main/res/layout/activity_main.xml

@@ -65,6 +65,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/view_height_dp64"
                         android:clickable="true"
+                        android:contentDescription="@string/connection_test_pending"
                         android:focusable="true"
                         android:nextFocusLeft="@+id/view_pager"
                         android:nextFocusRight="@+id/fab"

V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml

@@ -79,6 +79,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
+                android:contentDescription="@string/menu_item_edit_config"
                 android:focusable="true"
                 android:gravity="center"
                 android:nextFocusLeft="@+id/info_container"

V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml

@@ -58,6 +58,7 @@
                         android:layout_height="wrap_content"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/title_configuration_share"
                         android:focusable="true"
                         android:gravity="center"
                         android:nextFocusLeft="@+id/info_container"
@@ -78,6 +79,7 @@
                         android:layout_height="wrap_content"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/menu_item_edit_config"
                         android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical"
@@ -97,6 +99,7 @@
                         android:layout_height="wrap_content"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:clickable="true"
+                        android:contentDescription="@string/menu_item_del_config"
                         android:focusable="true"
                         android:gravity="center"
                         android:orientation="vertical"

V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml

@@ -58,6 +58,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
+            android:contentDescription="@string/menu_item_edit_config"
             android:focusable="true"
             android:padding="@dimen/padding_spacing_dp8">
 
@@ -74,6 +75,7 @@
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
+            android:contentDescription="@string/menu_item_del_config"
             android:focusable="true"
             android:padding="@dimen/padding_spacing_dp8">
 

V2rayNG/app/src/main/res/layout/preference_with_help_link.xml

@@ -8,4 +8,5 @@
     android:text="@string/title_mode_help"
     android:textAlignment="textStart"
     android:textStyle="italic"
+    android:textColor="?attr/colorPrimary"
     tools:ignore="UsingOnClickInXml" />

V2rayNG/app/src/main/res/values-ar/strings.xml

@@ -234,6 +234,8 @@
     <string name="title_pref_double_column_display">Enable double column display</string>
     <string name="summary_pref_double_column_display">The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">ملاحظات</string>
     <string name="summary_pref_feedback">ملاحظات التحسينات أو الأخطاء إلى GitHub</string>

V2rayNG/app/src/main/res/values-bn/strings.xml

@@ -234,6 +234,8 @@
     <string name="title_pref_double_column_display">Enable double column display</string>
     <string name="summary_pref_double_column_display">The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">মতামত</string>
     <string name="summary_pref_feedback">মতামত উন্নয়ন বা বাগগুলি GitHub-এ পাঠান</string>

V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml

@@ -234,6 +234,8 @@
     <string name="title_pref_double_column_display">ره وندن نشووݩ داڌن دو سۊتۊنی</string>
     <string name="summary_pref_double_column_display">نومگه نمایه یل من دو سۊتۊن نشووݩ داڌه ابۊن وو چینۉ ترین موئتوا بیشتری ن سیل کۊنین. سی ره وستن، وا برنومه ن ز نۊ ره ونین.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">فشناڌن منشڌ</string>
     <string name="summary_pref_feedback">فشناڌن منشڌ یا گوزارش موشکلا من Github</string>

V2rayNG/app/src/main/res/values-fa/strings.xml

@@ -232,6 +232,8 @@
     <string name="title_pref_double_column_display">فعال کردن نمایش دو ستون</string>
     <string name="summary_pref_double_column_display">لیست نمایه در دو ستون نمایش داده می شود و امکان نمایش محتوای بیشتری را بر روی صفحه نمایش می دهد. برای اجرا باید برنامه را مجددا راه اندازی کنید.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">بازخورد</string>
     <string name="summary_pref_feedback">بازخورد یا گزارش اشکالات در گیت‌ هاب</string>

V2rayNG/app/src/main/res/values-ru/strings.xml

@@ -233,6 +233,8 @@
     <string name="title_pref_double_column_display">Профили в два столбца</string>
     <string name="summary_pref_double_column_display">Список профилей отображается двумя столбцами, что позволяет показать больше информации на экране. Требуется перезапуск приложения.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">Обратная связь</string>
     <string name="summary_pref_feedback">Предложить улучшение или сообщить об ошибке на GitHub</string>

V2rayNG/app/src/main/res/values-vi/strings.xml

@@ -234,6 +234,8 @@
     <string name="title_pref_double_column_display">Enable double column display</string>
     <string name="summary_pref_double_column_display">The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
     <!-- AboutActivity -->
     <string name="title_pref_feedback">Phản hồi lỗi</string>
     <string name="summary_pref_feedback">Phản hồi cải tiến hoặc lỗi lên GitHub</string>

V2rayNG/app/src/main/res/values-zh-rCN/strings.xml

@@ -231,6 +231,9 @@
     <string name="title_pref_double_column_display">启用双列显示</string>
     <string name="summary_pref_double_column_display">配置列表以双列显示，允许在屏幕上显示更多内容。需要重启应用生效。</string>
 
+    <string name="title_pref_group_all_display">启用显示所有组</string>
+    <string name="summary_pref_group_all_display">添加一个额外的“所有选项卡”页面</string>
+
     <!-- AboutActivity -->
     <string name="title_pref_feedback">反馈</string>
     <string name="summary_pref_feedback">反馈改进或漏洞至 GitHub</string>

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -232,6 +232,9 @@
     <string name="title_pref_double_column_display">啟用雙列顯示</string>
     <string name="summary_pref_double_column_display">設定檔清單以雙列顯示，允許在螢幕上顯示更多內容。需要重啟應用生效。</string>
 
+    <string name="title_pref_group_all_display">啟用顯示所有群組</string>
+    <string name="summary_pref_group_all_display">新增一個額外的「所有選項卡」頁面</string>
+
     <!-- AboutActivity -->
     <string name="title_pref_feedback">意見回饋</string>
     <string name="summary_pref_feedback">前往 GitHub 回報錯誤</string>

V2rayNG/app/src/main/res/values/strings.xml

@@ -237,6 +237,9 @@
     <string name="title_pref_double_column_display">Enable double column display</string>
     <string name="summary_pref_double_column_display">The profile list is displayed in double columns, allowing more content to be displayed on the screen. You need to restart the application to take effect.</string>
 
+    <string name="title_pref_group_all_display">Enable show all groups</string>
+    <string name="summary_pref_group_all_display">Add an extra "All Tabs" page</string>
+
     <!-- AboutActivity -->
     <string name="title_pref_feedback">Feedback</string>
     <string name="summary_pref_feedback">Feedback enhancements or bugs to GitHub</string>

V2rayNG/app/src/main/res/xml/pref_settings.xml

@@ -23,6 +23,11 @@
             android:summary="@string/summary_pref_double_column_display"
             android:title="@string/title_pref_double_column_display" />
 
+        <CheckBoxPreference
+            android:key="pref_group_all_display"
+            android:summary="@string/summary_pref_group_all_display"
+            android:title="@string/title_pref_group_all_display" />
+
         <ListPreference
             android:defaultValue="auto"
             android:entries="@array/language_select"

V2rayNG/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "9.0.0"
+agp = "9.0.1"
 desugarJdkLibs = "2.1.5"
 gradleLicensePlugin = "0.9.8"
 kotlin = "2.3.10"
@@ -9,7 +9,7 @@ junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 appcompat = "1.7.1"
 material = "1.13.0"
-activity = "1.12.3"
+activity = "1.12.4"
 constraintlayout = "2.2.1"
 mmkvStatic = "1.3.16"
 gson = "2.13.2"

V2rayNG/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 14 12:42:51 BDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists