Bug fix

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

.github/workflows/build-linux.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-osx.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows-desktop.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v4.2.2
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -63,6 +63,10 @@ public partial class App : Application
             if (desktop.MainWindow != null)
             {
                 var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
+                if (clipboardData.IsNullOrEmpty())
+                {
+                    return;
+                }
                 var service = Locator.Current.GetService<MainWindowViewModel>();
                 if (service != null)
                 {

v2rayN/v2rayN.Desktop/Common/AvaUtils.cs

@@ -14,7 +14,10 @@ namespace v2rayN.Desktop.Common
             {
                 var clipboard = TopLevel.GetTopLevel(owner)?.Clipboard;
                 if (clipboard == null)
+                {
                     return null;
+                }
+
                 return await clipboard.GetTextAsync();
             }
             catch

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -247,7 +247,7 @@ namespace v2rayN.Desktop.Views
 
                 case EViewAction.AddServerViaClipboard:
                     var clipboardData = await AvaUtils.GetClipboardData(this);
-                    if (ViewModel != null)
+                    if (clipboardData.IsNotEmpty() && ViewModel != null)
                     {
                         await ViewModel.AddServerViaClipboardAsync(clipboardData);
                     }
@@ -315,7 +315,7 @@ namespace v2rayN.Desktop.Views
                 {
                     case Key.V:
                         var clipboardData = await AvaUtils.GetClipboardData(this);
-                        if (ViewModel != null)
+                        if (clipboardData.IsNotEmpty() && ViewModel != null)
                         {
                             await ViewModel.AddServerViaClipboardAsync(clipboardData);
                         }

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs

@@ -109,13 +109,20 @@ namespace v2rayN.Desktop.Views
 
                 case EViewAction.SetClipboardData:
                     if (obj is null)
+                    {
                         return false;
+                    }
+
                     await AvaUtils.SetClipboardData(this, (string)obj);
                     break;
 
                 case EViewAction.ImportRulesFromClipboard:
                     var clipboardData = await AvaUtils.GetClipboardData(this);
-                    ViewModel?.ImportRulesFromClipboardAsync(clipboardData);
+                    if (clipboardData.IsNotEmpty())
+                    {
+                        ViewModel?.ImportRulesFromClipboardAsync(clipboardData);
+                    }
+
                     break;
             }
 

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -18,11 +18,11 @@ namespace v2rayN
         /// <returns></returns>
         public static string? GetClipboardData()
         {
-            string? strData = string.Empty;
+            var strData = string.Empty;
             try
             {
-                IDataObject data = Clipboard.GetDataObject();
+                var data = Clipboard.GetDataObject();
-                if (data.GetDataPresent(DataFormats.UnicodeText))
+                if (data?.GetDataPresent(DataFormats.UnicodeText) == true)
                 {
                     strData = data.GetData(DataFormats.UnicodeText)?.ToString();
                 }

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -232,7 +232,10 @@ namespace v2rayN.Views
 
                 case EViewAction.AddServerViaClipboard:
                     var clipboardData = WindowsUtils.GetClipboardData();
-                    ViewModel?.AddServerViaClipboardAsync(clipboardData);
+                    if (clipboardData.IsNotEmpty())
+                    {
+                        ViewModel?.AddServerViaClipboardAsync(clipboardData);
+                    }
                     break;
 
                 case EViewAction.AdjustMainLvColWidth:
@@ -284,11 +287,20 @@ namespace v2rayN.Views
                 {
                     case Key.V:
                         if (Keyboard.FocusedElement is TextBox)
+                        {
                             return;
+                        }
+
                         var clipboardData = WindowsUtils.GetClipboardData();
-                        var service = Locator.Current.GetService<MainWindowViewModel>();
+                        if (clipboardData.IsNotEmpty())
-                        if (service != null)
+                        {
-                            _ = service.AddServerViaClipboardAsync(clipboardData);
+                            var service = Locator.Current.GetService<MainWindowViewModel>();
+                            if (service != null)
+                            {
+                                _ = service.AddServerViaClipboardAsync(clipboardData);
+                            }
+                        }
+
                         break;
 
                     case Key.S:

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -110,7 +110,10 @@ namespace v2rayN.Views
 
                 case EViewAction.ImportRulesFromClipboard:
                     var clipboardData = WindowsUtils.GetClipboardData();
-                    ViewModel?.ImportRulesFromClipboardAsync(clipboardData);
+                    if (clipboardData.IsNotEmpty())
+                    {
+                        ViewModel?.ImportRulesFromClipboardAsync(clipboardData);
+                    }
                     break;
             }