OSDN Git Service

JSON以外のレスポンスが返ってもエラーダイアログを表示しない
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Thu, 14 Apr 2016 14:10:14 +0000 (23:10 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Thu, 14 Apr 2016 14:10:14 +0000 (23:10 +0900)
KancolleSniffer/MainForm.cs

index dcd1b14..7a54f0f 100644 (file)
@@ -96,7 +96,6 @@ namespace KancolleSniffer
             if (response == null || !response.StartsWith("svdata="))\r
             {\r
                 WriteDebugLog(url, request, response);\r
-                ShowServerError(url, request, response);\r
                 return;\r
             }\r
             if (_config.KancolleDb.On)\r
@@ -105,17 +104,7 @@ namespace KancolleSniffer
             WriteDebugLog(url, request, response);\r
             try\r
             {\r
-                var update = _sniffer.Sniff(url, request, JsonParser.Parse(response));\r
-                if (update == Sniffer.Update.Error)\r
-                {\r
-                    ShowServerError(url, request, response);\r
-                    return;\r
-                }\r
-                UpdateInfo(update);\r
-            }\r
-            catch (FormatException e)\r
-            {\r
-                ShowServerError(url, request, response, e);\r
+                UpdateInfo(_sniffer.Sniff(url, request, JsonParser.Parse(response)));\r
             }\r
             catch (RuntimeBinderException e)\r
             {\r
@@ -144,14 +133,6 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void ShowServerError(string url, string request, string response, Exception e = null)\r
-        {\r
-            if (_errorDialog.ShowDialog(this, "サーバーからの応答が異常です。",\r
-                $"{(e == null ? "" : e + "\r\n")}url: {url}\r\nrequest: {request}\r\nresponse: {response ?? "(null)"}\r\n") ==\r
-                DialogResult.Abort)\r
-                Application.Exit();\r
-        }\r
-\r
         private string UnescapeString(string s)\r
         {\r
             try\r