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

Bug fix

pull/4711/head
2dust 2023-12-03 17:02:34 +08:00
parent 77b736541e
commit 658ea26ab7
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v2rayN/v2rayN/Handler/ShareHandler.cs
View File

@ -810,6 +810,7 @@ namespace v2rayN.Handler
var query = HttpUtility.ParseQueryString(url.Query); var query = HttpUtility.ParseQueryString(url.Query);
ResolveStdTransport(query, ref item); ResolveStdTransport(query, ref item);
item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
return item; return item;
} }

35
v2rayN/v2rayN/Handler/UpdateHandle.cs
View File

@ -24,11 +24,13 @@ namespace v2rayN.Handler
{ {
public bool Success; public bool Success;
public string Msg; public string Msg;
public string Url;
public ResultEventArgs(bool success, string msg) public ResultEventArgs(bool success, string msg, string url = "")
{ {
Success = success; Success = success;
Msg = msg; Msg = msg;
Url = url;
} }
} }
@ -83,8 +85,9 @@ namespace v2rayN.Handler
if (args.Success) if (args.Success)
{ {
_updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN")); _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
_updateFunc(false, args.Msg);
url = args.Msg; url = args.Url;
_ = askToDownload(downloadHandle, url, true); _ = askToDownload(downloadHandle, url, true);
} }
else else
@ -135,7 +138,9 @@ namespace v2rayN.Handler
if (args.Success) if (args.Success)
{ {
_updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core")); _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
url = args.Msg; _updateFunc(false, args.Msg);
url = args.Url;
_ = askToDownload(downloadHandle, url, true); _ = askToDownload(downloadHandle, url, true);
} }
else else
@ -405,15 +410,10 @@ namespace v2rayN.Handler
try try
{ {
var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi); var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
SemanticVersion version; var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
if (preRelease) var version = new SemanticVersion(gitHubRelease!.TagName);
{ var body = gitHubRelease!.Body;
version = new SemanticVersion(gitHubReleases!.First().TagName);
}
else
{
version = new SemanticVersion(gitHubReleases!.First(r => r.Prerelease == false).TagName);
}
var coreInfo = LazyConfig.Instance.GetCoreInfo(type); var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
SemanticVersion curVersion; SemanticVersion curVersion;
@ -520,7 +520,7 @@ namespace v2rayN.Handler
return; return;
} }
AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url)); AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -603,7 +603,7 @@ namespace v2rayN.Handler
var url = string.Format(Global.singboxGeoUrl, geoName); var url = string.Format(Global.singboxGeoUrl, geoName);
DownloadHandle downloadHandle = new(); DownloadHandle downloadHandle = new();
downloadHandle.UpdateCompleted += (sender2, args) => downloadHandle.UpdateCompleted += async (sender2, args) =>
{ {
if (args.Success) if (args.Success)
{ {
@ -612,8 +612,11 @@ namespace v2rayN.Handler
try try
{ {
if (needStop) coreHandler?.CoreStop(); if (needStop)
Task.Delay(1000); {
coreHandler?.CoreStop();
await Task.Delay(3000);
}
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url)); string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
if (File.Exists(fileName)) if (File.Exists(fileName))
{ {