Get used to null propagation

JustArchi · JustArchi · commit feb3fbfe59c6 · 2016-07-10T20:17:35.000+02:00
diff --git a/ArchiSteamFarm.sln.DotSettings b/ArchiSteamFarm.sln.DotSettings
@@ -10,6 +10,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FS/@EntryIndexedValue">FS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTML/@EntryIndexedValue">HTML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OK/@EntryIndexedValue">OK</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PIN/@EntryIndexedValue">PIN</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SC/@EntryIndexedValue">SC</s:String>
diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs
@@ -377,11 +377,8 @@ internal async Task<Dictionary<uint, string>> GetOwnedGames() {
 			string request = SteamCommunityURL + "/my/games/?xml=1";
 
 			XmlDocument response = await WebBrowser.UrlGetToXMLRetry(request).ConfigureAwait(false);
-			if (response == null) {
-				return null;
-			}
 
-			XmlNodeList xmlNodeList = response.SelectNodes("gamesList/games/game");
+			XmlNodeList xmlNodeList = response?.SelectNodes("gamesList/games/game");
 			if ((xmlNodeList == null) || (xmlNodeList.Count == 0)) {
 				return null;
 			}
@@ -492,11 +489,8 @@ internal uint GetServerTime() {
 			string request = SteamCommunityURL + "/tradeoffer/" + tradeID + "?l=english";
 
 			HtmlDocument htmlDocument = await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
-			if (htmlDocument == null) {
-				return null;
-			}
 
-			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//div[@class='pagecontent']/script");
+			HtmlNode htmlNode = htmlDocument?.DocumentNode.SelectSingleNode("//div[@class='pagecontent']/script");
 			if (htmlNode == null) { // Trade can be no longer valid
 				return null;
 			}
@@ -713,11 +707,8 @@ internal bool DeclineTradeOffer(ulong tradeID) {
 				string request = SteamCommunityURL + "/my/inventory/json/" + Steam.Item.SteamAppID + "/" + Steam.Item.SteamContextID + "?trading=" + (tradable ? "1" : "0") + "&start=" + currentPage;
 
 				JObject jObject = await WebBrowser.UrlGetToJObjectRetry(request).ConfigureAwait(false);
-				if (jObject == null) {
-					return null;
-				}
 
-				IEnumerable<JToken> descriptions = jObject.SelectTokens("$.rgDescriptions.*");
+				IEnumerable<JToken> descriptions = jObject?.SelectTokens("$.rgDescriptions.*");
 				if (descriptions == null) {
 					return null; // OK, empty inventory
 				}
@@ -913,11 +904,7 @@ internal async Task<bool> MarkInventory() {
 			string request = SteamCommunityURL + "/my/videos";
 
 			Uri uri = await WebBrowser.UrlHeadToUriRetry(request).ConfigureAwait(false);
-			if (uri == null) {
-				return null;
-			}
-
-			return !uri.AbsolutePath.StartsWith("/login", StringComparison.Ordinal);
+			return !uri?.AbsolutePath.StartsWith("/login", StringComparison.Ordinal);
 		}
 
 		private async Task<bool> RefreshSessionIfNeeded() {
diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs
@@ -252,25 +252,11 @@ public void Dispose() {
 			LoginSemaphore.Dispose();
 			HandledGifts.Dispose();
 
-			if (AcceptConfirmationsTimer != null) {
-				AcceptConfirmationsTimer.Dispose();
-			}
-
-			if (ArchiWebHandler != null) {
-				ArchiWebHandler.Dispose();
-			}
-
-			if (CardsFarmer != null) {
-				CardsFarmer.Dispose();
-			}
-
-			if (SendItemsTimer != null) {
-				SendItemsTimer.Dispose();
-			}
-
-			if (Trading != null) {
-				Trading.Dispose();
-			}
+			AcceptConfirmationsTimer?.Dispose();
+			ArchiWebHandler?.Dispose();
+			CardsFarmer?.Dispose();
+			SendItemsTimer?.Dispose();
+			Trading?.Dispose();
 		}
 
 		internal async Task AcceptConfirmations(bool accept, Steam.ConfirmationDetails.EType acceptedType = Steam.ConfirmationDetails.EType.Unknown, ulong acceptedSteamID = 0, HashSet<ulong> acceptedTradeIDs = null) {
@@ -333,7 +319,7 @@ internal async Task<bool> RefreshSession() {
 				return false;
 			}
 
-			if ((callback == null) || string.IsNullOrEmpty(callback.Nonce)) {
+			if (string.IsNullOrEmpty(callback?.Nonce)) {
 				Start().Forget();
 				return false;
 			}
@@ -1609,7 +1595,7 @@ private void OnFreeLicense(SteamApps.FreeLicenseCallback callback) {
 		}
 
 		private async void OnGuestPassList(SteamApps.GuestPassListCallback callback) {
-			if ((callback == null) || (callback.GuestPasses == null)) {
+			if (callback?.GuestPasses == null) {
 				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.GuestPasses), BotName);
 				return;
 			}
@@ -1647,7 +1633,7 @@ private async void OnGuestPassList(SteamApps.GuestPassListCallback callback) {
 		}
 
 		private void OnChatInvite(SteamFriends.ChatInviteCallback callback) {
-			if ((callback == null) || (callback.ChatRoomID == null) || (callback.PatronID == null)) {
+			if ((callback?.ChatRoomID == null) || (callback.PatronID == null)) {
 				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.ChatRoomID) + " || " + nameof(callback.PatronID), BotName);
 				return;
 			}
@@ -1689,7 +1675,7 @@ private async void OnChatMsg(SteamFriends.ChatMsgCallback callback) {
 		}
 
 		private void OnFriendsList(SteamFriends.FriendsListCallback callback) {
-			if ((callback == null) || (callback.FriendList == null)) {
+			if (callback?.FriendList == null) {
 				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.FriendList), BotName);
 				return;
 			}
@@ -1722,7 +1708,7 @@ private async void OnFriendMsg(SteamFriends.FriendMsgCallback callback) {
 		}
 
 		private async void OnFriendMsgHistory(SteamFriends.FriendMsgHistoryCallback callback) {
-			if ((callback == null) || (callback.Messages == null) || (callback.SteamID == null)) {
+			if ((callback?.Messages == null) || (callback.SteamID == null)) {
 				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.Messages) + " || " + nameof(callback.SteamID), BotName);
 				return;
 			}
@@ -1865,7 +1851,7 @@ private async void OnLoggedOn(SteamUser.LoggedOnCallback callback) {
 		}
 
 		private void OnLoginKey(SteamUser.LoginKeyCallback callback) {
-			if ((callback == null) || string.IsNullOrEmpty(callback.LoginKey)) {
+			if (string.IsNullOrEmpty(callback?.LoginKey)) {
 				Logging.LogNullError(nameof(callback) + " || " + nameof(callback.LoginKey), BotName);
 				return;
 			}
diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs
@@ -75,9 +75,7 @@ public void Dispose() {
 			FarmResetEvent.Dispose();
 			FarmingSemaphore.Dispose();
 
-			if (Timer != null) {
-				Timer.Dispose();
-			}
+			Timer?.Dispose();
 		}
 
 		internal async Task SwitchToManualMode(bool manualMode) {
diff --git a/ArchiSteamFarm/ConcurrentEnumerator.cs b/ArchiSteamFarm/ConcurrentEnumerator.cs
@@ -50,10 +50,6 @@ internal ConcurrentEnumerator(ICollection<T> collection, ReaderWriterLockSlim rw
 		public bool MoveNext() => Enumerator.MoveNext();
 		public void Reset() => Enumerator.Reset();
 
-		public void Dispose() {
-			if (Lock != null) {
-				Lock.ExitReadLock();
-			}
-		}
+		public void Dispose() => Lock?.ExitReadLock();
 	}
 }
diff --git a/ArchiSteamFarm/ConcurrentHashSet.cs b/ArchiSteamFarm/ConcurrentHashSet.cs
@@ -100,11 +100,7 @@ public bool Remove(T item) {
 			}
 		}
 
-		public void Dispose() {
-			if (Lock != null) {
-				Lock.Dispose();
-			}
-		}
+		public void Dispose() => Lock?.Dispose();
 
 		public void CopyTo(T[] array, int arrayIndex) {
 			Lock.EnterReadLock();
diff --git a/ArchiSteamFarm/GlobalDatabase.cs b/ArchiSteamFarm/GlobalDatabase.cs
@@ -91,14 +91,7 @@ internal static GlobalDatabase Load(string filePath) {
 			return globalDatabase;
 		}
 
-		private void OnServerListUpdated(object sender, EventArgs e) {
-			if ((sender == null) || (e == null)) {
-				Logging.LogNullError(nameof(sender) + " || " + nameof(e));
-				return;
-			}
-
-			Save();
-		}
+		private void OnServerListUpdated(object sender, EventArgs e) => Save();
 
 		// This constructor is used when creating new database
 		private GlobalDatabase(string filePath) : this() {
diff --git a/ArchiSteamFarm/MobileAuthenticator.cs b/ArchiSteamFarm/MobileAuthenticator.cs
@@ -173,11 +173,8 @@ internal async Task<HashSet<Confirmation>> GetConfirmations() {
 			}
 
 			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetConfirmations(DeviceID, confirmationHash, time).ConfigureAwait(false);
-			if (htmlDocument == null) {
-				return null;
-			}
 
-			HtmlNodeCollection confirmationNodes = htmlDocument.DocumentNode.SelectNodes("//div[@class='mobileconf_list_entry']");
+			HtmlNodeCollection confirmationNodes = htmlDocument?.DocumentNode.SelectNodes("//div[@class='mobileconf_list_entry']");
 			if (confirmationNodes == null) {
 				return null;
 			}
diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs
@@ -437,17 +437,17 @@ private static void ParseArgs(IEnumerable<string> args) {
 		}
 
 		private static void UnhandledExceptionHandler(object sender, UnhandledExceptionEventArgs args) {
-			if ((sender == null) || (args == null) || (args.ExceptionObject == null)) {
-				Logging.LogNullError(nameof(sender) + " || " + nameof(args) + " || " + nameof(args.ExceptionObject));
+			if (args?.ExceptionObject == null) {
+				Logging.LogNullError(nameof(args) + " || " + nameof(args.ExceptionObject));
 				return;
 			}
 
 			Logging.LogFatalException((Exception) args.ExceptionObject);
 		}
 
 		private static void UnobservedTaskExceptionHandler(object sender, UnobservedTaskExceptionEventArgs args) {
-			if ((sender == null) || (args == null) || (args.Exception == null)) {
-				Logging.LogNullError(nameof(sender) + " || " + nameof(args) + " || " + nameof(args.Exception));
+			if (args?.Exception == null) {
+				Logging.LogNullError(nameof(args) + " || " + nameof(args.Exception));
 				return;
 			}
 
diff --git a/ArchiSteamFarm/WCF.cs b/ArchiSteamFarm/WCF.cs
@@ -75,13 +75,8 @@ public string HandleCommand(string input) {
 		}
 
 		public void Dispose() {
-			if (ServiceHost != null) {
-				ServiceHost.Close();
-			}
-
-			if (Client != null) {
-				Client.Close();
-			}
+			ServiceHost?.Close();
+			Client?.Close();
 		}
 
 		internal bool IsServerRunning() => ServiceHost != null;
diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs
@@ -365,7 +365,7 @@ private async Task<Uri> UrlHeadToUri(string request, string referer = null) {
 			}
 
 			using (HttpResponseMessage response = await UrlHeadToResponse(request, referer).ConfigureAwait(false)) {
-				return response == null ? null : response.RequestMessage.RequestUri;
+				return response?.RequestMessage.RequestUri;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,7 @@ public void Dispose() {`
`75`	`75`	`FarmResetEvent.Dispose();`
`76`	`76`	`FarmingSemaphore.Dispose();`
`77`	`77`
`78`		`- if (Timer != null) {`
`79`		`- Timer.Dispose();`
`80`		`- }`
	`78`	`+ Timer?.Dispose();`
`81`	`79`	`}`
`82`	`80`
`83`	`81`	`internal async Task SwitchToManualMode(bool manualMode) {`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,6 @@ internal ConcurrentEnumerator(ICollection<T> collection, ReaderWriterLockSlim rw`
`50`	`50`	`public bool MoveNext() => Enumerator.MoveNext();`
`51`	`51`	`public void Reset() => Enumerator.Reset();`
`52`	`52`
`53`		`- public void Dispose() {`
`54`		`- if (Lock != null) {`
`55`		`- Lock.ExitReadLock();`
`56`		`- }`
`57`		`- }`
	`53`	`+ public void Dispose() => Lock?.ExitReadLock();`
`58`	`54`	`}`
`59`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,7 @@ public bool Remove(T item) {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`- public void Dispose() {`
`104`		`- if (Lock != null) {`
`105`		`- Lock.Dispose();`
`106`		`- }`
`107`		`- }`
	`103`	`+ public void Dispose() => Lock?.Dispose();`
`108`	`104`
`109`	`105`	`public void CopyTo(T[] array, int arrayIndex) {`
`110`	`106`	`Lock.EnterReadLock();`
Original file line number	Diff line number	Diff line change
`@@ -173,11 +173,8 @@ internal async Task<HashSet<Confirmation>> GetConfirmations() {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetConfirmations(DeviceID, confirmationHash, time).ConfigureAwait(false);`
`176`		`- if (htmlDocument == null) {`
`177`		`- return null;`
`178`		`- }`
`179`	`176`
`180`		`- HtmlNodeCollection confirmationNodes = htmlDocument.DocumentNode.SelectNodes("//div[@class='mobileconf_list_entry']");`
	`177`	`+ HtmlNodeCollection confirmationNodes = htmlDocument?.DocumentNode.SelectNodes("//div[@class='mobileconf_list_entry']");`
`181`	`178`	`if (confirmationNodes == null) {`
`182`	`179`	`return null;`
`183`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -437,17 +437,17 @@ private static void ParseArgs(IEnumerable<string> args) {`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`private static void UnhandledExceptionHandler(object sender, UnhandledExceptionEventArgs args) {`
`440`		`- if ((sender == null) \|\| (args == null) \|\| (args.ExceptionObject == null)) {`
`441`		`- Logging.LogNullError(nameof(sender) + " \|\| " + nameof(args) + " \|\| " + nameof(args.ExceptionObject));`
	`440`	`+ if (args?.ExceptionObject == null) {`
	`441`	`+ Logging.LogNullError(nameof(args) + " \|\| " + nameof(args.ExceptionObject));`
`442`	`442`	`return;`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`Logging.LogFatalException((Exception) args.ExceptionObject);`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`private static void UnobservedTaskExceptionHandler(object sender, UnobservedTaskExceptionEventArgs args) {`
`449`		`- if ((sender == null) \|\| (args == null) \|\| (args.Exception == null)) {`
`450`		`- Logging.LogNullError(nameof(sender) + " \|\| " + nameof(args) + " \|\| " + nameof(args.Exception));`
	`449`	`+ if (args?.Exception == null) {`
	`450`	`+ Logging.LogNullError(nameof(args) + " \|\| " + nameof(args.Exception));`
`451`	`451`	`return;`
`452`	`452`	`}`
`453`	`453`
Original file line number	Diff line number	Diff line change
`@@ -75,13 +75,8 @@ public string HandleCommand(string input) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public void Dispose() {`
`78`		`- if (ServiceHost != null) {`
`79`		`- ServiceHost.Close();`
`80`		`- }`
`81`		`-`
`82`		`- if (Client != null) {`
`83`		`- Client.Close();`
`84`		`- }`
	`78`	`+ ServiceHost?.Close();`
	`79`	`+ Client?.Close();`
`85`	`80`	`}`
`86`	`81`
`87`	`82`	`internal bool IsServerRunning() => ServiceHost != null;`