From f1c1731cbd5be924980c3a40ea1675a8cdfa2b3e Mon Sep 17 00:00:00 2001
From: zarazaex69 <zarazaex@tuta.io>
Date: Sat, 4 Apr 2026 19:03:28 +0300
Subject: [PATCH] refactor(MainViewModel): extract group sorting logic into
 dedicated method

---
 .../com/v2ray/ang/viewmodel/MainViewModel.kt  | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
index 90e2766f..fcd4bc8c 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/MainViewModel.kt
@@ -459,26 +459,47 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 sortByTestResultsForSub(guid)
             }
         } else if (subscriptionId.startsWith("group_")) {
-            val allSubs = MmkvManager.decodeSubscriptions()
-            val groupSubs = when (subscriptionId) {
-                "group_white" -> allSubs.filter { 
-                    it.subscription.remarks.startsWith("БЕЛЫЕ", ignoreCase = true) || 
-                    it.subscription.remarks.startsWith("WHITE", ignoreCase = true)
-                }
-                "group_black" -> allSubs.filter { 
-                    it.subscription.remarks.startsWith("ЧЕРНЫЕ", ignoreCase = true) || 
-                    it.subscription.remarks.startsWith("BLACK", ignoreCase = true)
-                }
-                else -> emptyList()
-            }
-            groupSubs.forEach { sub ->
-                sortByTestResultsForSub(sub.guid)
-            }
+            sortByTestResultsForGroup(subscriptionId)
         } else {
             sortByTestResultsForSub(subscriptionId)
         }
     }
 
+    private fun sortByTestResultsForGroup(groupId: String) {
+        data class ServerDelay(var guid: String, var testDelayMillis: Long, var subId: String)
+
+        val allSubs = MmkvManager.decodeSubscriptions()
+        val groupSubs = when (groupId) {
+            "group_white" -> allSubs.filter { 
+                it.subscription.remarks.startsWith("БЕЛЫЕ", ignoreCase = true) || 
+                it.subscription.remarks.startsWith("WHITE", ignoreCase = true)
+            }
+            "group_black" -> allSubs.filter { 
+                it.subscription.remarks.startsWith("ЧЕРНЫЕ", ignoreCase = true) || 
+                it.subscription.remarks.startsWith("BLACK", ignoreCase = true)
+            }
+            else -> emptyList()
+        }
+
+        val allServerDelays = mutableListOf<ServerDelay>()
+        
+        groupSubs.forEach { sub ->
+            val serverList = MmkvManager.decodeServerList(sub.guid)
+            serverList.forEach { guid ->
+                val delay = MmkvManager.decodeServerAffiliationInfo(guid)?.testDelayMillis ?: 0L
+                allServerDelays.add(ServerDelay(guid, if (delay <= 0L) 999999 else delay, sub.guid))
+            }
+        }
+        
+        allServerDelays.sortBy { it.testDelayMillis }
+        
+        val serversBySubId = allServerDelays.groupBy { it.subId }
+        serversBySubId.forEach { (subId, servers) ->
+            val sortedList = servers.map { it.guid }.toMutableList()
+            MmkvManager.encodeServerList(sortedList, subId)
+        }
+    }
+
     /**
      * Sorts servers by their test results for a specific subscription.
      * @param subId The subscription ID to sort servers for.