github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

pull/3405/head^2
2dust 2023-03-03 10:16:04 +08:00
parent 947a7aa7df
commit 285f91e9e8
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/v2rayN/Handler/ConfigHandler.cs
View File

@ -959,7 +959,7 @@ namespace v2rayN.Handler
var existItem = lstOriSub?.FirstOrDefault(t => CompareProfileItem(t, profileItem, true));
if (existItem != null)
{
profileItem = existItem;
profileItem.indexId = existItem.indexId;
}
//filter
if (!Utils.IsNullOrEmpty(subFilter))

21
v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
View File

@ -299,7 +299,7 @@ namespace v2rayN.ViewModels
UI.Show(ResUI.OperationSuccess);
}
}
private void ImportRulesFromUrl()
private async Task ImportRulesFromUrl()
{
var url = SelectedRouting.url;
if (Utils.IsNullOrEmpty(url))
@ -308,19 +308,16 @@ namespace v2rayN.ViewModels
return;
}
Task.Run(async () =>
DownloadHandle downloadHandle = new DownloadHandle();
string result = await downloadHandle.TryDownloadString(url, true, "");
if (AddBatchRoutingRules(SelectedRouting, result) == 0)
{
DownloadHandle downloadHandle = new DownloadHandle();
string result = await downloadHandle.DownloadStringAsync(url, false, "");
if (AddBatchRoutingRules(SelectedRouting, result) == 0)
Application.Current.Dispatcher.Invoke((Action)(() =>
{
Application.Current.Dispatcher.Invoke((Action)(() =>
{
RefreshRulesItems();
}));
UI.Show(ResUI.OperationSuccess);
}
});
RefreshRulesItems();
}));
UI.Show(ResUI.OperationSuccess);
}
}
private int AddBatchRoutingRules(RoutingItem routingItem, string clipboardData)
{