Fixed persistent store flag for JustTextPlugin, IconTextLampPlugin an…

…d IconTextPlugin.
BlueAndi · Jan 6, 2025 · d3dbd95 · d3dbd95
1 parent 4772d37
commit d3dbd95
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 11 deletions.
diff --git a/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp b/lib/IconTextLampPlugin/src/IconTextLampPlugin.cpp
@@ -191,8 +191,20 @@ bool IconTextLampPlugin::setTopic(const String& topic, const JsonObjectConst& va
          */
         if (false == jsonStoreFlag.isNull())
         {
-            storeFlag    = jsonStoreFlag.as<bool>();
-            isSuccessful = true;
+            if (true == jsonStoreFlag.is<String>())
+            {
+                storeFlag    = jsonStoreFlag.as<String>().equalsIgnoreCase("true");
+                isSuccessful = true;
+            }
+            else if (true == jsonStoreFlag.is<bool>())
+            {
+                storeFlag    = jsonStoreFlag.as<bool>();
+                isSuccessful = true;
+            }
+            else
+            {
+                ;
+            }
         }
 
         if (true == isSuccessful)

diff --git a/lib/IconTextPlugin/src/IconTextPlugin.cpp b/lib/IconTextPlugin/src/IconTextPlugin.cpp
@@ -150,8 +150,20 @@ bool IconTextPlugin::setTopic(const String& topic, const JsonObjectConst& value)
          */
         if (false == jsonStoreFlag.isNull())
         {
-            storeFlag    = jsonStoreFlag.as<bool>();
-            isSuccessful = true;
+            if (true == jsonStoreFlag.is<String>())
+            {
+                storeFlag    = jsonStoreFlag.as<String>().equalsIgnoreCase("true");
+                isSuccessful = true;
+            }
+            else if (true == jsonStoreFlag.is<bool>())
+            {
+                storeFlag    = jsonStoreFlag.as<bool>();
+                isSuccessful = true;
+            }
+            else
+            {
+                ;
+            }
         }
 
         if (true == isSuccessful)

diff --git a/lib/JustTextPlugin/src/JustTextPlugin.cpp b/lib/JustTextPlugin/src/JustTextPlugin.cpp
@@ -142,8 +142,20 @@ bool JustTextPlugin::setTopic(const String& topic, const JsonObjectConst& value)
          */
         if (false == jsonStoreFlag.isNull())
         {
-            storeFlag    = jsonStoreFlag.as<bool>();
-            isSuccessful = true;
+            if (true == jsonStoreFlag.is<String>())
+            {
+                storeFlag    = jsonStoreFlag.as<String>().equalsIgnoreCase("true");
+                isSuccessful = true;
+            }
+            else if (true == jsonStoreFlag.is<bool>())
+            {
+                storeFlag    = jsonStoreFlag.as<bool>();
+                isSuccessful = true;
+            }
+            else
+            {
+                ;
+            }
         }
 
         if (true == isSuccessful)

diff --git a/lib/TimerService/src/TimerSetting.cpp b/lib/TimerService/src/TimerSetting.cpp
@@ -120,17 +120,17 @@ bool TimerSetting::fromJson(const JsonObjectConst& jsonTimerSetting)
         m_displayState = static_cast<DisplayState>(jsonDisplayState.as<uint8_t>());
         m_brightness   = jsonBrightness.as<int16_t>();
 
-        if (true == jsonEnabled.is<bool>())
+        if (true == jsonEnabled.is<String>())
         {
-            m_isEnabled = jsonEnabled.as<bool>();
+            m_isEnabled = jsonEnabled.as<String>().equalsIgnoreCase("true");
         }
-        else if (true == jsonEnabled.as<String>().equals("false"))
+        else if (true == jsonEnabled.is<bool>())
         {
-            m_isEnabled = false;
+            m_isEnabled = jsonEnabled.as<bool>();
         }
         else
         {
-            m_isEnabled = true;
+            m_isEnabled = false;
         }
 
         if (((true == jsonSunday.is<bool>()) && (true == jsonSunday.as<bool>())) ||