From 3ae13b0ba4e0e3b3cc744392fe596de5219dad76 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:10:09 +0800
Subject: [PATCH] Remove the tested features from the main

---
 .../com/v2ray/ang/handler/SettingsChangeManager.kt |  2 --
 .../java/com/v2ray/ang/ui/main/MainDataSource.kt   |  2 --
 .../java/com/v2ray/ang/ui/main/MainRepository.kt   |  6 ------
 .../java/com/v2ray/ang/ui/main/MainViewModel.kt    |  6 ------
 .../com/v2ray/ang/ui/settings/SettingsActivity.kt  | 14 --------------
 5 files changed, 30 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsChangeManager.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsChangeManager.kt
index 7a6e47e1..c9d5f383 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsChangeManager.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/handler/SettingsChangeManager.kt
@@ -20,8 +20,6 @@ object SettingsChangeManager {
         AppConfig.PREF_LANGUAGE,
         AppConfig.PREF_UI_MODE_NIGHT,
         AppConfig.PREF_IS_BOOTED,
-        AppConfig.PREF_AUTO_REMOVE_INVALID_AFTER_TEST,
-        AppConfig.PREF_AUTO_SORT_AFTER_TEST,
     )
 
     /**
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDataSource.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDataSource.kt
index 8a9fb5c3..30c5eee9 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDataSource.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainDataSource.kt
@@ -20,8 +20,6 @@ interface MainDataSource : Closeable {
 
     fun getConfirmRemove(): Boolean
     fun getDoubleColumnDisplay(): Boolean
-    fun getAutoRemoveInvalidAfterTest(): Boolean
-    fun getAutoSortAfterTest(): Boolean
     fun isGroupAllDisplayEnabled(): Boolean
 
     fun getString(resId: Int): String
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainRepository.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainRepository.kt
index f31b4b76..ed91e457 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainRepository.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainRepository.kt
@@ -113,12 +113,6 @@ class MainRepository(
     override fun getDoubleColumnDisplay(): Boolean =
         MmkvManager.decodeSettingsBool(AppConfig.PREF_DOUBLE_COLUMN_DISPLAY, false)
 
-    override fun getAutoRemoveInvalidAfterTest(): Boolean =
-        MmkvManager.decodeSettingsBool(AppConfig.PREF_AUTO_REMOVE_INVALID_AFTER_TEST, false)
-
-    override fun getAutoSortAfterTest(): Boolean =
-        MmkvManager.decodeSettingsBool(AppConfig.PREF_AUTO_SORT_AFTER_TEST, false)
-
     override fun isGroupAllDisplayEnabled(): Boolean =
         MmkvManager.decodeSettingsBool(AppConfig.PREF_GROUP_ALL_DISPLAY)
 
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainViewModel.kt
index e8f128fb..bae8edb0 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainViewModel.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/main/MainViewModel.kt
@@ -710,12 +710,6 @@ class MainViewModel(
 
     private fun onTestsFinished() {
         viewModelScope.launch(ioDispatcher) {
-            if (dataSource.getAutoRemoveInvalidAfterTest()) {
-                removeInvalidServerInternal()
-            }
-            if (dataSource.getAutoSortAfterTest()) {
-                sortByTestResultsInternal()
-            }
             cacheMutex.withLock { groupDataCache.clear() }
             testingGroupId = null
             _uiState.update {
diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt
index 584bdb02..0de217c4 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/settings/SettingsActivity.kt
@@ -124,8 +124,6 @@ fun SettingsScreen(
     var outboundResolveMethod by rememberMmkvString(AppConfig.PREF_OUTBOUND_DOMAIN_RESOLVE_METHOD, "0")
 
     var isBooted by rememberMmkvBool(AppConfig.PREF_IS_BOOTED, false)
-    var autoRemoveInvalidAfterTest by rememberMmkvBool(AppConfig.PREF_AUTO_REMOVE_INVALID_AFTER_TEST, false)
-    var autoSortAfterTest by rememberMmkvBool(AppConfig.PREF_AUTO_SORT_AFTER_TEST, false)
     var delayTestUrl by rememberMmkvString(AppConfig.PREF_DELAY_TEST_URL, "")
     var realPingConcurrency by rememberMmkvString(AppConfig.PREF_REAL_PING_CONCURRENCY, "16")
     var ipApiUrl by rememberMmkvString(AppConfig.PREF_IP_API_URL, "")
@@ -531,18 +529,6 @@ fun SettingsScreen(
                 checked = isBooted,
                 onCheckedChange = { isBooted = it }
             )
-            SettingsSwitchItem(
-                title = stringResource(R.string.title_pref_auto_remove_invalid_after_test),
-                summary = stringResource(R.string.summary_pref_auto_remove_invalid_after_test),
-                checked = autoRemoveInvalidAfterTest,
-                onCheckedChange = { autoRemoveInvalidAfterTest = it }
-            )
-            SettingsSwitchItem(
-                title = stringResource(R.string.title_pref_auto_sort_after_test),
-                summary = stringResource(R.string.summary_pref_auto_sort_after_test),
-                checked = autoSortAfterTest,
-                onCheckedChange = { autoSortAfterTest = it }
-            )
             SettingsEditItem(
                 title = stringResource(R.string.title_pref_delay_test_url),
                 value = delayTestUrl,