Returning and evaluating result of calling connectionCheck() directly instead of checking member variable _iotStatus

Author: aentinger

src/ArduinoIoTCloud.h

@@ -78,7 +78,7 @@ class ArduinoIoTCloudClass {
 
     virtual int connected() = 0;
 
-    virtual void connectionCheck() = 0;
+    virtual ArduinoIoTConnectionStatus connectionCheck() = 0;
 
     virtual void printDebugInfo() = 0;
 

src/ArduinoIoTCloudLPWAN.cpp

@@ -60,11 +60,7 @@ void ArduinoIoTCloudLPWAN::update() {
   // Check if a primitive property wrapper is locally changed
   Thing.updateTimestampOnLocallyChangedProperties();
 
-  connectionCheck();
-
-  if (_iotStatus != ArduinoIoTConnectionStatus::CONNECTED) {
-    return;
-  }
+  if(connectionCheck() != ArduinoIoTConnectionStatus::CONNECTED) return;
 
   if (_connection->available()) {
     uint8_t msgBuf[DEFAULT_CBOR_LORA_MSG_SIZE];
@@ -86,7 +82,7 @@ void ArduinoIoTCloudLPWAN::update() {
 
 }
 
-void ArduinoIoTCloudLPWAN::connectionCheck() {
+ArduinoIoTConnectionStatus ArduinoIoTCloudLPWAN::connectionCheck() {
   if (_connection != NULL) {
 
     _connection->check();
@@ -96,7 +92,7 @@ void ArduinoIoTCloudLPWAN::connectionCheck() {
         _iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
         printConnectionStatus(_iotStatus);
       }
-      return;
+      return _iotStatus;
     }
   }
 
@@ -147,6 +143,8 @@ void ArduinoIoTCloudLPWAN::connectionCheck() {
       }
       break;
   }
+
+  return _iotStatus;
 }
 
 void ArduinoIoTCloudLPWAN::printDebugInfo() {

src/ArduinoIoTCloudLPWAN.h

@@ -31,7 +31,7 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
     bool disconnect();
     int connected();
     void update();
-    void connectionCheck();
+    ArduinoIoTConnectionStatus connectionCheck();
     void printDebugInfo();
     int begin(LPWANConnectionHandler& connection, bool retry = false);
     inline LPWANConnectionHandler* getConnection() {

src/ArduinoIoTCloudTCP.cpp

@@ -201,11 +201,7 @@ void ArduinoIoTCloudTCP::update() {
   // Check if a primitive property wrapper is locally changed
   Thing.updateTimestampOnLocallyChangedProperties();
 
-  connectionCheck();
-
-  if (_iotStatus != ArduinoIoTConnectionStatus::CONNECTED) {
-    return;
-  }
+  if(connectionCheck() != ArduinoIoTConnectionStatus::CONNECTED) return;
 
   // MTTQClient connected!, poll() used to retrieve data from MQTT broker
   _mqttClient->poll();
@@ -337,7 +333,7 @@ void ArduinoIoTCloudTCP::requestLastValue() {
   writeShadowOut(CBOR_REQUEST_LAST_VALUE_MSG, sizeof(CBOR_REQUEST_LAST_VALUE_MSG));
 }
 
-void ArduinoIoTCloudTCP::connectionCheck() {
+ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::connectionCheck() {
 
   if (_connection != NULL) {
 
@@ -348,7 +344,7 @@ void ArduinoIoTCloudTCP::connectionCheck() {
         _iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
         printConnectionStatus(_iotStatus);
       }
-      return;
+      return _iotStatus;
     }
   }
 
@@ -403,6 +399,8 @@ void ArduinoIoTCloudTCP::connectionCheck() {
       }
       break;
   }
+
+  return _iotStatus;
 }
 
 void ArduinoIoTCloudTCP::printDebugInfo() {

src/ArduinoIoTCloudTCP.h

@@ -44,7 +44,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     bool disconnect();
     int connected();
     void update();
-    void connectionCheck();
+    ArduinoIoTConnectionStatus connectionCheck();
     void printDebugInfo();
     #ifdef BOARD_HAS_ECCX08
     int begin(TcpIpConnectionHandler & connection, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);