Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-08-26 04:46:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

updateSubscription and try to re-select the last choice.

Browse source
This commit is contained in:
JaredDC 2021-06-29 23:01:52 +08:00
parent 672eb4b365
commit 1d3b5452a5
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
v2rayN/v2rayN/Forms/MainForm.cs
View file

@ -1316,9 +1316,28 @@ namespace v2rayN.Forms
private void tsbSubUpdate_Click(object sender, EventArgs e) private void tsbSubUpdate_Click(object sender, EventArgs e)
{ {
UpdateSubscriptionProcess(); VmessItem item = config.vmess[config.index];
var remarks = item.remarks;
var handle = new UpdateHandle();
void _updateUIAndReselect(bool success, string msg)
{
AppendText(false, msg);
if (success)
{
RefreshServers();
}
if (handle.updateSubscriptionProcessCompleted)
{
// wait for above fxcking async program to complete
int index = FindIndexByRemarks(remarks);
SetDefaultServer(index);
AppendText(false, $"{UIRes.I18N("MsgUpdateSubscriptionEndReslectLast")}");
RefreshServers();
handle.updateSubscriptionProcessCompleted = false;
}
};
handle.UpdateSubscriptionProcess(config, _updateUIAndReselect);
} }
/// <summary> /// <summary>
/// the subscription update process /// the subscription update process
/// </summary> /// </summary>

2
v2rayN/v2rayN/Handler/UpdateHandle.cs
View file

@ -14,7 +14,7 @@ namespace v2rayN.Handler
{ {
Action<bool, string> _updateFunc; Action<bool, string> _updateFunc;
private Config _config; private Config _config;
public bool updateSubscriptionProcessCompleted = false;
public event EventHandler<ResultEventArgs> AbsoluteCompleted; public event EventHandler<ResultEventArgs> AbsoluteCompleted;
public class ResultEventArgs : EventArgs public class ResultEventArgs : EventArgs