From aaac344d6d3cb87188735a4a3ac41c05d6ae8249 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 9 Mar 2018 18:02:39 +0100 Subject: [PATCH] ArchiBoT/ASF code unification --- ArchiSteamFarm/ASF.cs | 6 +++--- ArchiSteamFarm/WebBrowser.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ArchiSteamFarm/ASF.cs b/ArchiSteamFarm/ASF.cs index 9ab76f4c5..9352b6044 100644 --- a/ArchiSteamFarm/ASF.cs +++ b/ArchiSteamFarm/ASF.cs @@ -92,7 +92,7 @@ namespace ArchiSteamFarm { if (Program.GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Stable) { WebBrowser.ObjectResponse objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry(releaseURL).ConfigureAwait(false); - if (objectResponse == null) { + if (objectResponse?.Content == null) { ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed); return null; } @@ -100,7 +100,7 @@ namespace ArchiSteamFarm { releaseResponse = objectResponse.Content; } else { WebBrowser.ObjectResponse> objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry>(releaseURL).ConfigureAwait(false); - if ((objectResponse == null) || (objectResponse.Content.Count == 0)) { + if ((objectResponse?.Content == null) || (objectResponse.Content.Count == 0)) { ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed); return null; } @@ -155,7 +155,7 @@ namespace ArchiSteamFarm { ArchiLogger.LogGenericInfo(string.Format(Strings.UpdateDownloadingNewVersion, newVersion, binaryAsset.Size / 1024 / 1024)); WebBrowser.BinaryResponse response = await Program.WebBrowser.UrlGetToBinaryWithProgressRetry(binaryAsset.DownloadURL).ConfigureAwait(false); - if (response == null) { + if (response?.Content == null) { return null; } diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index 802cdf1c4..8b1030934 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -129,7 +129,7 @@ namespace ArchiSteamFarm { StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false); - if (response == null) { + if (string.IsNullOrEmpty(response?.Content)) { return null; } @@ -158,7 +158,7 @@ namespace ArchiSteamFarm { StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false); - if (response == null) { + if (string.IsNullOrEmpty(response?.Content)) { return null; } @@ -245,7 +245,7 @@ namespace ArchiSteamFarm { StringResponse response = await UrlPostToStringRetry(request, data, referer).ConfigureAwait(false); - if (response == null) { + if (string.IsNullOrEmpty(response?.Content)) { return null; }