Display Warning if JSON Parsing fails

Display a warning if parsing the JSON file fails.
sieren · May 27, 2019 · 928cf8d · 928cf8d
1 parent 0988a40
commit 928cf8d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/main/AppContext.cpp b/main/AppContext.cpp
@@ -1,5 +1,4 @@
 #include "AppContext.h"
-#include <fs/ConfigReader.hpp>
 #include "rapidjson/stringbuffer.h"
 
 #include <memory>

diff --git a/main/AppContext.h b/main/AppContext.h
@@ -4,7 +4,7 @@
 #include <mqtt/MQTTGroup.hpp>
 #include <ntp/NTPSync.h>
 #include <wifi/WifiContext.h>
-#include "rapidjson/document.h"
+#include <fs/ConfigReader.hpp>
 #include <memory>
 #include <tuple>
 #include <string>

diff --git a/main/fs/ConfigReader.hpp b/main/fs/ConfigReader.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <util/warnings.h>
 #include "rapidjson/document.h"
 #include "Filesystem.h"
 #include <mqtt/MQTTConnection.h>

diff --git a/main/main.cpp b/main/main.cpp
@@ -44,8 +44,17 @@ extern "C"
 
   void setupApp()
   {
-    mpAppContext->setup();
     mScreen.setupScreen();
+
+    try
+    {
+      mpAppContext->setup();
+    }
+    catch(const std::exception& e)
+    {
+      mScreen.showWarning(e.what());
+      return;
+    }
     const auto wifiCredentials = fs::ConfigReader::getWifiCredentials();
     mpAppContext->getWifiContext().connect(std::get<0>(wifiCredentials), std::get<1>(wifiCredentials));
     mScreen.setupData();