fixup! ArduinoIoTCloudTCP: switch to messages

Author: andreagilardoni

src/ArduinoIoTCloudTCP.cpp

@@ -188,6 +188,8 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
 
   _deviceTopicOut = getTopic_deviceout();
   _deviceTopicIn  = getTopic_devicein();
+  _messageTopicIn = getTopic_messagein();
+  _messageTopicOut = getTopic_messageout();
 
   _thing.begin();
   _device.begin();
@@ -317,7 +319,7 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker()
 {
   if (_mqttClient.connect(_brokerAddress.c_str(), _brokerPort))
   {
-    _mqttClient.subscribe(getTopic_messagein());
+    _mqttClient.subscribe(_messageTopicIn);
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s connected to %s:%d", __FUNCTION__, _brokerAddress.c_str(), _brokerPort);
     /* Reconfigure timers for next state */
     _connection_attempt.begin(AIOT_CONFIG_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms, AIOT_CONFIG_MAX_DEVICE_TOPIC_SUBSCRIBE_RETRY_DELAY_ms);
@@ -465,7 +467,7 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
   }
 
   /* Topic for device commands */
-  if (getTopic_messagein() == topic) {
+  if (_messageTopicIn == topic) {
     CommandDown command;
     DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s [%d] received %d bytes", __FUNCTION__, millis(), length);
     CBORMessageDecoder decoder;
@@ -516,7 +518,7 @@ void ArduinoIoTCloudTCP::sendMessage(Message * msg)
 
   if (encoder.encode(msg, data, bytes_encoded) == Encoder::Status::Complete &&
       bytes_encoded > 0) {
-    write(getTopic_messageout(), data, bytes_encoded);
+    write(_messageTopicOut, data, bytes_encoded);
   } else {
     DEBUG_ERROR("error encoding %d", msg->id);
   }