Update README.md

https://github.com/2dust/v2rayN/issues/6119

README.md

@@ -1,5 +1,5 @@
 # v2rayN
-A GUI client for Windows and Linux, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
+A GUI client for Windows and Linux, support [Xray core](https://github.com/XTLS/Xray-core)  and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -211,12 +211,12 @@
 
         public async Task<List<RoutingItem>?> RoutingItems()
         {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().Where(it => it.Locked == false).OrderBy(t => t.Sort).ToListAsync();
+            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().OrderBy(t => t.Sort).ToListAsync();
         }
 
         public async Task<RoutingItem?> GetRoutingItem(string id)
         {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Locked == false && it.Id == id);
+            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Id == id);
         }
 
         public async Task<List<DNSItem>?> DNSItems()

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -65,10 +65,8 @@ namespace ServiceLib.Handler
                     config.Inbound[0].Protocol = EInboundProtocol.socks.ToString();
                 }
             }
-            config.RoutingBasicItem ??= new()
-            {
-                EnableRoutingAdvanced = true
-            };
+
+            config.RoutingBasicItem ??= new();
 
             if (Utils.IsNullOrEmpty(config.RoutingBasicItem.DomainStrategy))
             {
@@ -1298,6 +1296,20 @@ namespace ServiceLib.Handler
                 }
             }
 
+            //Keep the last traffic statistics
+            if (lstOriSub != null)
+            {
+                var lstSub = await AppHandler.Instance.ProfileItems(subid);
+                foreach (var item in lstSub)
+                {
+                    var existItem = lstOriSub?.FirstOrDefault(t => config.UiItem.EnableUpdateSubOnlyRemarksExist ? t.Remarks == item.Remarks : CompareProfileItem(t, item, true));
+                    if (existItem != null)
+                    {
+                        await StatisticsHandler.Instance.CloneServerStatItem(existItem.IndexId, item.IndexId);
+                    }
+                }
+            }
+
             return counter;
         }
 
@@ -1600,7 +1612,7 @@ namespace ServiceLib.Handler
             var item = await AppHandler.Instance.GetRoutingItem(config.RoutingBasicItem.RoutingIndexId);
             if (item is null)
             {
-                var item2 = await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(t => t.Locked == false);
+                var item2 = await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync();
                 await SetDefaultRouting(config, item2);
                 return item2;
             }
@@ -1674,6 +1686,15 @@ namespace ServiceLib.Handler
         {
             var ver = "V3-";
             var items = await AppHandler.Instance.RoutingItems();
+
+            //TODO Temporary code to be removed later
+            var lockItem = items?.FirstOrDefault(t => t.Locked == true);
+            if (lockItem != null)
+            {
+                await ConfigHandler.RemoveRoutingItem(lockItem);
+                items = await AppHandler.Instance.RoutingItems();
+            }
+
             if (!blImportAdvancedRules && items.Where(t => t.Remarks.StartsWith(ver)).ToList().Count > 0)
             {
                 return 0;
@@ -1714,11 +1735,6 @@ namespace ServiceLib.Handler
             return 0;
         }
 
-        public static async Task<RoutingItem?> GetLockedRoutingItem(Config config)
-        {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Locked == true);
-        }
-
         public static async Task RemoveRoutingItem(RoutingItem routingItem)
         {
             await SQLiteHelper.Instance.DeleteAsync(routingItem);

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -65,6 +65,25 @@
             }
         }
 
+        public async Task CloneServerStatItem(string indexId, string toIndexId)
+        {
+            if (_lstServerStat == null)
+            {
+                return;
+            }
+
+            var stat = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
+            if (stat == null)
+            {
+                return;
+            }
+
+            var toStat = JsonUtils.DeepCopy(stat);
+            toStat.IndexId = toIndexId;
+            await SQLiteHelper.Instance.ReplaceAsync(toStat);
+            _lstServerStat.Add(toStat);
+        }
+
         private async Task InitData()
         {
             await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -180,7 +180,6 @@
         public string DomainStrategy4Singbox { get; set; }
         public string DomainMatcher { get; set; }
         public string RoutingIndexId { get; set; }
-        public bool EnableRoutingAdvanced { get; set; }
     }
 
     [Serializable]

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -1365,24 +1365,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Basic Function 的本地化字符串。
-        /// </summary>
-        public static string menuRoutingBasic {
-            get {
-                return ResourceManager.GetString("menuRoutingBasic", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Import Basic Rules 的本地化字符串。
-        /// </summary>
-        public static string menuRoutingBasicImportRules {
-            get {
-                return ResourceManager.GetString("menuRoutingBasicImportRules", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 RoutingRuleDetailsSetting 的本地化字符串。
         /// </summary>

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

@@ -847,12 +847,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule</value>
   </data>
-  <data name="menuRoutingBasic" xml:space="preserve">
-    <value>عملکرد پایه</value>
-  </data>
-  <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>واردات قوانین اساسی</value>
-  </data>
   <data name="TbdomainMatcher" xml:space="preserve">
     <value>تطبیق دامنه</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -850,12 +850,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule(Enter)</value>
   </data>
-  <data name="menuRoutingBasic" xml:space="preserve">
-    <value>Basic Function</value>
-  </data>
-  <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>Import Basic Rules</value>
-  </data>
   <data name="TbdomainMatcher" xml:space="preserve">
     <value>Domain Matcher</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -856,12 +856,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Установить как активное правило</value>
   </data>
-  <data name="menuRoutingBasic" xml:space="preserve">
-    <value>Основные функции</value>
-  </data>
-  <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>Импорт основных правил</value>
-  </data>
   <data name="TbdomainMatcher" xml:space="preserve">
     <value>Сопоставитель доменов</value>
   </data>

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

@@ -850,12 +850,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>设为活动规则 (Enter)</value>
   </data>
-  <data name="menuRoutingBasic" xml:space="preserve">
-    <value>基础功能</value>
-  </data>
-  <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>一键导入基础规则</value>
-  </data>
   <data name="TbdomainMatcher" xml:space="preserve">
     <value>域名匹配算法</value>
   </data>

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

@@ -850,12 +850,6 @@
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>設為活動規則 (Enter)</value>
   </data>
-  <data name="menuRoutingBasic" xml:space="preserve">
-    <value>基礎功能</value>
-  </data>
-  <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>一鍵匯入基礎規則</value>
-  </data>
   <data name="TbdomainMatcher" xml:space="preserve">
     <value>域名匹配演算法</value>
   </data>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -90,8 +90,8 @@ namespace ServiceLib.Services.CoreConfig
 
                 ret.Msg = ResUI.InitialConfiguration;
 
-                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
-                string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+                var result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
                 if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
@@ -119,10 +119,10 @@ namespace ServiceLib.Services.CoreConfig
 
                 await GenLog(singboxConfig);
                 //GenDns(new(), singboxConfig);
-                singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                singboxConfig.inbounds.Clear();
                 singboxConfig.outbounds.RemoveAt(0);
 
-                int httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+                var httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -499,14 +499,11 @@ namespace ServiceLib.Services.CoreConfig
                     inbound.sniff_override_destination = _config.Inbound[0].RouteOnly ? false : _config.Inbound[0].SniffingEnabled;
                     inbound.domain_strategy = Utils.IsNullOrEmpty(_config.RoutingBasicItem.DomainStrategy4Singbox) ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
 
-                    if (_config.RoutingBasicItem.EnableRoutingAdvanced)
-                    {
                     var routing = await ConfigHandler.GetDefaultRouting(_config);
                     if (Utils.IsNotEmpty(routing.DomainStrategy4Singbox))
                     {
                         inbound.domain_strategy = routing.DomainStrategy4Singbox;
                     }
-                    }
 
                     //http
                     var inbound2 = GetInbound(inbound, EInboundProtocol.http, false);
@@ -958,8 +955,6 @@ namespace ServiceLib.Services.CoreConfig
                     });
                 }
 
-                if (_config.RoutingBasicItem.EnableRoutingAdvanced)
-                {
                 var routing = await ConfigHandler.GetDefaultRouting(_config);
                 if (routing != null)
                 {
@@ -973,19 +968,6 @@ namespace ServiceLib.Services.CoreConfig
                     }
                 }
             }
-                else
-                {
-                    var lockedItem = await ConfigHandler.GetLockedRoutingItem(_config);
-                    if (lockedItem != null)
-                    {
-                        var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.RuleSet);
-                        foreach (var item in rules ?? [])
-                        {
-                            await GenRoutingUserRule(item, singboxConfig.route.rules);
-                        }
-                    }
-                }
-            }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
@@ -1334,8 +1316,7 @@ namespace ServiceLib.Services.CoreConfig
 
             //load custom ruleset file
             List<Ruleset4Sbox> customRulesets = [];
-            if (_config.RoutingBasicItem.EnableRoutingAdvanced)
-            {
+
             var routing = await ConfigHandler.GetDefaultRouting(_config);
             if (Utils.IsNotEmpty(routing.CustomRulesetPath4Singbox))
             {
@@ -1349,7 +1330,6 @@ namespace ServiceLib.Services.CoreConfig
                         .ToList();
                 }
             }
-            }
 
             //Local srs files address
             var localSrss = Utils.GetBinPath("srss");

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -216,8 +216,8 @@ namespace ServiceLib.Services.CoreConfig
 
                 ret.Msg = ResUI.InitialConfiguration;
 
-                string result = Utils.GetEmbedText(Global.V2raySampleClient);
-                string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                var result = Utils.GetEmbedText(Global.V2raySampleClient);
+                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
                 if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
@@ -244,10 +244,11 @@ namespace ServiceLib.Services.CoreConfig
                 }
 
                 await GenLog(v2rayConfig);
-                v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
-                v2rayConfig.outbounds.RemoveAt(0);
+                v2rayConfig.inbounds.Clear();
+                v2rayConfig.outbounds.Clear();
+                v2rayConfig.routing.rules.Clear();
 
-                int httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+                var httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -270,7 +271,7 @@ namespace ServiceLib.Services.CoreConfig
 
                     //find unused port
                     var port = httpPort;
-                    for (int k = httpPort; k < Global.MaxPort; k++)
+                    for (var k = httpPort; k < Global.MaxPort; k++)
                     {
                         if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
                         {
@@ -294,16 +295,6 @@ namespace ServiceLib.Services.CoreConfig
                     it.Port = port;
                     it.AllowTest = true;
 
-                    //inbound
-                    Inbounds4Ray inbound = new()
-                    {
-                        listen = Global.Loopback,
-                        port = port,
-                        protocol = EInboundProtocol.http.ToString(),
-                    };
-                    inbound.tag = inbound.protocol + inbound.port.ToString();
-                    v2rayConfig.inbounds.Add(inbound);
-
                     //outbound
                     if (item is null)
                     {
@@ -326,6 +317,16 @@ namespace ServiceLib.Services.CoreConfig
                         continue;
                     }
 
+                    //inbound
+                    Inbounds4Ray inbound = new()
+                    {
+                        listen = Global.Loopback,
+                        port = port,
+                        protocol = EInboundProtocol.http.ToString(),
+                    };
+                    inbound.tag = inbound.protocol + inbound.port.ToString();
+                    v2rayConfig.inbounds.Add(inbound);
+
                     var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     await GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.port.ToString();
@@ -466,8 +467,6 @@ namespace ServiceLib.Services.CoreConfig
                     v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
                     v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.RoutingBasicItem.DomainMatcher) ? null : _config.RoutingBasicItem.DomainMatcher;
 
-                    if (_config.RoutingBasicItem.EnableRoutingAdvanced)
-                    {
                     var routing = await ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
@@ -486,20 +485,6 @@ namespace ServiceLib.Services.CoreConfig
                         }
                     }
                 }
-                    else
-                    {
-                        var lockedItem = await ConfigHandler.GetLockedRoutingItem(_config);
-                        if (lockedItem != null)
-                        {
-                            var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.RuleSet);
-                            foreach (var item in rules)
-                            {
-                                var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
-                                await GenRoutingUserRule(item2, v2rayConfig);
-                            }
-                        }
-                    }
-                }
             }
             catch (Exception ex)
             {

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -7,9 +7,6 @@ namespace ServiceLib.ViewModels
 {
     public class RoutingSettingViewModel : MyReactiveObject
     {
-        private RoutingItem _lockedItem;
-        private List<RulesItem> _lockedRules;
-
         #region Reactive
 
         private IObservableCollection<RoutingItemModel> _routingItems = new ObservableCollectionExtended<RoutingItemModel>();
@@ -20,12 +17,6 @@ namespace ServiceLib.ViewModels
 
         public IList<RoutingItemModel> SelectedSources { get; set; }
 
-        [Reactive]
-        public bool enableRoutingAdvanced { get; set; }
-
-        [Reactive]
-        public bool enableRoutingBasic { get; set; }
-
         [Reactive]
         public string domainStrategy { get; set; }
 
@@ -35,25 +26,6 @@ namespace ServiceLib.ViewModels
         [Reactive]
         public string domainStrategy4Singbox { get; set; }
 
-        [Reactive]
-        public string ProxyDomain { get; set; }
-
-        [Reactive]
-        public string ProxyIP { get; set; }
-
-        [Reactive]
-        public string DirectDomain { get; set; }
-
-        [Reactive]
-        public string DirectIP { get; set; }
-
-        [Reactive]
-        public string BlockDomain { get; set; }
-
-        [Reactive]
-        public string BlockIP { get; set; }
-
-        public ReactiveCommand<Unit, Unit> RoutingBasicImportRulesCmd { get; }
         public ReactiveCommand<Unit, Unit> RoutingAdvancedAddCmd { get; }
         public ReactiveCommand<Unit, Unit> RoutingAdvancedRemoveCmd { get; }
         public ReactiveCommand<Unit, Unit> RoutingAdvancedSetDefaultCmd { get; }
@@ -73,15 +45,6 @@ namespace ServiceLib.ViewModels
                 x => x.SelectedSource,
                 selectedSource => selectedSource != null && !selectedSource.Remarks.IsNullOrEmpty());
 
-            this.WhenAnyValue(
-                    x => x.enableRoutingAdvanced)
-                .Subscribe(c => enableRoutingBasic = !enableRoutingAdvanced);
-
-            RoutingBasicImportRulesCmd = ReactiveCommand.CreateFromTask(async () =>
-            {
-                await RoutingBasicImportRules();
-            });
-
             RoutingAdvancedAddCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 await RoutingAdvancedEditAsync(true);
@@ -111,67 +74,14 @@ namespace ServiceLib.ViewModels
         {
             SelectedSource = new();
 
-            enableRoutingAdvanced = true;//TODO _config.RoutingBasicItem.EnableRoutingAdvanced;
             domainStrategy = _config.RoutingBasicItem.DomainStrategy;
             domainMatcher = _config.RoutingBasicItem.DomainMatcher;
             domainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
 
             await ConfigHandler.InitBuiltinRouting(_config);
             await RefreshRoutingItems();
-            await BindingLockedData();
         }
 
-        #region locked
-
-        private async Task BindingLockedData()
-        {
-            _lockedItem = await ConfigHandler.GetLockedRoutingItem(_config);
-            if (_lockedItem == null)
-            {
-                _lockedItem = new RoutingItem()
-                {
-                    Remarks = "locked",
-                    Url = string.Empty,
-                    Locked = true,
-                };
-                await ConfigHandler.AddBatchRoutingRules(_lockedItem, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
-            }
-
-            if (_lockedItem != null)
-            {
-                _lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.RuleSet);
-                ProxyDomain = Utils.List2String(_lockedRules[0].Domain, true);
-                ProxyIP = Utils.List2String(_lockedRules[0].Ip, true);
-
-                DirectDomain = Utils.List2String(_lockedRules[1].Domain, true);
-                DirectIP = Utils.List2String(_lockedRules[1].Ip, true);
-
-                BlockDomain = Utils.List2String(_lockedRules[2].Domain, true);
-                BlockIP = Utils.List2String(_lockedRules[2].Ip, true);
-            }
-        }
-
-        private async Task EndBindingLockedData()
-        {
-            if (_lockedItem != null)
-            {
-                _lockedRules[0].Domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
-                _lockedRules[0].Ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
-
-                _lockedRules[1].Domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
-                _lockedRules[1].Ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
-
-                _lockedRules[2].Domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
-                _lockedRules[2].Ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
-
-                _lockedItem.RuleSet = JsonUtils.Serialize(_lockedRules, false);
-
-                await ConfigHandler.SaveRoutingItem(_config, _lockedItem);
-            }
-        }
-
-        #endregion locked
-
         #region Refresh Save
 
         public async Task RefreshRoutingItems()
@@ -205,12 +115,9 @@ namespace ServiceLib.ViewModels
         private async Task SaveRoutingAsync()
         {
             _config.RoutingBasicItem.DomainStrategy = domainStrategy;
-            _config.RoutingBasicItem.EnableRoutingAdvanced = enableRoutingAdvanced;
             _config.RoutingBasicItem.DomainMatcher = domainMatcher;
             _config.RoutingBasicItem.DomainStrategy4Singbox = domainStrategy4Singbox;
 
-            await EndBindingLockedData();
-
             if (await ConfigHandler.SaveConfig(_config) == 0)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
@@ -224,18 +131,6 @@ namespace ServiceLib.ViewModels
 
         #endregion Refresh Save
 
-        private async Task RoutingBasicImportRules()
-        {
-            //Extra to bypass the mainland
-            ProxyDomain = "geosite:google";
-            DirectDomain = "geosite:cn";
-            DirectIP = "geoip:private,geoip:cn";
-            BlockDomain = "geosite:category-ads-all";
-
-            //NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-            NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-        }
-
         public async Task RoutingAdvancedEditAsync(bool blNew)
         {
             RoutingItem item;

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -347,11 +347,6 @@ namespace ServiceLib.ViewModels
         public async Task RefreshRoutingsMenu()
         {
             _routingItems.Clear();
-            if (!_config.RoutingBasicItem.EnableRoutingAdvanced)
-            {
-                BlRouting = false;
-                return;
-            }
 
             BlRouting = true;
             var routings = await AppHandler.Instance.RoutingItems();
@@ -474,7 +469,7 @@ namespace ServiceLib.ViewModels
             }
             else
             {
-                InboundLanDisplay = $"{ResUI.LabLAN}:None";
+                InboundLanDisplay = $"{ResUI.LabLAN}:{Global.None}";
             }
         }
 

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -15,7 +15,6 @@
     mc:Ignorable="d">
 
     <DockPanel>
-
         <StackPanel
             Classes="Margin8"
             DockPanel.Dock="Top"
@@ -55,7 +54,6 @@
                 Margin="8,0,0,0" />
         </StackPanel>
 
-
         <StackPanel
             HorizontalAlignment="Right"
             Classes="Margin8"
@@ -134,9 +132,6 @@
                     </DataGrid>
                 </TabItem>
             </TabControl>
-
-
         </DockPanel>
-
     </DockPanel>
 </Window>

v2rayN/v2rayN/Handler/WindowsHandler.cs

@@ -54,11 +54,6 @@ namespace v2rayN.Handler
         {
             try
             {
-                if (!config.RoutingBasicItem.EnableRoutingAdvanced)
-                {
-                    return null;
-                }
-
                 var item = await ConfigHandler.GetDefaultRouting(config);
                 if (item == null || Utils.IsNullOrEmpty(item.CustomIcon) || !File.Exists(item.CustomIcon))
                 {

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -28,23 +28,6 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                    <MenuItem x:Name="menuRoutingBasic" Padding="8,0">
-                        <MenuItem.Header>
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon
-                                    Margin="{StaticResource MarginRight8}"
-                                    VerticalAlignment="Center"
-                                    Kind="Server" />
-                                <TextBlock Text="{x:Static resx:ResUI.menuRoutingBasic}" />
-                            </StackPanel>
-                        </MenuItem.Header>
-                        <MenuItem
-                            x:Name="menuRoutingBasicImportRules"
-                            Height="{StaticResource MenuItemHeight}"
-                            Header="{x:Static resx:ResUI.menuRoutingBasicImportRules}" />
-                    </MenuItem>
-                </Menu>
                 <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
                     <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
                         <MenuItem.Header>
@@ -66,16 +49,6 @@
                             Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
                     </MenuItem>
                 </Menu>
-                <!--<Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbenableRoutingAdvanced}" />
-                <ToggleButton
-                    x:Name="togenableRoutingAdvanced"
-                    Margin="{StaticResource MarginLeft8}"
-                    HorizontalAlignment="Left" />-->
                 <Separator />
                 <TextBlock
                     Margin="{StaticResource MarginLeft8}"
@@ -224,107 +197,6 @@
                     </DataGrid>
                 </TabItem>
             </TabControl>
-
-            <TabControl x:Name="tabBasic">
-                <TabItem Header="{x:Static resx:ResUI.TbRoutingTabProxy}">
-                    <Grid Margin="{StaticResource Margin8}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
-                        </Grid.ColumnDefinitions>
-                        <GroupBox
-                            Grid.Column="0"
-                            Header="Domain"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtProxyDomain"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
-                        <GroupBox
-                            Grid.Column="2"
-                            Header="IP"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtProxyIP"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                    </Grid>
-                </TabItem>
-
-                <TabItem Header="{x:Static resx:ResUI.TbRoutingTabDirect}">
-                    <Grid Margin="{StaticResource Margin8}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
-                        </Grid.ColumnDefinitions>
-                        <GroupBox
-                            Grid.Column="0"
-                            Header="Domain"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtDirectDomain"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
-                        <GroupBox
-                            Grid.Column="2"
-                            Header="IP"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtDirectIP"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                    </Grid>
-                </TabItem>
-
-                <TabItem Header="{x:Static resx:ResUI.TbRoutingTabBlock}">
-                    <Grid Margin="{StaticResource Margin8}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
-                        </Grid.ColumnDefinitions>
-                        <GroupBox
-                            Grid.Column="0"
-                            Header="Domain"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtBlockDomain"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
-                        <GroupBox
-                            Grid.Column="2"
-                            Header="IP"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                Name="txtBlockIP"
-                                AcceptsReturn="True"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
-                    </Grid>
-                </TabItem>
-            </TabControl>
         </DockPanel>
     </DockPanel>
 </reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -39,24 +39,10 @@ namespace v2rayN.Views
                 this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.lstRoutings.ItemsSource).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
-                //this.Bind(ViewModel, vm => vm.enableRoutingAdvanced, v => v.togenableRoutingAdvanced.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.domainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.domainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.domainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);
 
-                this.Bind(ViewModel, vm => vm.ProxyDomain, v => v.txtProxyDomain.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.ProxyIP, v => v.txtProxyIP.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.DirectDomain, v => v.txtDirectDomain.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.DirectIP, v => v.txtDirectIP.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.BlockDomain, v => v.txtBlockDomain.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.BlockIP, v => v.txtBlockIP.Text).DisposeWith(disposables);
-
-                this.OneWayBind(ViewModel, vm => vm.enableRoutingBasic, v => v.menuRoutingBasic.Visibility).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.enableRoutingAdvanced, v => v.menuRoutingAdvanced.Visibility).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.enableRoutingBasic, v => v.tabBasic.Visibility).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.enableRoutingAdvanced, v => v.tabAdvanced.Visibility).DisposeWith(disposables);
-
-                this.BindCommand(ViewModel, vm => vm.RoutingBasicImportRulesCmd, v => v.menuRoutingBasicImportRules).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd2).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RoutingAdvancedRemoveCmd, v => v.menuRoutingAdvancedRemove).DisposeWith(disposables);
@@ -102,11 +88,6 @@ namespace v2rayN.Views
 
         private void RoutingSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (ViewModel?.enableRoutingBasic ?? false)
-            {
-                return;
-            }
-
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
             {
                 if (e.Key == Key.A)