Splitting method connectionCheck into two methods (one for checking the state of the physical connection (WiFi, GSM, ...) - checkPhyConnection - and one for checking the status of the connection to the cloud - checkCloudConnection

Author: aentinger

src/ArduinoIoTCloud.h

@@ -78,8 +78,6 @@ class ArduinoIoTCloudClass {
 
     virtual int connected() = 0;
 
-    virtual ArduinoIoTConnectionStatus connectionCheck() = 0;
-
     virtual void printDebugInfo() = 0;
 
     inline void setThingId(String const thing_id) {

src/ArduinoIoTCloudTCP.cpp

@@ -202,7 +202,8 @@ void ArduinoIoTCloudTCP::update() {
   // Check if a primitive property wrapper is locally changed
   Thing.updateTimestampOnLocallyChangedProperties();
 
-  if(connectionCheck() != ArduinoIoTConnectionStatus::CONNECTED) return;
+  if(checkPhyConnection()   != NetworkConnectionState::CONNECTED)     return;
+  if(checkCloudConnection() != ArduinoIoTConnectionStatus::CONNECTED) return;
 
   if(_mqtt_data_request_retransmit && (_mqtt_data_len > 0)) {
     writeProperties(_mqtt_data_buf, _mqtt_data_len);
@@ -346,21 +347,23 @@ void ArduinoIoTCloudTCP::requestLastValue() {
   writeShadowOut(CBOR_REQUEST_LAST_VALUE_MSG, sizeof(CBOR_REQUEST_LAST_VALUE_MSG));
 }
 
-ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::connectionCheck() {
+NetworkConnectionState ArduinoIoTCloudTCP::checkPhyConnection()
+{
+  NetworkConnectionState const connect_state = _connection->check();
 
-  if (_connection != NULL) {
-
-    _connection->check();
-
-    if (_connection->getStatus() != NetworkConnectionState::CONNECTED) {
-      if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED) {
-        _iotStatus = ArduinoIoTConnectionStatus::DISCONNECTED;
-        printConnectionStatus(_iotStatus);
-      }
-      return _iotStatus;
+  if (_connection->check() != NetworkConnectionState::CONNECTED)
+  {
+    if (_iotStatus == ArduinoIoTConnectionStatus::CONNECTED)
+    {
+      disconnect();
     }
   }
 
+  return connect_state;
+}
+
+ArduinoIoTConnectionStatus ArduinoIoTCloudTCP::checkCloudConnection()
+{
   switch (_iotStatus) {
     case ArduinoIoTConnectionStatus::IDLE: {
         _iotStatus = ArduinoIoTConnectionStatus::CONNECTING;

src/ArduinoIoTCloudTCP.h

@@ -44,7 +44,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     bool disconnect();
     int connected();
     void update();
-    ArduinoIoTConnectionStatus connectionCheck();
     void printDebugInfo();
     #ifdef BOARD_HAS_ECCX08
     int begin(ConnectionHandler & connection, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
@@ -122,6 +121,8 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     void handleMessage(int length);
 
     void sendPropertiesToCloud();
+    NetworkConnectionState checkPhyConnection();
+    ArduinoIoTConnectionStatus checkCloudConnection();
 };
 
 extern ArduinoIoTCloudTCP ArduinoCloud;