fix: MQTT no longer in the clear in the UI

rvdbreemen · Apr 27, 2024 · 8ebde1e · 8ebde1e
1 parent 8a47634
commit 8ebde1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/restAPI.ino b/restAPI.ino
@@ -432,7 +432,7 @@ void sendDeviceSettings()
   sendJsonSettingObj("mqttbroker", CSTR(settingMQTTbroker), "s", 32);
   sendJsonSettingObj("mqttbrokerport", settingMQTTbrokerPort, "i", 0, 65535);
   sendJsonSettingObj("mqttuser", CSTR(settingMQTTuser), "s", 32);
-  sendJsonSettingObj("mqttpasswd", CSTR(settingMQTTpasswd), "p", 100);
+  sendJsonSettingObj("mqttpasswd", "notthepassword", "p", 100);
   sendJsonSettingObj("mqtttoptopic", CSTR(settingMQTTtopTopic), "s", 15);
   sendJsonSettingObj("mqtthaprefix", CSTR(settingMQTThaprefix), "s", 20);
   sendJsonSettingObj("mqttharebootdetection", settingMQTTharebootdetection, "b");

diff --git a/settingStuff.ino b/settingStuff.ino
@@ -203,7 +203,11 @@ void updateSetting(const char *field, const char *newValue)
   if (strcasecmp(field, "MQTTbroker")==0)      settingMQTTbroker = String(newValue);
   if (strcasecmp(field, "MQTTbrokerPort")==0)  settingMQTTbrokerPort = atoi(newValue);
   if (strcasecmp(field, "MQTTuser")==0)        settingMQTTuser = String(newValue);
-  if (strcasecmp(field, "MQTTpasswd")==0)      settingMQTTpasswd = String(newValue);
+  if (strcasecmp(field, "MQTTpasswd")==0){
+    if ( newValue && strcasecmp(newValue, "notthepassword") != 0 ){
+      settingMQTTpasswd = String(newValue);
+    }
+  }
   if (strcasecmp(field, "MQTTtoptopic")==0)    {
     settingMQTTtopTopic = String(newValue);
     if (settingMQTTtopTopic.length()==0)    {

diff --git a/version.h b/version.h
@@ -2,15 +2,15 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
 #define _VERSION_PATCH 4
-#define _VERSION_BUILD 2113
-#define _VERSION_GITHASH "3c99988"
+#define _VERSION_BUILD 2117
+#define _VERSION_GITHASH "8a47634"
 #define _VERSION_PRERELEASE beta
 #define _VERSION_DATE "27-04-2024"
-#define _VERSION_TIME "18:39:39"
+#define _VERSION_TIME "21:30:37"
 #define _SEMVER_CORE "0.10.4"
-#define _SEMVER_BUILD "0.10.4+2113"
-#define _SEMVER_GITHASH "0.10.4+3c99988"
-#define _SEMVER_FULL "0.10.4-beta+3c99988"
+#define _SEMVER_BUILD "0.10.4+2117"
+#define _SEMVER_GITHASH "0.10.4+8a47634"
+#define _SEMVER_FULL "0.10.4-beta+8a47634"
 #define _SEMVER_NOBUILD "0.10.4-beta (27-04-2024)"
-#define _VERSION "0.10.4-beta+3c99988 (27-04-2024)"
+#define _VERSION "0.10.4-beta+8a47634 (27-04-2024)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver