Resolves #4

tiuub · Feb 22, 2021 · 534cab2 · 534cab2
1 parent aba8769
commit 534cab2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /.vs/*
 /*/bin/*
 /*/obj/*
+makeplgx.bat
diff --git a/KP2faChecker/Forms/KP2faC_SearchForm.Designer.cs b/KP2faChecker/Forms/KP2faC_SearchForm.Designer.cs
diff --git a/KP2faChecker/KP2faC_FileloaderAsync.cs b/KP2faChecker/KP2faC_FileloaderAsync.cs
@@ -32,7 +32,11 @@ public async Task<string> GetJsonAsync(getJsonMode mode = getJsonMode.None)
             await Task.Delay(1000);
             if (mode == getJsonMode.Offline || (mode != getJsonMode.Online && await TestOfflineFileAsync()))
             {
-                return await GetOfflineJsonFileAsync();
+                string json = await GetOfflineJsonFileAsync();
+                if (json.StartsWith("null"))
+                    return await GetJsonAsync(getJsonMode.Online);
+                else
+                    return json;
             }
             else
             {

diff --git a/KP2faChecker/KP2faCheckerExt.cs b/KP2faChecker/KP2faCheckerExt.cs
@@ -67,7 +67,7 @@ public static async void init(bool refresh = false)
             KP2faC_FileloaderAsync fileloader = new KP2faC_FileloaderAsync(m_config);
             string json = await fileloader.GetJsonAsync();
 
-            if (!json.Equals("KP2faC API error"))
+            if (!json.Equals("KP2faC API error") && !json.StartsWith("null"))
             {
                 List<KP2faC_Website> websites = JsonConvert.DeserializeObject<List<KP2faC_Website>>(json);
                 foreach (KP2faC_Website website in websites)

diff --git a/KP2faChecker/Properties/AssemblyInfo.cs b/KP2faChecker/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]
diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
 :
-KP2faChecker:1.1.0.0
+KP2faChecker:1.1.1.0
 :