If MQTT service is in IDLE state (means no broker is configured, ther…

…efore MQTT disabled), MQTT topic handler registration/unregistration/notification are disabled.
BlueAndi · Jan 6, 2025 · d21c419 · d21c419
1 parent fee7c35
commit d21c419
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp b/lib/MqttApiTopicHandler/src/MqttApiTopicHandler.cpp
@@ -85,7 +85,13 @@ void MqttApiTopicHandler::stop()
 
 void MqttApiTopicHandler::registerTopic(const String& deviceId, const String& entityId, const String& topic, JsonObjectConst& extra, GetTopicFunc getTopicFunc, SetTopicFunc setTopicFunc, UploadReqFunc uploadReqFunc)
 {
-    if ((false == deviceId.isEmpty()) &&
+    MqttService& mqttService = MqttService::getInstance();
+
+    /* MQTT service shall be enabled and
+     * a device id and topic name shall be given.
+     */
+    if ((MqttService::STATE_IDLE != mqttService.getState()) &&
+        (false == deviceId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
         String      mqttTopicBase = getMqttBaseTopic(deviceId, entityId, topic);
@@ -150,7 +156,13 @@ void MqttApiTopicHandler::registerTopic(const String& deviceId, const String& en
 
 void MqttApiTopicHandler::unregisterTopic(const String& deviceId, const String& entityId, const String& topic, bool purge)
 {
-    if ((false == deviceId.isEmpty()) &&
+    MqttService& mqttService = MqttService::getInstance();
+
+    /* MQTT service shall be enabled and
+     * a device id and topic name shall be given.
+     */
+    if ((MqttService::STATE_IDLE != mqttService.getState()) &&
+        (false == deviceId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
         String                      mqttTopicBase = getMqttBaseTopic(deviceId, entityId, topic);
@@ -265,7 +277,13 @@ void MqttApiTopicHandler::process()
 
 void MqttApiTopicHandler::notify(const String& deviceId, const String& entityId, const String& topic)
 {
-    if ((false == deviceId.isEmpty()) &&
+    MqttService& mqttService = MqttService::getInstance();
+
+    /* MQTT service shall be enabled and
+     * a device id and topic name shall be given.
+     */
+    if ((MqttService::STATE_IDLE != mqttService.getState()) &&
+        (false == deviceId.isEmpty()) &&
         (false == topic.isEmpty()))
     {
         ListOfTopicStates::iterator topicStateIt = m_listOfTopicStates.begin();