Merge 5414bae069 into 4af528f8e2

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.19.3</Version>
+        <Version>7.19.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Global.cs

@@ -95,7 +95,7 @@ public class Global
 
     public const string PolicyGroupDefaultAllFilter = $"^(?!.*(?:{PolicyGroupExcludeKeywords})).*$";
 
-    public static readonly List<string> PolicyGroupDefaultFilterList =
+    public static readonly List<string> PolicyGroupDefaultFilterList = 
     [
         // All nodes (exclude traffic/expiry info)
         PolicyGroupDefaultAllFilter,

v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs

@@ -81,9 +81,7 @@ public class NodeValidator
         {
             var transportError = ValidateSingboxTransport(item.ConfigType, net);
             if (transportError != null)
-            {
                 v.Error(transportError);
-            }
 
             if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
             {

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -95,7 +95,10 @@ public static class ConfigHandler
         config.GuiItem ??= new();
         config.MsgUIItem ??= new();
 
-        config.UiItem ??= new();
+        config.UiItem ??= new UIItem()
+        {
+            EnableUpdateSubOnlyRemarksExist = true
+        };
         config.UiItem.MainColumnItem ??= new();
         config.UiItem.WindowSizeItem ??= new();
 
@@ -1037,8 +1040,8 @@ public static class ConfigHandler
 
         if (profileItem.StreamSecurity.IsNotEmpty())
         {
-            if (profileItem.StreamSecurity is not Global.StreamSecurity
-                 and not Global.StreamSecurityReality)
+            if (profileItem.StreamSecurity != Global.StreamSecurity
+                 && profileItem.StreamSecurity != Global.StreamSecurityReality)
             {
                 profileItem.StreamSecurity = string.Empty;
             }
@@ -1129,84 +1132,6 @@ public static class ConfigHandler
         }
     }
 
-    /// <summary>
-    /// Searches the specified collection for a profile item that matches the target profile item based on a series of
-    /// criteria.
-    /// </summary>
-    /// <remarks>The method attempts to find a match by comparing the target's remarks, address, port, and
-    /// password in various combinations. The search is performed in order of specificity, starting with the most
-    /// detailed comparison. If no match is found at any stage, the method returns null.</remarks>
-    /// <param name="source">An enumerable collection of profile items to search. This parameter can be null.</param>
-    /// <param name="target">The profile item to match against items in the source collection. This parameter can be null.</param>
-    /// <returns>A profile item from the source collection that matches the target item according to defined criteria; otherwise,
-    /// null if no match is found or if either parameter is null.</returns>
-    private static ProfileItem? FindMatchedProfileItem(IEnumerable<ProfileItem>? source, ProfileItem? target)
-    {
-        if (source == null || target == null)
-        {
-            return null;
-        }
-
-        var matchedItem = source.FirstOrDefault(t => CompareProfileItem(t, target, true));
-        if (matchedItem != null)
-        {
-            return matchedItem;
-        }
-
-        if (target.Remarks.IsNotEmpty())
-        {
-            matchedItem = source.FirstOrDefault(t => t.Remarks == target.Remarks);
-            if (matchedItem != null)
-            {
-                return matchedItem;
-            }
-        }
-
-        if (target.Address.IsNotEmpty() && target.Port > 0 && target.Password.IsNotEmpty())
-        {
-            matchedItem = source.FirstOrDefault(t =>
-                IsSameText(t.Address, target.Address) &&
-                t.Port == target.Port &&
-                IsSameText(t.Password, target.Password));
-            if (matchedItem != null)
-            {
-                return matchedItem;
-            }
-        }
-
-        if (target.Address.IsNotEmpty() && target.Port > 0)
-        {
-            matchedItem = source.FirstOrDefault(t =>
-                IsSameText(t.Address, target.Address) &&
-                t.Port == target.Port);
-            if (matchedItem != null)
-            {
-                return matchedItem;
-            }
-        }
-
-        if (target.Address.IsNotEmpty())
-        {
-            matchedItem = source.FirstOrDefault(t => IsSameText(t.Address, target.Address));
-            if (matchedItem != null)
-            {
-                return matchedItem;
-            }
-        }
-
-        return null;
-
-        static bool IsSameText(string? left, string? right)
-        {
-            if (left.IsNullOrEmpty() || right.IsNullOrEmpty())
-            {
-                return false;
-            }
-
-            return string.Equals(left.TrimEx(), right.TrimEx(), StringComparison.OrdinalIgnoreCase);
-        }
-    }
-
     /// <summary>
     /// Remove a single server profile by its index ID
     /// Deletes the configuration file if it's a custom config
@@ -1711,7 +1636,7 @@ public static class ConfigHandler
         if (activeProfile != null)
         {
             var lstSub = await AppManager.Instance.ProfileItems(subid);
-            var existItem = FindMatchedProfileItem(lstSub, activeProfile);
+            var existItem = lstSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == activeProfile.Remarks : CompareProfileItem(t, activeProfile, true));
             if (existItem != null)
             {
                 await ConfigHandler.SetDefaultServerIndex(config, existItem.IndexId);
@@ -1724,7 +1649,7 @@ public static class ConfigHandler
             var lstSub = await AppManager.Instance.ProfileItems(subid);
             foreach (var item in lstSub)
             {
-                var existItem = FindMatchedProfileItem(lstOriSub, item);
+                var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
                 if (existItem != null)
                 {
                     await StatisticsManager.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -87,6 +87,7 @@ public class MsgUIItem
 public class UIItem
 {
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
+    public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     public int MainGirdHeight1 { get; set; }
     public int MainGirdHeight2 { get; set; }
     public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;

v2rayN/ServiceLib/Models/ServerTestItem.cs

@@ -9,6 +9,6 @@ public class ServerTestItem
     public EConfigType ConfigType { get; set; }
     public bool AllowTest { get; set; }
     public int QueueNum { get; set; }
-    public ProfileItem Profile { get; set; }
+    public required ProfileItem Profile { get; set; }
     public ECoreType CoreType { get; set; }
 }

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3376,7 +3376,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Process name: Linux/Windows/macOS (sing-box) 的本地化字符串。
+        ///   查找类似 Process (Tun mode) 的本地化字符串。
         /// </summary>
         public static string TbRoutingRuleProcess {
             get {
@@ -3816,6 +3816,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Updating subscription, only determining if remarks exist 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>

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

@@ -1027,7 +1027,7 @@
     <value>پروتکل sing-box Mux</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process name: Linux/Windows/macOS (sing-box)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>آدرس اینترنتی تست پینگ سرعت</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>اشتراک در حال به‌روزرسانی، فقط مشخص کنید که ملاحظاتی آیا وجود دارد!</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>پایان تست...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1024,7 +1024,7 @@
     <value>Protocole de multiplexage Mux (sing-box)</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process name: Linux/Windows/macOS (sing-box)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP ou IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Adresse de test de connexion réelle</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Ne vérifier l’existence de l’alias qu’à la maj. des abonnements</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Arrêt du test en cours...</value>
   </data>
@@ -1665,4 +1668,4 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuGenRegionGroup" xml:space="preserve">
     <value>Group by Region</value>
   </data>
-</root>
+</root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1027,7 +1027,7 @@
     <value>sing-box Mux protokoll</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process name: Linux/Windows/macOS (sing-box)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP vagy IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Sebesség Ping Teszt URL</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Előfizetés frissítése, csak a megjegyzések létezésének ellenőrzése</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Teszt megszakítása...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1027,7 +1027,7 @@
     <value>sing-box Mux Protocol</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process name: Linux/Windows/macOS (sing-box)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP or IP CIDR</value>
@@ -1098,6 +1098,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>Speed Ping Test URL</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determining if remarks exist</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Test terminating...</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1027,7 +1027,7 @@
     <value>Протокол Mux для sing-box</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Process name: Linux/Windows/macOS (sing-box)</value>
+    <value>Process (Tun mode)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP-адрес или сеть CIDR</value>
@@ -1098,6 +1098,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>URL для быстрой проверки реальной задержки</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Обновляя подписку, проверять лишь наличие примечаний</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Отмена тестирования...</value>
   </data>

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

@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路复用协议</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>进程名 Linux/Windows/macOS(sing-box)</value>
+    <value>进程 (Tun 模式)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真连接测试地址</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>更新订阅时只判断别名已存在否</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>测试终止中...</value>
   </data>

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

@@ -1024,7 +1024,7 @@
     <value>sing-box Mux 多路復用協定</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>行程名 Linux/Windows/macOS(sing-box)</value>
+    <value>行程 (Tun 模式)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
@@ -1095,6 +1095,9 @@
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
     <value>真連線測試位址</value>
   </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>更新訂閱時只判斷別名是否存在</value>
+  </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>測試終止中...</value>
   </data>

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs

@@ -243,6 +243,7 @@ public partial class CoreConfigSingboxService
                 if (Utils.IsIpv6(predefined))
                 {
                     rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
+
                 }
                 else
                 {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -363,36 +363,44 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         var geoipFiles = new List<string>();
         var geoSiteFiles = new List<string>();
 
-        // Collect from routing rules
+        //Collect used files list
         var routingItems = await AppManager.Instance.RoutingItems();
         foreach (var routing in routingItems)
         {
             var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.RuleSet);
             foreach (var item in rules ?? [])
             {
-                AddPrefixedItems(item.Ip, "geoip:", geoipFiles);
-                AddPrefixedItems(item.Domain, "geosite:", geoSiteFiles);
+                foreach (var ip in item.Ip ?? [])
+                {
+                    var prefix = "geoip:";
+                    if (ip.StartsWith(prefix))
+                    {
+                        geoipFiles.Add(ip.Substring(prefix.Length));
+                    }
+                }
+
+                foreach (var domain in item.Domain ?? [])
+                {
+                    var prefix = "geosite:";
+                    if (domain.StartsWith(prefix))
+                    {
+                        geoSiteFiles.Add(domain.Substring(prefix.Length));
+                    }
+                }
             }
         }
 
-        // Collect from DNS configuration
-        var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
-        if (dnsItem != null)
-        {
-            ExtractDnsRuleSets(dnsItem.NormalDNS, geoipFiles, geoSiteFiles);
-            ExtractDnsRuleSets(dnsItem.TunDNS, geoipFiles, geoSiteFiles);
-        }
+        //append dns items TODO
+        geoSiteFiles.Add("google");
+        geoSiteFiles.Add("cn");
+        geoSiteFiles.Add("geolocation-cn");
+        geoSiteFiles.Add("category-ads-all");
 
-        // Append default items
-        geoSiteFiles.AddRange(["google", "cn", "geolocation-cn", "category-ads-all"]);
-
-        // Download files
         var path = Utils.GetBinPath("srss");
         if (!Directory.Exists(path))
         {
             Directory.CreateDirectory(path);
         }
-
         foreach (var item in geoipFiles.Distinct())
         {
             await UpdateSrsFile("geoip", item);
@@ -404,63 +412,6 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
         }
     }
 
-    private void AddPrefixedItems(List<string>? items, string prefix, List<string> output)
-    {
-        if (items == null)
-        {
-            return;
-        }
-
-        foreach (var item in items)
-        {
-            if (item.StartsWith(prefix))
-            {
-                output.Add(item.Substring(prefix.Length));
-            }
-        }
-    }
-
-    private void ExtractDnsRuleSets(string? dnsJson, List<string> geoipFiles, List<string> geoSiteFiles)
-    {
-        if (string.IsNullOrEmpty(dnsJson))
-        {
-            return;
-        }
-
-        try
-        {
-            var dns = JsonUtils.Deserialize<Dns4Sbox>(dnsJson);
-            if (dns?.rules != null)
-            {
-                foreach (var rule in dns.rules)
-                {
-                    ExtractSrsRuleSets(rule, geoipFiles, geoSiteFiles);
-                }
-            }
-        }
-        catch { }
-    }
-
-    private void ExtractSrsRuleSets(Rule4Sbox? rule, List<string> geoipFiles, List<string> geoSiteFiles)
-    {
-        if (rule == null)
-        {
-            return;
-        }
-
-        AddPrefixedItems(rule.rule_set, "geosite-", geoSiteFiles);
-        AddPrefixedItems(rule.rule_set, "geoip-", geoipFiles);
-
-        // Handle nested rules recursively
-        if (rule.rules != null)
-        {
-            foreach (var nestedRule in rule.rules)
-            {
-                ExtractSrsRuleSets(nestedRule, geoipFiles, geoSiteFiles);
-            }
-        }
-    }
-
     private async Task UpdateSrsFile(string type, string srsName)
     {
         var srsUrl = string.IsNullOrEmpty(_config.ConstItem.SrsSourceUrl)

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -47,6 +47,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public bool KeepOlderDedupl { get; set; }
     [Reactive] public bool DisplayRealTimeSpeed { get; set; }
     [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
+    [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     [Reactive] public bool AutoHideStartup { get; set; }
     [Reactive] public bool Hide2TrayWhenClose { get; set; }
     [Reactive] public bool MacOSShowInDock { get; set; }
@@ -179,6 +180,7 @@ public class OptionSettingViewModel : MyReactiveObject
         DisplayRealTimeSpeed = _config.GuiItem.DisplayRealTimeSpeed;
         KeepOlderDedupl = _config.GuiItem.KeepOlderDedupl;
         EnableAutoAdjustMainLvColWidth = _config.UiItem.EnableAutoAdjustMainLvColWidth;
+        EnableUpdateSubOnlyRemarksExist = _config.UiItem.EnableUpdateSubOnlyRemarksExist;
         AutoHideStartup = _config.UiItem.AutoHideStartup;
         Hide2TrayWhenClose = _config.UiItem.Hide2TrayWhenClose;
         MacOSShowInDock = _config.UiItem.MacOSShowInDock;
@@ -343,6 +345,7 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.GuiItem.DisplayRealTimeSpeed = DisplayRealTimeSpeed;
         _config.GuiItem.KeepOlderDedupl = KeepOlderDedupl;
         _config.UiItem.EnableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
+        _config.UiItem.EnableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
         _config.UiItem.AutoHideStartup = AutoHideStartup;
         _config.UiItem.Hide2TrayWhenClose = Hide2TrayWhenClose;
         _config.UiItem.MacOSShowInDock = MacOSShowInDock;

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -8,9 +8,9 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     public ClashConnectionsView()
     {
         InitializeComponent();
-
+        
         _config = AppManager.Instance.Config;
-
+        
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -65,7 +65,7 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     {
         ViewModel?.ClashConnectionClose(false);
     }
-
+    
     #region UI
 
     private void RestoreUI()

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -410,6 +410,19 @@
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
 
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
+                        <ToggleSwitch
+                            x:Name="togEnableUpdateSubOnlyRemarksExist"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin4}"
+                            HorizontalAlignment="Left" />
+
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -86,6 +86,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.MacOSShowInDock, v => v.togMacOSShowInDock.IsChecked).DisposeWith(disposables);

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -630,6 +630,20 @@
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
 
+                        <TextBlock
+                            Grid.Row="6"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableUpdateSubOnlyRemarksExist}" />
+                        <ToggleButton
+                            x:Name="togEnableUpdateSubOnlyRemarksExist"
+                            Grid.Row="6"
+                            Grid.Column="1"
+                            Margin="{StaticResource Margin8}"
+                            HorizontalAlignment="Left" />
+
                         <TextBlock
                             Grid.Row="8"
                             Grid.Column="0"

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -91,6 +91,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.DisplayRealTimeSpeed, v => v.togDisplayRealTimeSpeed.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.KeepOlderDedupl, v => v.togKeepOlderDedupl.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableAutoAdjustMainLvColWidth, v => v.togEnableAutoAdjustMainLvColWidth.IsChecked).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.EnableUpdateSubOnlyRemarksExist, v => v.togEnableUpdateSubOnlyRemarksExist.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoHideStartup, v => v.togAutoHideStartup.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.EnableDragDropSort, v => v.togEnableDragDropSort.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);

v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs

@@ -97,7 +97,8 @@ public partial class ProfilesSelectWindow
 
     private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
     {
-        if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
+        var colHeader = sender as DataGridColumnHeader;
+        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
         {
             return;
         }

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -233,7 +233,8 @@ public partial class ProfilesView
 
     private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
     {
-        if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
+        var colHeader = sender as DataGridColumnHeader;
+        if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
         {
             return;
         }