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

Remove v2fly-core UI operation support

pull/6211/head
2dust 2024-12-03 13:58:56 +08:00
parent c32b9812a7
commit 5494d63878
5 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/ServiceLib/Enums/ECoreType.cs
View File

@ -5,9 +5,7 @@
v2fly = 1, v2fly = 1,
Xray = 2, Xray = 2,
v2fly_v5 = 4, v2fly_v5 = 4,
mihomo = 13, mihomo = 13,
hysteria = 21, hysteria = 21,
naiveproxy = 22, naiveproxy = 22,
tuic = 23, tuic = 23,

3
v2rayN/ServiceLib/Global.cs
View File

@ -182,8 +182,7 @@
public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" }; public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "h2", "quic", "grpc" }; public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "h2", "quic", "grpc" };
public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" }; public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
public static readonly List<string> CoreTypes = new() { "v2fly", "Xray", "sing_box" }; public static readonly List<string> CoreTypes = new() { "Xray", "sing_box" };
public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" }; public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" }; public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" }; public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };

12
v2rayN/ServiceLib/Handler/AppHandler.cs
View File

@ -264,16 +264,8 @@
return (ECoreType)profileItem.CoreType; return (ECoreType)profileItem.CoreType;
} }
if (_config.CoreTypeItem == null) var item = _config.CoreTypeItem?.FirstOrDefault(it => it.ConfigType == eConfigType);
{ return item?.CoreType ?? ECoreType.Xray;
return ECoreType.Xray;
}
var item = _config.CoreTypeItem.FirstOrDefault(it => it.ConfigType == eConfigType);
if (item == null)
{
return ECoreType.Xray;
}
return item.CoreType;
} }
#endregion Core Type #endregion Core Type

16
v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
View File

@ -26,20 +26,10 @@ namespace v2rayN.Desktop.Views
ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler); ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler);
if (profileItem.ConfigType == EConfigType.VLESS) Global.CoreTypes.ForEach(it =>
{ {
Global.CoreTypes4VLESS.ForEach(it => cmbCoreType.Items.Add(it);
{ });
cmbCoreType.Items.Add(it);
});
}
else
{
Global.CoreTypes.ForEach(it =>
{
cmbCoreType.Items.Add(it);
});
}
cmbCoreType.Items.Add(string.Empty); cmbCoreType.Items.Add(string.Empty);
cmbStreamSecurity.Items.Add(string.Empty); cmbStreamSecurity.Items.Add(string.Empty);

16
v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
View File

@ -20,20 +20,10 @@ namespace v2rayN.Views
ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler); ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler);
if (profileItem.ConfigType == EConfigType.VLESS) Global.CoreTypes.ForEach(it =>
{ {
Global.CoreTypes4VLESS.ForEach(it => cmbCoreType.Items.Add(it);
{ });
cmbCoreType.Items.Add(it);
});
}
else
{
Global.CoreTypes.ForEach(it =>
{
cmbCoreType.Items.Add(it);
});
}
cmbCoreType.Items.Add(string.Empty); cmbCoreType.Items.Add(string.Empty);
cmbStreamSecurity.Items.Add(string.Empty); cmbStreamSecurity.Items.Add(string.Empty);