Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-06 17:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ArchiBoT/ASF code unification

Browse Source
This commit is contained in:
JustArchi
2018-03-09 18:02:39 +01:00
parent e49575bdc0
commit aaac344d6d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArchiSteamFarm/ASF.cs
View File

@@ -92,7 +92,7 @@ namespace ArchiSteamFarm {
if (Program.GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Stable) { if (Program.GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Stable) {
WebBrowser.ObjectResponse<GitHub.ReleaseResponse> objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry<GitHub.ReleaseResponse>(releaseURL).ConfigureAwait(false); WebBrowser.ObjectResponse<GitHub.ReleaseResponse> objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry<GitHub.ReleaseResponse>(releaseURL).ConfigureAwait(false);
if (objectResponse == null) { if (objectResponse?.Content == null) {
ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed); ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed);
return null; return null;
} }
@@ -100,7 +100,7 @@ namespace ArchiSteamFarm {
releaseResponse = objectResponse.Content; releaseResponse = objectResponse.Content;
} else { } else {
WebBrowser.ObjectResponse<List<GitHub.ReleaseResponse>> objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry<List<GitHub.ReleaseResponse>>(releaseURL).ConfigureAwait(false); WebBrowser.ObjectResponse<List<GitHub.ReleaseResponse>> objectResponse = await Program.WebBrowser.UrlGetToJsonObjectRetry<List<GitHub.ReleaseResponse>>(releaseURL).ConfigureAwait(false);
if ((objectResponse == null) || (objectResponse.Content.Count == 0)) { if ((objectResponse?.Content == null) || (objectResponse.Content.Count == 0)) {
ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed); ArchiLogger.LogGenericWarning(Strings.ErrorUpdateCheckFailed);
return null; return null;
} }
@@ -155,7 +155,7 @@ namespace ArchiSteamFarm {
ArchiLogger.LogGenericInfo(string.Format(Strings.UpdateDownloadingNewVersion, newVersion, binaryAsset.Size / 1024 / 1024)); ArchiLogger.LogGenericInfo(string.Format(Strings.UpdateDownloadingNewVersion, newVersion, binaryAsset.Size / 1024 / 1024));
WebBrowser.BinaryResponse response = await Program.WebBrowser.UrlGetToBinaryWithProgressRetry(binaryAsset.DownloadURL).ConfigureAwait(false); WebBrowser.BinaryResponse response = await Program.WebBrowser.UrlGetToBinaryWithProgressRetry(binaryAsset.DownloadURL).ConfigureAwait(false);
if (response == null) { if (response?.Content == null) {
return null; return null;
} }

6
ArchiSteamFarm/WebBrowser.cs
View File

@@ -129,7 +129,7 @@ namespace ArchiSteamFarm {
StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false); StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false);
if (response == null) { if (string.IsNullOrEmpty(response?.Content)) {
return null; return null;
} }
@@ -158,7 +158,7 @@ namespace ArchiSteamFarm {
StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false); StringResponse response = await UrlGetToStringRetry(request, referer).ConfigureAwait(false);
if (response == null) { if (string.IsNullOrEmpty(response?.Content)) {
return null; return null;
} }
@@ -245,7 +245,7 @@ namespace ArchiSteamFarm {
StringResponse response = await UrlPostToStringRetry(request, data, referer).ConfigureAwait(false); StringResponse response = await UrlPostToStringRetry(request, data, referer).ConfigureAwait(false);
if (response == null) { if (string.IsNullOrEmpty(response?.Content)) {
return null; return null;
} }