Reorder functions implementation

Author: pennam

src/ArduinoIoTCloudTCP.cpp

@@ -369,6 +369,29 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SendDeviceProperties()
   return State::WaitDeviceConfig;
 }
 
+ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_WaitDeviceConfig()
+{
+  if (!_mqttClient.connected())
+  {
+    return State::Disconnect;
+  }
+
+  bool const is_retry_attempt = (_last_device_subscribe_cnt > 0);
+  if (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick))
+  {
+    /* Configuration not received or device not attached to a valid thing. Try to resubscribe */
+    if (_mqttClient.unsubscribe(_deviceTopicIn))
+    {
+      DEBUG_ERROR("ArduinoIoTCloudTCP::%s device waiting for valid thing_id %d", __FUNCTION__, _time_service.getTime());
+    }
+  }
+
+  if (!is_retry_attempt || (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick)))
+    return State::SubscribeDeviceTopic;
+
+  return State::WaitDeviceConfig;
+}
+
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
 {
   if (!_mqttClient.connected())
@@ -404,29 +427,6 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeDeviceTopic()
   return State::WaitDeviceConfig;
 }
 
-ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_WaitDeviceConfig()
-{
-  if (!_mqttClient.connected())
-  {
-    return State::Disconnect;
-  }
-
-  bool const is_retry_attempt = (_last_device_subscribe_cnt > 0);
-  if (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick))
-  {
-    /* Configuration not received or device not attached to a valid thing. Try to resubscribe */
-    if (_mqttClient.unsubscribe(_deviceTopicIn))
-    {
-      DEBUG_ERROR("ArduinoIoTCloudTCP::%s device waiting for valid thing_id %d", __FUNCTION__, _time_service.getTime());
-    }
-  }
-
-  if (!is_retry_attempt || (is_retry_attempt && (millis() > _next_device_subscribe_attempt_tick)))
-    return State::SubscribeDeviceTopic;
-
-  return State::WaitDeviceConfig;
-}
-
 ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_CheckDeviceConfig()
 {
   if (!_mqttClient.connected())