voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix

Browse Source 
https://github.com/2dust/v2rayN/issues/6932
This commit is contained in:
2dust
2025-03-18 16:18:27 +08:00
parent f1ef5a1f51
commit c3e56e84f1
7 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/v2rayN.Desktop/App.axaml.cs
View File

@@ -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)
{

3
v2rayN/v2rayN.Desktop/Common/AvaUtils.cs
View File

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

4
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@@ -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);
}

9
v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs
View File

@@ -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;
}