pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-19 19:55:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace all Utils.IsNullOrEmpty(variable) with variable.IsNullOrEmpty()

Browse Source
This commit is contained in:
2dust
2025-03-05 19:44:49 +08:00
parent f3af831cf2
commit 71cc6d7a88
34 changed files with 153 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs
+4 -4
View File
@@ -43,13 +43,13 @@ namespace ServiceLib.ViewModels
private async Task SaveServerAsync()
{
string remarks = SelectedSource.Remarks;
if (Utils.IsNullOrEmpty(remarks))
if (remarks.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
return;
}
if (Utils.IsNullOrEmpty(SelectedSource.Address))
if (SelectedSource.Address.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
return;
@@ -69,7 +69,7 @@ namespace ServiceLib.ViewModels
public async Task BrowseServer(string fileName)
{
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return;
}
@@ -95,7 +95,7 @@ namespace ServiceLib.ViewModels
private async Task EditServer()
{
var address = SelectedSource.Address;
if (Utils.IsNullOrEmpty(address))
if (address.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
return;
v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs
+6 -6
View File
@@ -41,19 +41,19 @@ namespace ServiceLib.ViewModels
private async Task SaveServerAsync()
{
if (Utils.IsNullOrEmpty(SelectedSource.Remarks))
if (SelectedSource.Remarks.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
return;
}
if (Utils.IsNullOrEmpty(SelectedSource.Address))
if (SelectedSource.Address.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.FillServerAddress);
return;
}
var port = SelectedSource.Port.ToString();
if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
if (port.IsNullOrEmpty() || !Utils.IsNumeric(port)
|| SelectedSource.Port <= 0 || SelectedSource.Port >= Global.MaxPort)
{
NoticeHandler.Instance.Enqueue(ResUI.FillCorrectServerPort);
@@ -61,12 +61,12 @@ namespace ServiceLib.ViewModels
}
if (SelectedSource.ConfigType == EConfigType.Shadowsocks)
{
if (Utils.IsNullOrEmpty(SelectedSource.Id))
if (SelectedSource.Id.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.FillPassword);
return;
}
if (Utils.IsNullOrEmpty(SelectedSource.Security))
if (SelectedSource.Security.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectEncryption);
return;
@@ -75,7 +75,7 @@ namespace ServiceLib.ViewModels
if (SelectedSource.ConfigType != EConfigType.SOCKS
&& SelectedSource.ConfigType != EConfigType.HTTP)
{
if (Utils.IsNullOrEmpty(SelectedSource.Id))
if (SelectedSource.Id.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.FillUUID);
return;
v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs
+2 -2
View File
@@ -114,7 +114,7 @@ namespace ServiceLib.ViewModels
public async Task LocalRestore(string fileName)
{
DisplayOperationMsg();
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return;
}
@@ -164,7 +164,7 @@ namespace ServiceLib.ViewModels
private async Task<bool> CreateZipFileFromDirectory(string fileName)
{
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return false;
}
v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs
+1 -1
View File
@@ -100,7 +100,7 @@ namespace ServiceLib.ViewModels
var lstModel = new List<ClashConnectionModel>();
foreach (var item in connections ?? new())
{
var host = $"{(Utils.IsNullOrEmpty(item.metadata.host) ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
var host = $"{(item.metadata.host.IsNullOrEmpty() ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
if (HostFilter.IsNotEmpty() && !host.Contains(HostFilter))
{
continue;
v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs
+7 -7
View File
@@ -193,7 +193,7 @@ namespace ServiceLib.ViewModels
{
foreach (var it in proxyGroups)
{
if (Utils.IsNullOrEmpty(it.name) || !_proxies.ContainsKey(it.name))
if (it.name.IsNullOrEmpty() || !_proxies.ContainsKey(it.name))
{
continue;
}
@@ -256,7 +256,7 @@ namespace ServiceLib.ViewModels
return;
}
var name = SelectedGroup?.Name;
if (Utils.IsNullOrEmpty(name))
if (name.IsNullOrEmpty())
{
return;
}
@@ -341,21 +341,21 @@ namespace ServiceLib.ViewModels
public async Task SetActiveProxy()
{
if (SelectedGroup == null || Utils.IsNullOrEmpty(SelectedGroup.Name))
if (SelectedGroup == null || SelectedGroup.Name.IsNullOrEmpty())
{
return;
}
if (SelectedDetail == null || Utils.IsNullOrEmpty(SelectedDetail.Name))
if (SelectedDetail == null || SelectedDetail.Name.IsNullOrEmpty())
{
return;
}
var name = SelectedGroup.Name;
if (Utils.IsNullOrEmpty(name))
if (name.IsNullOrEmpty())
{
return;
}
var nameNode = SelectedDetail.Name;
if (Utils.IsNullOrEmpty(nameNode))
if (nameNode.IsNullOrEmpty())
{
return;
}
@@ -390,7 +390,7 @@ namespace ServiceLib.ViewModels
await GetClashProxies(true);
return;
}
if (Utils.IsNullOrEmpty(result))
if (result.IsNullOrEmpty())
{
return;
}
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+2 -2
View File
@@ -421,7 +421,7 @@ namespace ServiceLib.ViewModels
public async Task ScanImageResult(string fileName)
{
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return;
}
@@ -432,7 +432,7 @@ namespace ServiceLib.ViewModels
private async Task AddScanResultAsync(string? result)
{
if (Utils.IsNullOrEmpty(result))
if (result.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.NoValidQRcodeFound);
}
v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs
+1 -1
View File
@@ -266,7 +266,7 @@ namespace ServiceLib.ViewModels
private async Task SaveSettingAsync()
{
if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
if (localPort.ToString().IsNullOrEmpty() || !Utils.IsNumeric(localPort.ToString())
|| localPort <= 0 || localPort >= Global.MaxPort)
{
NoticeHandler.Instance.Enqueue(ResUI.FillLocalListeningPort);
v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+10 -10
View File
@@ -267,7 +267,7 @@ namespace ServiceLib.ViewModels
public void SetSpeedTestResult(SpeedTestResult result)
{
if (Utils.IsNullOrEmpty(result.IndexId))
if (result.IndexId.IsNullOrEmpty())
{
NoticeHandler.Instance.SendMessageEx(result.Delay);
NoticeHandler.Instance.Enqueue(result.Delay);
@@ -350,7 +350,7 @@ namespace ServiceLib.ViewModels
return;
}
_serverFilter = ServerFilter;
if (Utils.IsNullOrEmpty(_serverFilter))
if (_serverFilter.IsNullOrEmpty())
{
RefreshServers();
}
@@ -476,7 +476,7 @@ namespace ServiceLib.ViewModels
public async Task EditServerAsync(EConfigType eConfigType)
{
if (Utils.IsNullOrEmpty(SelectedProfile?.IndexId))
if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
{
return;
}
@@ -557,7 +557,7 @@ namespace ServiceLib.ViewModels
public async Task SetDefaultServer()
{
if (Utils.IsNullOrEmpty(SelectedProfile?.IndexId))
if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
{
return;
}
@@ -566,7 +566,7 @@ namespace ServiceLib.ViewModels
public async Task SetDefaultServer(string indexId)
{
if (Utils.IsNullOrEmpty(indexId))
if (indexId.IsNullOrEmpty())
{
return;
}
@@ -598,7 +598,7 @@ namespace ServiceLib.ViewModels
{
return;
}
if (Utils.IsNullOrEmpty(SelectedServer.ID))
if (SelectedServer.ID.IsNullOrEmpty())
{
return;
}
@@ -614,7 +614,7 @@ namespace ServiceLib.ViewModels
return;
}
var url = FmtHandler.GetShareUri(item);
if (Utils.IsNullOrEmpty(url))
if (url.IsNullOrEmpty())
{
return;
}
@@ -649,7 +649,7 @@ namespace ServiceLib.ViewModels
public async Task SortServer(string colName)
{
if (Utils.IsNullOrEmpty(colName))
if (colName.IsNullOrEmpty())
{
return;
}
@@ -776,7 +776,7 @@ namespace ServiceLib.ViewModels
public async Task Export2ClientConfigResult(string fileName, ProfileItem item)
{
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return;
}
@@ -803,7 +803,7 @@ namespace ServiceLib.ViewModels
foreach (var it in lstSelecteds)
{
var url = FmtHandler.GetShareUri(it);
if (Utils.IsNullOrEmpty(url))
if (url.IsNullOrEmpty())
{
continue;
}
v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs
+5 -5
View File
@@ -224,7 +224,7 @@ namespace ServiceLib.ViewModels
private async Task SaveRoutingAsync()
{
string remarks = SelectedRouting.Remarks;
if (Utils.IsNullOrEmpty(remarks))
if (remarks.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
return;
@@ -252,13 +252,13 @@ namespace ServiceLib.ViewModels
public async Task ImportRulesFromFileAsync(string fileName)
{
if (Utils.IsNullOrEmpty(fileName))
if (fileName.IsNullOrEmpty())
{
return;
}
var result = EmbedUtils.LoadResource(fileName);
if (Utils.IsNullOrEmpty(result))
if (result.IsNullOrEmpty())
{
return;
}
@@ -288,7 +288,7 @@ namespace ServiceLib.ViewModels
private async Task ImportRulesFromUrl()
{
var url = SelectedRouting.Url;
if (Utils.IsNullOrEmpty(url))
if (url.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.MsgNeedUrl);
return;
@@ -311,7 +311,7 @@ namespace ServiceLib.ViewModels
{
blReplace = true;
}
if (Utils.IsNullOrEmpty(clipboardData))
if (clipboardData.IsNullOrEmpty())
{
return -1;
}
v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+1 -1
View File
@@ -301,7 +301,7 @@ namespace ServiceLib.ViewModels
{
return;
}
if (Utils.IsNullOrEmpty(SelectedServer.ID))
if (SelectedServer.ID.IsNullOrEmpty())
{
return;
}
v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace ServiceLib.ViewModels
private async Task SaveSubAsync()
{
var remarks = SelectedSource.Remarks;
if (Utils.IsNullOrEmpty(remarks))
if (remarks.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
return;