Execute handle_CheckDeviceConfig() only on thing_id changes ignoring other messages on device topic

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -327,11 +327,16 @@ void ArduinoIoTCloudTCP::update()
   /* Check if the state has changed in message handler */
   if(_next_state != State::Invalid)
   {
-    DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s state changed in message handler", __FUNCTION__);
+    DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s State changed in message handler...", __FUNCTION__);
     _state = _next_state;
     _next_state = State::Invalid;
   }
 
+  if(getThingIdOutdatedFlag()) {
+    DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s Thing id outdated, reconfiguring...", __FUNCTION__);
+    _state =  State::CheckDeviceConfig;
+  }
+
   /* Run through the state machine. */
   State next_state = _state;
   switch (_state)
@@ -482,7 +487,6 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_WaitDeviceConfig()
       return State::SubscribeDeviceTopic;
     }
   }
-
   return State::WaitDeviceConfig;
 }
 
@@ -496,16 +500,13 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
     return State::ConnectPhy;
   }
 
-  if(getThingIdOutdatedFlag())
+  if(_deviceSubscribedToThing == true)
   {
-    if(_deviceSubscribedToThing == true)
-    {
-      /* Unsubscribe from old things topics and go oi with a new subsctiption */
-      _mqttClient.unsubscribe(_shadowTopicIn);
-      _mqttClient.unsubscribe(_dataTopicIn);
+    /* Unsubscribe from old things topics and go oi with a new subsctiption */
+    _mqttClient.unsubscribe(_shadowTopicIn);
+    _mqttClient.unsubscribe(_dataTopicIn);
 
-      _deviceSubscribedToThing = false;
-    }
+    _deviceSubscribedToThing = false;
   }
 
   updateThingTopics();
@@ -701,7 +702,6 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
     CBORDecoder::decode(_device_property_container, (uint8_t*)bytes, length);
     _last_device_subscribe_cnt = 0;
     _next_device_subscribe_attempt_tick = 0;
-    _next_state = State::CheckDeviceConfig;
   }
 
   /* Topic for user input data */