Support both HTTP and HTTPS-GET

Author: aentinger

libraries/WiFi/src/WiFi.h

@@ -288,7 +288,7 @@ class WiFiClass
     int ping(const String &hostname, uint8_t ttl = 128);
     int ping(IPAddress host, uint8_t ttl = 128);
 
-    int download(char* url, const char* target);
+    int download(char* url, const char* target, bool const is_https = false);
 
     friend class WiFiClient;
     friend class WiFiServer;

libraries/WiFi/src/WiFiHelpers.cpp

@@ -21,18 +21,42 @@
 
 static FILE* target;
 
-void body_callback(const char* data, uint32_t data_len) {
+void body_callback(const char* data, uint32_t data_len)
+{
 	fwrite(data, 1, data_len, target);
 }
 
-int WiFiClass::download(char* url, const char* target_file) {
+int WiFiClass::download(char* url, const char* target_file, bool const is_https)
+{
 	target = fopen(target_file, "wb");
-  HttpsRequest* req = new HttpsRequest(getNetwork(), nullptr, HTTP_GET, url, &body_callback);
-	if (req->send(NULL, 0) == NULL)
+
+  HttpRequest  * req_http  = nullptr;
+  HttpsRequest * req_https = nullptr;
+  HttpResponse * rsp       = nullptr;
+
+  if (is_https)
+  {
+    req_https = new HttpsRequest(getNetwork(), nullptr, HTTP_GET, url, &body_callback);
+    rsp = req_https->send(NULL, 0);
+    if (rsp == NULL) {
+      fclose(target);
+      return req_https->get_error();
+    }
+  }
+  else
   {
-    fclose(target);
-    return req->get_error();
+    req_http = new HttpRequest(getNetwork(), HTTP_GET, url, &body_callback);
+    rsp = req_http->send(NULL, 0);
+    if (rsp == NULL) {
+      fclose(target);
+      return req_http->get_error();
+    }
   }
+
+  while (!rsp->is_message_complete()) {
+    delay(10);
+  }
+
   int const size = ftell(target);
   fclose(target);
   return size;