Merge ecf8b8f939 into 66e1aeae1f

v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs

@@ -269,7 +269,6 @@ public class CoreConfigContextBuilder
             IndexId = $"inner-{Utils.GetGuid(false)}",
             ConfigType = EConfigType.ProxyChain,
             CoreType = AppManager.Instance.GetCoreType(node, node.ConfigType),
-            Remarks = node.Remarks,
         };
         List<string?> childItems = [prevNode?.IndexId, node.IndexId, nextNode?.IndexId];
         var chainExtraItem = chainNode.GetProtocolExtra() with

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -154,7 +154,6 @@ public static class ConfigHandler
             DownMbps = 100
         };
         config.ClashUIItem ??= new();
-        config.ClashUIItem.ConnectionsColumnItem ??= new();
         config.SystemProxyItem ??= new();
         config.WebDavItem ??= new();
         config.CheckUpdateItem ??= new();

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -208,7 +208,6 @@ public class ClashUIItem
     public int ProxiesAutoDelayTestInterval { get; set; } = 10;
     public bool ConnectionsAutoRefresh { get; set; }
     public int ConnectionsRefreshInterval { get; set; } = 2;
-    public List<ColumnItem> ConnectionsColumnItem { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

@@ -675,7 +675,7 @@ public partial class CoreConfigV2rayService
 
             if (!_node.Finalmask.IsNullOrEmpty())
             {
-                streamSettings.finalmask = JsonUtils.ParseJson(_node.Finalmask);
+                streamSettings.finalmask = JsonUtils.Deserialize<object>(_node.Finalmask);
             }
         }
         catch (Exception ex)

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml

@@ -74,28 +74,23 @@
                 <DataGridTextColumn
                     Width="300"
                     Binding="{Binding Host}"
-                    Header="{x:Static resx:ResUI.TbSortingHost}"
-                    Tag="Host" />
+                    Header="{x:Static resx:ResUI.TbSortingHost}" />
                 <DataGridTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
-                    Header="{x:Static resx:ResUI.TbSortingChain}"
-                    Tag="Chain" />
+                    Header="{x:Static resx:ResUI.TbSortingChain}" />
                 <DataGridTextColumn
                     Width="80"
                     Binding="{Binding Network}"
-                    Header="{x:Static resx:ResUI.TbSortingNetwork}"
-                    Tag="Network" />
+                    Header="{x:Static resx:ResUI.TbSortingNetwork}" />
                 <DataGridTextColumn
                     Width="160"
                     Binding="{Binding Type}"
-                    Header="{x:Static resx:ResUI.TbSortingType}"
-                    Tag="Type" />
+                    Header="{x:Static resx:ResUI.TbSortingType}" />
                 <DataGridTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
-                    Header="{x:Static resx:ResUI.TbSortingTime}"
-                    Tag="Elapsed" />
+                    Header="{x:Static resx:ResUI.TbSortingTime}" />
             </DataGrid.Columns>
         </DataGrid>
     </DockPanel>

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

@@ -2,15 +2,9 @@ namespace v2rayN.Desktop.Views;
 
 public partial class ClashConnectionsView : ReactiveUserControl<ClashConnectionsViewModel>
 {
-    private static Config _config;
-    private static readonly string _tag = "ClashConnectionsView";
-
     public ClashConnectionsView()
     {
         InitializeComponent();
-        
-        _config = AppManager.Instance.Config;
-        
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -25,15 +19,7 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
-
-            AppEvents.AppExitRequested
-              .AsObservable()
-              .ObserveOn(RxApp.MainThreadScheduler)
-              .Subscribe(_ => StorageUI())
-              .DisposeWith(disposables);
         });
-
-        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -65,74 +51,4 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
     {
         ViewModel?.ClashConnectionClose(false);
     }
-    
-    #region UI
-
-    private void RestoreUI()
-    {
-        try
-        {
-            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
-            if (lvColumnItem == null)
-            {
-                return;
-            }
-
-            var displayIndex = 0;
-            foreach (var item in lvColumnItem)
-            {
-                foreach (var item2 in lstConnections.Columns)
-                {
-                    if (item2.Tag == null)
-                    {
-                        continue;
-                    }
-                    if (item2.Tag.Equals(item.Name))
-                    {
-                        if (item.Width < 0)
-                        {
-                            item2.IsVisible = false;
-                        }
-                        else
-                        {
-                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
-                            item2.DisplayIndex = displayIndex++;
-                        }
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    private void StorageUI()
-    {
-        try
-        {
-            List<ColumnItem> lvColumnItem = new();
-            foreach (var item2 in lstConnections.Columns)
-            {
-                if (item2.Tag == null)
-                {
-                    continue;
-                }
-                lvColumnItem.Add(new()
-                {
-                    Name = (string)item2.Tag,
-                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
-                    Index = item2.DisplayIndex
-                });
-            }
-            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    #endregion UI
 }

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

@@ -7,7 +7,6 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 {
     private static Config _config;
     private Window? _window;
-    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -382,7 +381,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 
@@ -400,67 +399,53 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
     private void RestoreUI()
     {
-        try
+        var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+        var displayIndex = 0;
+        foreach (var item in lvColumnItem)
         {
-            var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
-            var displayIndex = 0;
-            foreach (var item in lvColumnItem)
-            {
-                foreach (var item2 in lstProfiles.Columns)
-                {
-                    if (item2.Tag == null)
-                    {
-                        continue;
-                    }
-                    if (item2.Tag.Equals(item.Name))
-                    {
-                        if (item.Width < 0)
-                        {
-                            item2.IsVisible = false;
-                        }
-                        else
-                        {
-                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
-                            item2.DisplayIndex = displayIndex++;
-                        }
-                        if (item.Name.ToLower().StartsWith("to"))
-                        {
-                            item2.IsVisible = _config.GuiItem.EnableStatistics;
-                        }
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    private void StorageUI()
-    {
-        try
-        {
-            List<ColumnItem> lvColumnItem = new();
             foreach (var item2 in lstProfiles.Columns)
             {
                 if (item2.Tag == null)
                 {
                     continue;
                 }
-                lvColumnItem.Add(new()
+                if (item2.Tag.Equals(item.Name))
                 {
-                    Name = (string)item2.Tag,
-                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
-                    Index = item2.DisplayIndex
-                });
+                    if (item.Width < 0)
+                    {
+                        item2.IsVisible = false;
+                    }
+                    else
+                    {
+                        item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
+                        item2.DisplayIndex = displayIndex++;
+                    }
+                    if (item.Name.ToLower().StartsWith("to"))
+                    {
+                        item2.IsVisible = _config.GuiItem.EnableStatistics;
+                    }
+                }
             }
-            _config.UiItem.MainColumnItem = lvColumnItem;
         }
-        catch (Exception ex)
+    }
+
+    private void StorageUI()
+    {
+        List<ColumnItem> lvColumnItem = new();
+        foreach (var item2 in lstProfiles.Columns)
         {
-            Logging.SaveLog(_tag, ex);
+            if (item2.Tag == null)
+            {
+                continue;
+            }
+            lvColumnItem.Add(new()
+            {
+                Name = (string)item2.Tag,
+                Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
+                Index = item2.DisplayIndex
+            });
         }
+        _config.UiItem.MainColumnItem = lvColumnItem;
     }
 
     #endregion UI

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -79,30 +78,25 @@
                 </ContextMenu>
             </DataGrid.ContextMenu>
             <DataGrid.Columns>
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="300"
                     Binding="{Binding Host}"
-                    ExName="Host"
                     Header="{x:Static resx:ResUI.TbSortingHost}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="500"
                     Binding="{Binding Chain}"
-                    ExName="Chain"
                     Header="{x:Static resx:ResUI.TbSortingChain}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="80"
                     Binding="{Binding Network}"
-                    ExName="Network"
                     Header="{x:Static resx:ResUI.TbSortingNetwork}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="160"
                     Binding="{Binding Type}"
-                    ExName="Type"
                     Header="{x:Static resx:ResUI.TbSortingType}" />
-                <base:MyDGTextColumn
+                <DataGridTextColumn
                     Width="100"
                     Binding="{Binding Elapsed}"
-                    ExName="Elapsed"
                     Header="{x:Static resx:ResUI.TbSortingTime}" />
             </DataGrid.Columns>
         </DataGrid>

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -1,5 +1,4 @@
 using System.Windows.Controls;
-using v2rayN.Base;
 
 namespace v2rayN.Views;
 
@@ -8,14 +7,9 @@ namespace v2rayN.Views;
 /// </summary>
 public partial class ClashConnectionsView
 {
-    private static Config _config;
-    private static readonly string _tag = "ClashConnectionsView";
-
     public ClashConnectionsView()
     {
         InitializeComponent();
-        _config = AppManager.Instance.Config;
-
         ViewModel = new ClashConnectionsViewModel(UpdateViewHandler);
         btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
 
@@ -30,15 +24,7 @@ public partial class ClashConnectionsView
             this.Bind(ViewModel, vm => vm.HostFilter, v => v.txtHostFilter.Text).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ConnectionCloseAllCmd, v => v.btnConnectionCloseAll).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.AutoRefresh, v => v.togAutoRefresh.IsChecked).DisposeWith(disposables);
-
-            AppEvents.AppExitRequested
-                .AsObservable()
-                .ObserveOn(RxApp.MainThreadScheduler)
-                .Subscribe(_ => StorageUI())
-                .DisposeWith(disposables);
         });
-
-        RestoreUI();
     }
 
     private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -62,7 +48,7 @@ public partial class ClashConnectionsView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ClashConnectionsView", ex);
         }
     }
 
@@ -70,71 +56,4 @@ public partial class ClashConnectionsView
     {
         ViewModel?.ClashConnectionClose(false);
     }
-
-    #region UI
-
-    private void RestoreUI()
-    {
-        try
-        {
-            var lvColumnItem = _config.ClashUIItem?.ConnectionsColumnItem?.OrderBy(t => t.Index).ToList();
-            if (lvColumnItem == null)
-            {
-                return;
-            }
-
-            var displayIndex = 0;
-            foreach (var item in lvColumnItem)
-            {
-                foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
-                {
-                    if (col.ExName == item.Name)
-                    {
-                        if (item.Width > 0)
-                        {
-                            col.Width = item.Width;
-                        }
-
-                        col.DisplayIndex = displayIndex++;
-                        break;
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    private void StorageUI()
-    {
-        try
-        {
-            List<ColumnItem> lvColumnItem = new();
-            foreach (var col in lstConnections.Columns.Cast<MyDGTextColumn>())
-            {
-                var name = col.ExName;
-                if (string.IsNullOrWhiteSpace(name))
-                {
-                    continue;
-                }
-
-                lvColumnItem.Add(new()
-                {
-                    Name = name,
-                    Width = (int)col.ActualWidth,
-                    Index = col.DisplayIndex
-                });
-            }
-
-            _config.ClashUIItem.ConnectionsColumnItem = lvColumnItem;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
-    }
-
-    #endregion UI
 }

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -10,7 +10,6 @@ namespace v2rayN.Views;
 public partial class ProfilesView
 {
     private static Config _config;
-    private static readonly string _tag = "ProfilesView";
 
     public ProfilesView()
     {
@@ -340,7 +339,7 @@ public partial class ProfilesView
         }
         catch (Exception ex)
         {
-            Logging.SaveLog(_tag, ex);
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 
@@ -358,59 +357,46 @@ public partial class ProfilesView
 
     private void RestoreUI()
     {
-        try
+        var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
+        var displayIndex = 0;
+        foreach (var item in lvColumnItem)
         {
-            var lvColumnItem = _config.UiItem.MainColumnItem.OrderBy(t => t.Index).ToList();
-            var displayIndex = 0;
-            foreach (var item in lvColumnItem)
+            foreach (MyDGTextColumn item2 in lstProfiles.Columns)
             {
-                foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
+                if (item2.ExName == item.Name)
                 {
-                    if (item2.ExName == item.Name)
+                    if (item.Width < 0)
                     {
-                        if (item.Width < 0)
-                        {
-                            item2.Visibility = Visibility.Hidden;
-                        }
-                        else
-                        {
-                            item2.Width = item.Width;
-                            item2.DisplayIndex = displayIndex++;
-                        }
-                        if (item.Name.ToLower().StartsWith("to"))
-                        {
-                            item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
-                        }
+                        item2.Visibility = Visibility.Hidden;
+                    }
+                    else
+                    {
+                        item2.Width = item.Width;
+                        item2.DisplayIndex = displayIndex++;
+                    }
+                    if (item.Name.ToLower().StartsWith("to"))
+                    {
+                        item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
                     }
                 }
             }
         }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-        }
     }
 
     private void StorageUI()
     {
-        try
+        List<ColumnItem> lvColumnItem = new();
+        foreach (var t in lstProfiles.Columns)
         {
-            List<ColumnItem> lvColumnItem = new();
-            foreach (var item2 in lstProfiles.Columns.Cast<MyDGTextColumn>())
+            var item2 = (MyDGTextColumn)t;
+            lvColumnItem.Add(new()
             {
-                lvColumnItem.Add(new()
-                {
-                    Name = item2.ExName,
-                    Width = (int)(item2.Visibility == Visibility.Visible ? item2.ActualWidth : -1),
-                    Index = item2.DisplayIndex
-                });
-            }
-            _config.UiItem.MainColumnItem = lvColumnItem;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
+                Name = item2.ExName,
+                Width = (int)(item2.Visibility == Visibility.Visible ? item2.ActualWidth : -1),
+                Index = item2.DisplayIndex
+            });
         }
+        _config.UiItem.MainColumnItem = lvColumnItem;
     }
 
     #endregion UI
@@ -419,7 +405,7 @@ public partial class ProfilesView
 
     private Point startPoint = new();
     private int startIndex = -1;
-    private readonly string formatData = "ProfileItemModel";
+    private string formatData = "ProfileItemModel";
 
     /// <summary>
     /// Helper to search up the VisualTree