Update core.

mobizt · Sep 10, 2023 · 8dac11d · 8dac11d
1 parent cdfc77e
commit 8dac11d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -2582,6 +2582,7 @@ static const char firebase_rtdb_err_pgm_str_1[] PROGMEM = "backup data should be
 static const char firebase_rtdb_err_pgm_str_2[] PROGMEM = "path not exist";
 static const char firebase_rtdb_err_pgm_str_3[] PROGMEM = "data type mismatch";
 static const char firebase_rtdb_err_pgm_str_4[] PROGMEM = "security rules is not a valid JSON";
+static const char firebase_rtdb_err_pgm_str_5[] PROGMEM = "the FirebaseData object was paused";
 
 // FCM error string
 static const char firebase_fcm_err_pgm_str_1[] PROGMEM = "no ID token or registration token provided";

diff --git a/src/FB_Error.h b/src/FB_Error.h
@@ -109,5 +109,6 @@
 #define FIREBASE_ERROR_TOKEN_ERROR_UNNOTIFY /*          */ (FB_ERROR_RANGE - 37)
 #define FIREBASE_ERROR_USER_TIME_SETTING_REQUIRED /*          */ (FB_ERROR_RANGE - 38)
 #define FIREBASE_ERROR_SYS_TIME_IS_NOT_READY /*          */ (FB_ERROR_RANGE - 39)
+#define FIREBASE_ERROR_USER_PAUSE /*          */ (FB_ERROR_RANGE - 40)
 
 #endif
diff --git a/src/addons/FireSense/FireSense.h b/src/addons/FireSense/FireSense.h
@@ -1,13 +1,13 @@
 /**
- * FireSense v1.0.14
+ * FireSense v1.0.15
  *
  * The Programmable Data Logging and IO Control library.
  *
  * This library required FirebaseESP32 or FirebaseESP8266 or Firebase ESP Client to be installed.
  *
  * This library supports Espressif ESP8266, ESP32 and RP2040 Pico
  *
- * Created March 5, 2023
+ * Created September 10, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)

diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
@@ -2307,6 +2307,9 @@ void FirebaseCore::errorToString(int httpCode, MB_String &buff)
     case FIREBASE_ERROR_INVALID_JSON_RULES:
         buff += firebase_rtdb_err_pgm_str_4; // "security rules is not a valid JSON"
         return;
+    case FIREBASE_ERROR_USER_PAUSE:
+        buff += firebase_rtdb_err_pgm_str_5; // "the FirebaseData object was paused"
+        break;
 
     case FIREBASE_ERROR_NO_FCM_ID_TOKEN_PROVIDED:
         buff += firebase_fcm_err_pgm_str_1; // "no ID token or registration token provided"

diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1557,7 +1557,7 @@ bool FB_RTDB::processRequest(FirebaseData *fbdo, struct firebase_rtdb_request_in
 
     FBUtils::idle();
 
-    if (!preRequestCheck(fbdo, req))
+    if (preRequestCheck(fbdo, req) <= 0)
         return false;
 
     if (req->method != http_get)
@@ -1677,7 +1677,7 @@ bool FB_RTDB::handleRequest(FirebaseData *fbdo, struct firebase_rtdb_request_inf
 {
     FBUtils::idle();
 
-    if (!preRequestCheck(fbdo, req))
+    if (preRequestCheck(fbdo, req) <= 0)
         return false;
 
 #if defined(MB_ARDUINO_PICO)
@@ -1928,7 +1928,7 @@ int FB_RTDB::preRequestCheck(FirebaseData *fbdo, struct firebase_rtdb_request_in
     if (!Core.config)
         code = FIREBASE_ERROR_UNINITIALIZED;
     else if (fbdo->session.rtdb.pause)
-        code = 0;
+        code = FIREBASE_ERROR_USER_PAUSE;
     else if (!fbdo->tokenReady())
         code = FIREBASE_ERROR_TOKEN_NOT_READY;
     else if (req->path.length() == 0 ||
@@ -3452,7 +3452,7 @@ bool FB_RTDB::handleStreamRequest(FirebaseData *fbdo, const MB_String &path)
     else
         req.path = path.c_str();
 
-    if (!preRequestCheck(fbdo, &req))
+    if (preRequestCheck(fbdo, &req) <= 0)
         return false;
 
     if (!sendRequest(fbdo, &req))