v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.9.0</Version>
+        <Version>7.8.3</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,11 +5,11 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.4" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.3" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.4" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.3" />
-    <PackageVersion Include="CliWrap" Version="3.8.0" />
+    <PackageVersion Include="CliWrap" Version="3.7.1" />
     <PackageVersion Include="Downloader" Version="3.3.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1051,27 +1051,6 @@ namespace ServiceLib.Handler
             return itemSocks;
         }
 
-        public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
-        {
-            var lstModel = await AppHandler.Instance.ProfileItems(subid, "");
-            if (lstModel is { Count: <= 0 })
-            {
-                return -1;
-            }
-            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
-            var lstProfile = (from t in lstModel
-                              join t2 in lstProfileExs on t.IndexId equals t2.IndexId
-                              where t2.Delay == -1
-                              select t.IndexId).ToList();
-
-            foreach (var item in lstProfile)
-            {
-                await RemoveProfileItem(config, item);
-            }
-
-            return lstProfile.Count;
-        }
-
         #endregion Server
 
         #region Batch add servers

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -61,7 +61,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Do you want to append rules? Choose yes to append, choose otherwise to replace. 的本地化字符串。
+        ///   查找类似 Do you want to append rules? Choose yes to append, choose otherwise to replace 的本地化字符串。
         /// </summary>
         public static string AddBatchRoutingRulesYesNo {
             get {
@@ -1311,15 +1311,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Remove invalid by test results 的本地化字符串。
-        /// </summary>
-        public static string menuRemoveInvalidServerResult {
-            get {
-                return ResourceManager.GetString("menuRemoveInvalidServerResult", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Remove selected servers (Delete) 的本地化字符串。
         /// </summary>
@@ -1689,15 +1680,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 By test result 的本地化字符串。
-        /// </summary>
-        public static string menuTestServerResult {
-            get {
-                return ResourceManager.GetString("menuTestServerResult", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 {0} Website 的本地化字符串。
         /// </summary>
@@ -1707,6 +1689,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Clear original subscription content 的本地化字符串。
+        /// </summary>
+        public static string MsgClearSubscription {
+            get {
+                return ResourceManager.GetString("MsgClearSubscription", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Download GeoFile: {0} successfully 的本地化字符串。
         /// </summary>
@@ -2013,15 +2004,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Removed {0} invalid test results. 的本地化字符串。
-        /// </summary>
-        public static string RemoveInvalidServerResultTip {
-            get {
-                return ResourceManager.GetString("RemoveInvalidServerResultTip", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Are you sure to remove the rules? 的本地化字符串。
         /// </summary>
@@ -2222,7 +2204,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Auto refresh 的本地化字符串。
+        ///   查找类似 AutoRefresh 的本地化字符串。
         /// </summary>
         public static string TbAutoRefresh {
             get {
@@ -2231,7 +2213,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Auto scroll to end 的本地化字符串。
+        ///   查找类似 Auto ScrollToEnd 的本地化字符串。
         /// </summary>
         public static string TbAutoScrollToEnd {
             get {
@@ -3130,6 +3112,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 HTTP Port 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsHttpPort {
+            get {
+                return ResourceManager.GetString("TbSettingsHttpPort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Hysteria Max bandwidth (Up/Dw) 的本地化字符串。
         /// </summary>
@@ -3185,7 +3176,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 The password is encrypted and stored only in local files 的本地化字符串。
+        ///   查找类似 The password is encrypted and stored only in local files. 的本地化字符串。
         /// </summary>
         public static string TbSettingsLinuxSudoPasswordTip {
             get {
@@ -3230,7 +3221,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 The number of concurrent during multi-test 的本地化字符串。
+        ///   查找类似 Number per time for auto batch during speedtest(max 1000) 的本地化字符串。
         /// </summary>
         public static string TbSettingsMixedConcurrencyCount {
             get {
@@ -3886,6 +3877,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it! 的本地化字符串。
+        /// </summary>
+        public static string UpdateStandalonePackageTip {
+            get {
+                return ResourceManager.GetString("UpdateStandalonePackageTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 UpgradeApp does not exist 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>جابجایی</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>محتوای اشتراک اصلی را پاک کنید</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>دانلود Core با موفقیت</value>
   </data>
@@ -712,6 +715,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>استثناها: از سرور پروکسی برای آدرس هایی که با موارد زیر شروع می شوند استفاده نکنید. برای جدا کردن ورودی ها از نقطه ویرگول (;) استفاده کنید.</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>پورت Http</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>نمایش سرعت واقعی (نیاز به راه اندازی مجدد)</value>
   </data>
@@ -1045,6 +1051,9 @@
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>نمایش یا پنهان کردن پنجره اصلی</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>شما در حال حاضر در حال اجرای یک بسته مستقل هستید، لطفاً فایل SelfContained.7z را به صورت دستی دانلود کنید تا آن را از حالت فشرده خارج کرده و بازنویسی کنید!</value>
+  </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>پیکربندی سفارشی ساکس پورت</value>
   </data>
@@ -1387,13 +1396,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>شروع آزمایش مجدد قطعات ناموفق، {0} باقی مانده است. برای خاتمه ESC را فشار دهید...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>By test result</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>Remove invalid by test results</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Removed {0} invalid test results.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>Szállítás</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>Eredeti előfizetési tartalom törlése</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>A Core letöltése sikerült</value>
   </data>
@@ -712,6 +715,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>Kivétel. Ne használjon proxy szervert a címek esetében, amelyek pontosan itt kezdődnek, használjon pontosvesszőt (;)</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>HTTP Port</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>Display real-time speed</value>
   </data>
@@ -1249,6 +1255,9 @@
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>Fő ablak megjelenítése vagy elrejtése</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>Jelenleg egy önálló csomagot futtatsz, kérlek, töltsd le manuálisan a SelfContained.7z fájlt, bontsd ki és írd felül!</value>
+  </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>Testreszabott konfigurációs socks port</value>
   </data>
@@ -1387,13 +1396,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>Starting retesting failed parts, {0} remaining. Press ESC to terminate...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>By test result</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>Remove invalid by test results</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Removed {0} invalid test results.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>Transport</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>Clear original subscription content</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>Download Core successfully</value>
   </data>
@@ -326,7 +329,7 @@
     <value>Please fill in the URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
-    <value>Do you want to append rules? Choose yes to append, choose otherwise to replace.</value>
+    <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
   </data>
   <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
     <value>Download GeoFile: {0} successfully</value>
@@ -712,6 +715,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>Exclusions: Do not use proxy server for addresses beginning with the following. Use semicolon (;) to separate entries.</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>HTTP Port</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>Display real-time speed (requires restart)</value>
   </data>
@@ -944,7 +950,7 @@
     <value>Enable sorting servers by drag-n-drop (requires restart)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
-    <value>Auto refresh</value>
+    <value>AutoRefresh</value>
   </data>
   <data name="SpeedtestingSkip" xml:space="preserve">
     <value>Skip test</value>
@@ -1109,7 +1115,7 @@
     <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
   </data>
   <data name="TbAutoScrollToEnd" xml:space="preserve">
-    <value>Auto scroll to end</value>
+    <value>Auto ScrollToEnd</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Speed Ping Test URL</value>
@@ -1249,6 +1255,9 @@
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>Show or hide the main window</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it!</value>
+  </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>Custom config socks port</value>
   </data>
@@ -1346,7 +1355,7 @@
     <value>System sudo password</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>The password is encrypted and stored only in local files</value>
+    <value>The password is encrypted and stored only in local files.</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>Please set the sudo password in Tun mode settings first</value>
@@ -1387,13 +1396,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>Starting retesting failed parts, {0} remaining. Press ESC to terminate...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>By test result</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>Remove invalid by test results</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Removed {0} invalid test results.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>Протокол</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>Очистить контент оригинальной подписки</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>Ядро успешно загружено</value>
   </data>
@@ -718,6 +721,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>Исключение. Не используйте прокси-сервер для адресов, начинающихся с (,), используйте точку с запятой (;)</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>HTTP порт</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>Display real-time speed</value>
   </data>
@@ -1204,6 +1210,9 @@
   <data name="menuAddTuicServer" xml:space="preserve">
     <value>Add [TUIC] server</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it!</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Enable IPv6 Address</value>
   </data>
@@ -1387,13 +1396,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>Starting retesting failed parts, {0} remaining. Press ESC to terminate...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>By test result</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>Remove invalid by test results</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Removed {0} invalid test results.</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -175,10 +175,10 @@
     <value>初始化配置</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} {1} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} {1} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>地址</value>
@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>传输协议</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>清除原订阅内容</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>下载Core成功</value>
   </data>
@@ -274,7 +277,7 @@
     <value>请先选择服务器</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>服务器去重完成。原数量: {0}，现数量: {1}。</value>
+    <value>服务器去重完成。原数量: {0}，现数量: {1}</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
     <value>是否确定移除服务器？</value>
@@ -712,6 +715,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>例外：对于下列字符开头的地址，不使用代理配置文件。使用分号(;)分隔。</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>本地http监听端口</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>显示实时速度（需重启）</value>
   </data>
@@ -1246,6 +1252,9 @@
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>显示或隐藏主界面</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>您当前运行的是独立包，请手动下载 SelfContained.7z文件解压覆盖！</value>
+  </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自定义配置的Socks端口</value>
   </data>
@@ -1384,13 +1393,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>开始对失败部分进行重新测试，剩余 {0} 个。可按 ESC 终止...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>按测试结果</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>按测试结果移除无效</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>移除无效测试结果 {0} 个。</value>
-  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -175,10 +175,10 @@
     <value>初始化設定</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} {1} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} {1} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>位址</value>
@@ -210,6 +210,9 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>傳輸協定</value>
   </data>
+  <data name="MsgClearSubscription" xml:space="preserve">
+    <value>清除原訂閱內容</value>
+  </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
     <value>下載Core成功</value>
   </data>
@@ -274,7 +277,7 @@
     <value>請先選擇伺服器</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>伺服器去重完成。原數量: {0}，現數量: {1}。</value>
+    <value>伺服器去重完成。原數量: {0}，現數量: {1}</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
     <value>是否確定移除伺服器？</value>
@@ -713,6 +716,9 @@
   <data name="TbSettingsExceptionTip" xml:space="preserve">
     <value>例外：對於下列字元開頭的位址，不使用代理設定檔。使用分號(;)分隔。</value>
   </data>
+  <data name="TbSettingsHttpPort" xml:space="preserve">
+    <value>本機HTTP偵聽埠</value>
+  </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
     <value>顯示即時速度（需重啟）</value>
   </data>
@@ -1127,6 +1133,9 @@
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>顯示或隱藏主介面</value>
   </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>您目前運行的是獨立包，請手動下載 SelfContained.7z檔案解壓縮覆蓋！</value>
+  </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自訂設定的Socks連接埠</value>
   </data>
@@ -1385,13 +1394,4 @@
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
     <value>開始對失敗部分進行重新測試，剩餘 {0} 個。可按 ESC 終止...</value>
   </data>
-  <data name="menuTestServerResult" xml:space="preserve">
-    <value>按測試結果</value>
-  </data>
-  <data name="menuRemoveInvalidServerResult" xml:space="preserve">
-    <value>按測試結果移除無效</value>
-  </data>
-  <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>移除無效測試結果 {0} 個。</value>
-  </data>
 </root>

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -79,7 +79,6 @@ namespace ServiceLib.ViewModels
         public ReactiveCommand<Unit, Unit> RealPingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SpeedServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SortServerResultCmd { get; }
-        public ReactiveCommand<Unit, Unit> RemoveInvalidServerResultCmd { get; }
 
         //servers export
         public ReactiveCommand<Unit, Unit> Export2ClientConfigCmd { get; }
@@ -198,10 +197,6 @@ namespace ServiceLib.ViewModels
             {
                 await SortServer(EServerColName.DelayVal.ToString());
             });
-            RemoveInvalidServerResultCmd = ReactiveCommand.CreateFromTask(async () =>
-            {
-                await RemoveInvalidServerResult();
-            });
             //servers export
             Export2ClientConfigCmd = ReactiveCommand.CreateFromTask(async () =>
             {
@@ -664,13 +659,6 @@ namespace ServiceLib.ViewModels
             RefreshServers();
         }
 
-        public async Task RemoveInvalidServerResult()
-        {
-            var count = await ConfigHandler.RemoveInvalidServerResult(_config, _config.SubIndexId);
-            RefreshServers();
-            NoticeHandler.Instance.Enqueue(string.Format(ResUI.RemoveInvalidServerResultTip, count));
-        }
-
         //move server
         private async Task MoveToGroup(bool c)
         {

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -9,7 +9,7 @@
     xmlns:view="using:v2rayN.Desktop.Views"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="v2rayN"
-    Width="1000"
+    Width="900"
     Height="600"
     MinWidth="900"
     x:DataType="vms:MainWindowViewModel"
@@ -166,4 +166,4 @@
             </Grid>
         </DockPanel>
     </dialogHost:DialogHost>
-</Window>
+</Window>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -104,16 +104,14 @@
                         <MenuItem x:Name="menuShareServer" Header="{x:Static resx:ResUI.menuShareServer}" />
                         <Separator />
                         <MenuItem x:Name="menuSetDefaultMultipleServer" Header="{x:Static resx:ResUI.menuSetDefaultMultipleServer}" />
+
                         <MenuItem x:Name="menuSetDefaultLoadBalanceServer" Header="{x:Static resx:ResUI.menuSetDefaultLoadBalanceServer}" />
                         <Separator />
                         <MenuItem x:Name="menuMixedTestServer" Header="{x:Static resx:ResUI.menuMixedTestServer}" />
                         <MenuItem x:Name="menuTcpingServer" Header="{x:Static resx:ResUI.menuTcpingServer}" />
                         <MenuItem x:Name="menuRealPingServer" Header="{x:Static resx:ResUI.menuRealPingServer}" />
                         <MenuItem x:Name="menuSpeedServer" Header="{x:Static resx:ResUI.menuSpeedServer}" />
-                        <MenuItem Header="{x:Static resx:ResUI.menuTestServerResult}">
+                        <MenuItem x:Name="menuSortServerResult" Header="{x:Static resx:ResUI.menuSortServerResult}" />
-                            <MenuItem x:Name="menuSortServerResult" Header="{x:Static resx:ResUI.menuSortServerResult}" />
-                            <MenuItem x:Name="menuRemoveInvalidServerResult" Header="{x:Static resx:ResUI.menuRemoveInvalidServerResult}" />
-                        </MenuItem>
                         <Separator />
                         <MenuItem x:Name="menuMoveToGroup" Header="{x:Static resx:ResUI.menuMoveToGroup}">
                             <MenuItem>
@@ -247,4 +245,4 @@
             </DataGrid>
         </DockPanel>
     </Grid>
-</UserControl>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -85,8 +85,7 @@ namespace v2rayN.Desktop.Views
                 this.BindCommand(ViewModel, vm => vm.RealPingServerCmd, v => v.menuRealPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SpeedServerCmd, v => v.menuSpeedServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SortServerResultCmd, v => v.menuSortServerResult).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.RemoveInvalidServerResultCmd, v => v.menuRemoveInvalidServerResult).DisposeWith(disposables);
+
-                
                 //servers export
                 this.BindCommand(ViewModel, vm => vm.Export2ClientConfigCmd, v => v.menuExport2ClientConfig).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.Export2ClientConfigClipboardCmd, v => v.menuExport2ClientConfigClipboard).DisposeWith(disposables);

v2rayN/v2rayN/Views/ProfilesView.xaml

@@ -146,16 +146,10 @@
                             x:Name="menuSpeedServer"
                             Height="{StaticResource MenuItemHeight}"
                             Header="{x:Static resx:ResUI.menuSpeedServer}" />
-                        <MenuItem Header="{x:Static resx:ResUI.menuTestServerResult}">
+                        <MenuItem
-                            <MenuItem
+                            x:Name="menuSortServerResult"
-                                x:Name="menuSortServerResult"
+                            Height="{StaticResource MenuItemHeight}"
-                                Height="{StaticResource MenuItemHeight}"
+                            Header="{x:Static resx:ResUI.menuSortServerResult}" />
-                                Header="{x:Static resx:ResUI.menuSortServerResult}" />
-                            <MenuItem
-                                x:Name="menuRemoveInvalidServerResult"
-                                Height="{StaticResource MenuItemHeight}"
-                                Header="{x:Static resx:ResUI.menuRemoveInvalidServerResult}" />
-                        </MenuItem>
                         <Separator />
                         <MenuItem
                             x:Name="menuMoveToGroup"
@@ -327,4 +321,4 @@
             </DataGrid>
         </DockPanel>
     </Grid>
-</reactiveui:ReactiveUserControl>
+</reactiveui:ReactiveUserControl>

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -79,7 +79,6 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.RealPingServerCmd, v => v.menuRealPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SpeedServerCmd, v => v.menuSpeedServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SortServerResultCmd, v => v.menuSortServerResult).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.RemoveInvalidServerResultCmd, v => v.menuRemoveInvalidServerResult).DisposeWith(disposables);
 
                 //servers export
                 this.BindCommand(ViewModel, vm => vm.Export2ClientConfigCmd, v => v.menuExport2ClientConfig).DisposeWith(disposables);