Fix getTime management

Author: ilcato

src/ArduinoIoTCloud.cpp

@@ -33,13 +33,7 @@ const static int thingIdSlot                               = 12;
 static ConnectionManager *getTimeConnection = NULL;
 
 static unsigned long getTime() {
-  if (!getTimeConnection) return 0;
-  unsigned long time = getTimeConnection->getTime();
-  if (!NTPUtils::isTimeValid(time)) {
-    debugMessage("Bogus NTP time from API, fallback to UDP method", 0);
-    time = NTPUtils(getTimeConnection->getUDP()).getTime();
-  }
-  return time;
+  return getTimeConnection->getTime();
 }
 
 static unsigned long getTimestamp() {

src/ConnectionManager.h

@@ -38,9 +38,9 @@ class ConnectionManager {
 public:
   virtual void init() = 0;
   virtual void check() = 0;
-  virtual unsigned long getTime() = 0;
+  virtual unsigned long getTime();
   virtual Client &getClient();
-  virtual UDP &getUDP();
+  virtual UDP &getUDP() = 0;
 
   virtual NetworkConnectionState getStatus() { return netConnectionState; }
 
@@ -96,6 +96,10 @@ inline void debugMessage(char *_msg, int _debugLevel, bool _timestamp = true, bo
   }
 }
 
+inline unsigned long ConnectionManager::getTime() {
+    return NTPUtils(this->getUDP()).getTime();
+}
+
 inline void setDebugMessageLevel(int _debugLevel){
   debugMessageLevel = _debugLevel;
 }

src/GSMConnectionManager.h

@@ -39,7 +39,7 @@ class GSMConnectionManager : public ConnectionManager {
   const int CHECK_INTERVAL_IDLE = 100;
   const int CHECK_INTERVAL_INIT = 100;
   const int CHECK_INTERVAL_CONNECTING = 500;
-  const int CHECK_INTERVAL_GETTIME = 666;
+  const int CHECK_INTERVAL_GETTIME = 10;
   const int CHECK_INTERVAL_CONNECTED = 10000;
   const int CHECK_INTERVAL_RETRYING = 5000;
   const int CHECK_INTERVAL_DISCONNECTED = 1000;
@@ -67,7 +67,12 @@ GSMConnectionManager::GSMConnectionManager(const char *pin, const char *apn, con
 }
 
 unsigned long GSMConnectionManager::getTime() {
-  return gsmAccess.getTime();
+  unsigned long time = ConnectionManager::getTime() {
+  if (!NTPUtils::isTimeValid(time)) {
+    debugMessage("Bogus NTP time from API, fallback to UDP method", 0);
+    time = gsmAccess.getTime();
+  }
+  return time;
 }
 
 void GSMConnectionManager::init() {

src/WiFiConnectionManager.h

@@ -63,7 +63,12 @@ WiFiConnectionManager::WiFiConnectionManager(const char *ssid, const char *pass)
 }
 
 unsigned long WiFiConnectionManager::getTime() {
-  return WiFi.getTime();
+  unsigned long time = ConnectionManager::getTime();
+  if (!NTPUtils::isTimeValid(time)) {
+    debugMessage("Bogus NTP time from API, fallback to UDP method", 0);
+    time = WiFi.getTime();
+  }
+  return time;
 }
 
 void WiFiConnectionManager::init() {

src/utility/NTPUtils.cpp

@@ -29,7 +29,6 @@ static time_t cvt_TIME(char const *time) {
 NTPUtils::NTPUtils(UDP& Udp) : Udp(Udp) {}
 
 bool NTPUtils::isTimeValid(unsigned long time) {
-    Serial.println("Compile time: " + String(cvt_TIME(__DATE__)));
     return (time > cvt_TIME(__DATE__));
 }