Fixed crash when launching the app without internet connection (#605)

fixes #605
Leo-Corporation · Aug 23, 2024 · e8cb5c0 · e8cb5c0
1 parent 28d0990
commit e8cb5c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs
@@ -287,10 +287,16 @@ public static bool IsUrlValid(string url)
 
 	public async static Task<IPInfo?> GetIPInfoAsync(string ip)
 	{
-		HttpClient httpClient = new();
-		string result = await httpClient.GetStringAsync($"http://ip-api.com/json/{ip}");
-
-		return JsonSerializer.Deserialize<IPInfo>(result);
+		try
+		{
+			HttpClient httpClient = new();
+			string result = await httpClient.GetStringAsync($"http://ip-api.com/json/{ip}");
+			return JsonSerializer.Deserialize<IPInfo>(result);
+		}
+		catch
+		{
+			return null;
+		}
 	}
 
 	public static bool IsIpValid(string ip)

diff --git a/InternetTest/InternetTest/Pages/HomePage.xaml.cs b/InternetTest/InternetTest/Pages/HomePage.xaml.cs
@@ -82,7 +82,7 @@ internal async void InitUI()
 		LoadNetworkCard();
 
 		// Load "My IP" section
-		ip = (await Global.GetIPInfoAsync("")).Query ?? "";
+		ip = (await Global.GetIPInfoAsync(""))?.Query ?? "";
 	}
 
 	private async void RefreshStatusBtn_Click(object sender, System.Windows.RoutedEventArgs e)
@@ -127,7 +127,7 @@ private void RefreshNetworkBtn_Click(object sender, System.Windows.RoutedEventAr
 	string ip = "";
 	private async void RefreshMyIpBtn_Click(object sender, System.Windows.RoutedEventArgs e)
 	{
-		ip = (await Global.GetIPInfoAsync("")).Query ?? "";
+		ip = (await Global.GetIPInfoAsync(""))?.Query ?? "";
 	}
 
 	private void MyIpBorder_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)