Also catch IOExceptions in ApiClient (should fix issue #1)

mcebular · Nov 11, 2020 · 3a7f541 · 3a7f541
1 parent 96031a3
commit 3a7f541
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/SyncthingStatus/ApiClient.cs b/SyncthingStatus/ApiClient.cs
@@ -1,4 +1,6 @@
 using SyncthingStatus.Data;
+using System;
+using System.IO;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
@@ -34,7 +36,8 @@ internal static async Task<PingResponse> Ping()
             {
                 var result = await client.GetFromJsonAsync<PingResponse>("/rest/system/ping");
                 return result;
-            } catch(HttpRequestException)
+            }
+            catch (Exception ex) when (ex is HttpRequestException || ex is IOException)
             {
                 return null;
             }
@@ -46,7 +49,8 @@ internal static async Task<VersionResponse> Version()
             {
                 var result = await client.GetFromJsonAsync<VersionResponse>("/rest/system/version");
                 return result;
-            } catch (HttpRequestException)
+            }
+            catch (Exception ex) when (ex is HttpRequestException || ex is IOException)
             {
                 return null;
             }
@@ -59,7 +63,8 @@ internal static async Task<VersionResponse> Version()
                 var errors = new { Errors = new ErrorResponse.Error[0] };
                 var result = await client.GetFromJsonAsync<ErrorResponse>("/rest/system/error");
                 return result.Errors;
-            } catch(HttpRequestException)
+            }
+            catch (Exception ex) when (ex is HttpRequestException || ex is IOException)
             {
                 return null;
             }
@@ -71,7 +76,8 @@ internal static async Task<ConfigResponse> Config()
             {
                 var result = await client.GetFromJsonAsync<ConfigResponse>("/rest/system/config");
                 return result;
-            } catch (HttpRequestException)
+            }
+            catch (Exception ex) when (ex is HttpRequestException || ex is IOException)
             {
                 return null;
             }

diff --git a/SyncthingStatus/SyncthingStatus.csproj b/SyncthingStatus/SyncthingStatus.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>Resources\think.ico</ApplicationIcon>
-    <Version>0.3</Version>
+    <Version>0.4</Version>
     <PackageProjectUrl></PackageProjectUrl>
   </PropertyGroup>