Fix NTP time out issue when config.time.ntp_server was not set.

mobizt · Aug 28, 2023 · 6e8a71e · 6e8a71e
1 parent 2521e06
commit 6e8a71e
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP Mail Client",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "keywords": "communication, email, imap, smtp, esp32, esp8266, samd, arduino",
   "description": "Arduino E-Mail Client Library to send, read and get incoming email notification for ESP32, ESP8266 and SAMD21 devices. The library also supported other Arduino Devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP Mail Client
 
-version=3.4.8
+version=3.4.9
 
 author=Mobizt
 

diff --git a/src/ESP_Mail_Client.cpp b/src/ESP_Mail_Client.cpp
@@ -4,7 +4,7 @@
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 
@@ -1340,7 +1340,7 @@ bool ESP_Mail_Client::prepareTime(Session_Config *session_config, T sessionPtr)
   if (session_config->time.ntp_server.length() > 0 || timeShouldBeValid)
   {
 
-     Time.begin(session_config->time.gmt_offset, session_config->time.day_light_offset, session_config->time.ntp_server.c_str());
+    Time.begin(session_config->time.gmt_offset, session_config->time.day_light_offset, session_config->time.ntp_server.c_str());
 
     if (!Time.timeReady())
     {
@@ -1356,7 +1356,7 @@ bool ESP_Mail_Client::prepareTime(Session_Config *session_config, T sessionPtr)
         if (sessionPtr->client.gprsGetTime(year, month, day, hour, min, sec, timezone))
           Time.setTimestamp(Time.getTimestamp(year, month, day, hour, min, sec), timezone);
       }
-      else
+      else if (session_config->time.ntp_server.length())
       {
 #if defined(ENABLE_NTP_TIME)
 #if !defined(SILENT_MODE)
@@ -1381,7 +1381,7 @@ bool ESP_Mail_Client::prepareTime(Session_Config *session_config, T sessionPtr)
     return true;
   else if (WiFI_CONNECTED && timeShouldBeValid)
   {
-    errorStatusCB<T, IMAPSession *>(sessionPtr, nullptr, ntpEnabled ? MAIL_CLIENT_ERROR_NTP_TIME_SYNC_TIMED_OUT : MAIL_CLIENT_ERROR_TIME_WAS_NOT_SET, false);
+    errorStatusCB<T, IMAPSession *>(sessionPtr, nullptr, ntpEnabled && session_config->time.ntp_server.length() ? MAIL_CLIENT_ERROR_NTP_TIME_SYNC_TIMED_OUT : MAIL_CLIENT_ERROR_TIME_WAS_NOT_SET, false);
     return false;
   }
 

diff --git a/src/ESP_Mail_Client.h b/src/ESP_Mail_Client.h
@@ -2,7 +2,7 @@
 #define ESP_MAIL_CLIENT_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Client_Version.h b/src/ESP_Mail_Client_Version.h
@@ -3,8 +3,8 @@
 
 #ifndef ESP_MAIL_VERSION
 
-#define ESP_MAIL_VERSION "3.4.8"
-#define ESP_MAIL_VERSION_NUM 30408
+#define ESP_MAIL_VERSION "3.4.9"
+#define ESP_MAIL_VERSION_NUM 30409
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define VALID_VERSION_CHECK(ver) (ver == ESP_MAIL_VERSION_NUM)

diff --git a/src/ESP_Mail_Const.h b/src/ESP_Mail_Const.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONST_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Error.h b/src/ESP_Mail_Error.h
@@ -7,7 +7,7 @@
 #define ESP_MAIL_ERROR_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_FS.h b/src/ESP_Mail_FS.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONFIG_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_IMAP.h b/src/ESP_Mail_IMAP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_IMAP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_SMTP.h b/src/ESP_Mail_SMTP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_SMTP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_TCPClient.h b/src/ESP_Mail_TCPClient.h
@@ -30,7 +30,7 @@
 #define ESP_MAIL_TCPCLIENT_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/MB_Time.h b/src/extras/MB_Time.h
@@ -2,7 +2,7 @@
 #define MB_Time_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/Networks_Provider.h b/src/extras/Networks_Provider.h
@@ -4,7 +4,7 @@
 #include "../ESP_Mail_FS.h"
 
 #include "../ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/RFC2047.cpp b/src/extras/RFC2047.cpp
@@ -2,7 +2,7 @@
 #define RFC2047_CPP
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/RFC2047.h b/src/extras/RFC2047.h
@@ -4,7 +4,7 @@
 #define RFC2047_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30408)
+#if !VALID_VERSION_CHECK(30409)
 #error "Mixed versions compilation."
 #endif