From 719d1854ef48016ca824e227aea44820db385170 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Mon, 3 Jan 2022 17:18:12 +0100
Subject: [PATCH] Added support for old and new IDF

---
 src/asynchttprequest.cpp | 12 ++++++++----
 src/asynchttprequest.h   | 10 ++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/asynchttprequest.cpp b/src/asynchttprequest.cpp
index 098da73..f91976c 100644
--- a/src/asynchttprequest.cpp
+++ b/src/asynchttprequest.cpp
@@ -195,8 +195,7 @@ bool AsyncHttpRequest::hasClient() const
 tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
                                                         esp_http_client_method_t method,
                                                         const std::map<std::string, std::string> &requestHeaders,
-                                                        std::string_view requestBody,
-                                                        int timeout_ms)
+                                                        std::string_view requestBody, int timeout_ms)
 {
     if (!m_taskHandle)
     {
@@ -262,8 +261,11 @@ tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
 tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::string_view> url,
                                                         std::optional<esp_http_client_method_t> method,
                                                         const std::map<std::string, std::string> &requestHeaders,
-                                                        std::string_view requestBody,
-                                                        std::optional<int> timeout_ms)
+                                                        std::string_view requestBody
+#ifndef OLD_IDF
+                                                        , std::optional<int> timeout_ms
+#endif
+                                                        )
 {
     if (!m_taskHandle)
     {
@@ -301,6 +303,7 @@ tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::strin
             return tl::make_unexpected(std::move(msg));
         }
 
+#ifndef OLD_IDF
     if (timeout_ms)
         if (const auto result = m_client.set_timeout_ms(*timeout_ms); result != ESP_OK)
         {
@@ -308,6 +311,7 @@ tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::strin
             ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
             return tl::make_unexpected(std::move(msg));
         }
+#endif
 
     for (auto iter = std::cbegin(requestHeaders); iter != std::cend(requestHeaders); iter++)
         if (const auto result = m_client.set_header(iter->first, iter->second); result != ESP_OK)
diff --git a/src/asynchttprequest.h b/src/asynchttprequest.h
index 9bde8de..26849e6 100644
--- a/src/asynchttprequest.h
+++ b/src/asynchttprequest.h
@@ -37,13 +37,15 @@ public:
     tl::expected<void, std::string> start(std::string_view url,
                                           esp_http_client_method_t method = HTTP_METHOD_GET,
                                           const std::map<std::string, std::string> &requestHeaders = {},
-                                          std::string_view requestBody = {},
-                                          int timeout_ms = 0);
+                                          std::string_view requestBody = {}, int timeout_ms = 0);
     tl::expected<void, std::string> retry(std::optional<std::string_view> url = std::nullopt,
                                           std::optional<esp_http_client_method_t> method = std::nullopt,
                                           const std::map<std::string, std::string> &requestHeaders = {},
-                                          std::string_view requestBody = {},
-                                          std::optional<int> timeout_ms = {});
+                                          std::string_view requestBody = {}
+#ifndef OLD_IDF
+                                          ,std::optional<int> timeout_ms = {}
+#endif
+                                         );
     tl::expected<void, std::string> abort();
 
     bool inProgress() const;