mirror of
https://github.com/2dust/v2rayN.git
synced 2026-03-12 11:23:01 +00:00
Code cleanup: pattern matching and minor fixes
This commit is contained in:
parent
0c2114d2e1
commit
26f65dd3b2
8 changed files with 11 additions and 12 deletions
|
|
@ -81,7 +81,9 @@ public class NodeValidator
|
||||||
{
|
{
|
||||||
var transportError = ValidateSingboxTransport(item.ConfigType, net);
|
var transportError = ValidateSingboxTransport(item.ConfigType, net);
|
||||||
if (transportError != null)
|
if (transportError != null)
|
||||||
|
{
|
||||||
v.Error(transportError);
|
v.Error(transportError);
|
||||||
|
}
|
||||||
|
|
||||||
if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
|
if (!Global.SingboxSupportConfigType.Contains(item.ConfigType))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1040,8 +1040,8 @@ public static class ConfigHandler
|
||||||
|
|
||||||
if (profileItem.StreamSecurity.IsNotEmpty())
|
if (profileItem.StreamSecurity.IsNotEmpty())
|
||||||
{
|
{
|
||||||
if (profileItem.StreamSecurity != Global.StreamSecurity
|
if (profileItem.StreamSecurity is not Global.StreamSecurity
|
||||||
&& profileItem.StreamSecurity != Global.StreamSecurityReality)
|
and not Global.StreamSecurityReality)
|
||||||
{
|
{
|
||||||
profileItem.StreamSecurity = string.Empty;
|
profileItem.StreamSecurity = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,6 @@ public class ServerTestItem
|
||||||
public EConfigType ConfigType { get; set; }
|
public EConfigType ConfigType { get; set; }
|
||||||
public bool AllowTest { get; set; }
|
public bool AllowTest { get; set; }
|
||||||
public int QueueNum { get; set; }
|
public int QueueNum { get; set; }
|
||||||
public required ProfileItem Profile { get; set; }
|
public ProfileItem Profile { get; set; }
|
||||||
public ECoreType CoreType { get; set; }
|
public ECoreType CoreType { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,6 @@ public partial class CoreConfigSingboxService
|
||||||
if (Utils.IsIpv6(predefined))
|
if (Utils.IsIpv6(predefined))
|
||||||
{
|
{
|
||||||
rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
|
rule.answer = new List<string> { $"*. IN AAAA {predefined}" };
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,7 @@ public partial class ProfilesSelectWindow
|
||||||
|
|
||||||
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
|
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var colHeader = sender as DataGridColumnHeader;
|
if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
|
||||||
if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -233,8 +233,7 @@ public partial class ProfilesView
|
||||||
|
|
||||||
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
|
private void LstProfiles_ColumnHeader_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var colHeader = sender as DataGridColumnHeader;
|
if (sender is not DataGridColumnHeader colHeader || colHeader.TabIndex < 0 || colHeader.Column == null)
|
||||||
if (colHeader == null || colHeader.TabIndex < 0 || colHeader.Column == null)
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue