Move connection check out of getRemoteTime and refactor getTime

Author: pennam

src/utility/time/TimeService.cpp

@@ -76,33 +76,20 @@ void TimeService::begin(ConnectionHandler * con_hdl)
 
 unsigned long TimeService::getTime()
 {
-#ifdef ARDUINO_ARCH_SAMD
-  if(!_is_rtc_configured)
-  {
-    unsigned long utc = getRemoteTime();
-    if(EPOCH_AT_COMPILE_TIME != utc)
-    {
-      rtc.setEpoch(utc);
-      _is_rtc_configured = true;
-    }
-    return utc;
+  unsigned long time = EPOCH_AT_COMPILE_TIME;
+
+  if(_is_rtc_configured) {
+    return get_rtc_time();
   }
-  return rtc.getEpoch();
-#elif ARDUINO_ARCH_MBED
-  if(!_is_rtc_configured)
-  {
-    unsigned long utc = getRemoteTime();
-    if(EPOCH_AT_COMPILE_TIME != utc)
-    {
-      set_time(utc);
-      _is_rtc_configured = true;
-    }
-    return utc;
+
+  if(isConnected()) {
+    time = getRemoteTime();
   }
-  return time(NULL);
-#else
-  return getRemoteTime();
-#endif
+
+  if(time != EPOCH_AT_COMPILE_TIME) {
+    set_rtc_time(time);
+  }
+  return time;
 }
 
 void TimeService::setTimeZoneData(long offset, unsigned long dst_until)
@@ -206,28 +193,26 @@ unsigned long TimeService::getRemoteTime()
 #include "../../AIoTC_Config.h"
 #ifndef HAS_LORA
 
-  if(isConnected()) {
-    /* At first try to see if a valid time can be obtained
-     * using the network time available via the connection
-     * handler.
-     */
-    unsigned long const connection_time = _con_hdl->getTime();
-    if(isTimeValid(connection_time)) {
-      return connection_time;
-    }
+  /* At first try to see if a valid time can be obtained
+   * using the network time available via the connection
+   * handler.
+   */
+  unsigned long const connection_time = _con_hdl->getTime();
+  if(isTimeValid(connection_time)) {
+    return connection_time;
+  }
 
 #ifndef __AVR__
-    /* If no valid network time is available try to obtain the
-     * time via NTP next.
-     */
-    unsigned long const ntp_time = NTPUtils::getTime(_con_hdl->getUDP());
-    if(isTimeValid(ntp_time)) {
-      return ntp_time;
-    }
+  /* If no valid network time is available try to obtain the
+   * time via NTP next.
+   */
+  unsigned long const ntp_time = NTPUtils::getTime(_con_hdl->getUDP());
+  if(isTimeValid(ntp_time)) {
+    return ntp_time;
+  }
 #endif
 
 #endif /* ifndef HAS_LORA */
-  }
 
   /* Return the epoch timestamp at compile time as a last
    * line of defense. Otherwise the certificate expiration