From 5c0a76ae46e30d19ef0c052545c1685ca5b79c3d Mon Sep 17 00:00:00 2001
From: Sacha Weatherstone <sachaw100@hotmail.com>
Date: Mon, 11 Oct 2021 12:27:10 +1100
Subject: [PATCH] Reverte seperate Generate204 function

---
 src/mesh/http/ContentHandler.cpp | 9 ++-------
 src/mesh/http/ContentHandler.h   | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/mesh/http/ContentHandler.cpp b/src/mesh/http/ContentHandler.cpp
index 335eb8d7c..1004e7555 100644
--- a/src/mesh/http/ContentHandler.cpp
+++ b/src/mesh/http/ContentHandler.cpp
@@ -77,7 +77,7 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);
 
     ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
-    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleGenerate204);
+    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
 
     ResourceNode *nodeRestart = new ResourceNode("/restart", "POST", &handleRestart);
     ResourceNode *nodeFormUpload = new ResourceNode("/upload", "POST", &handleFormUpload);
@@ -654,7 +654,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
 */
 void handleHotspot(HTTPRequest *req, HTTPResponse *res)
 {
-    DEBUG_MSG("Apple Hotspot Request\n");
+    DEBUG_MSG("Hotspot Request\n");
 
     /*
         If we don't do a redirect, be sure to return a "Success" message
@@ -671,11 +671,6 @@ void handleHotspot(HTTPRequest *req, HTTPResponse *res)
     res->println("<meta http-equiv=\"refresh\" content=\"0;url=/\" />\n");
 }
 
-void handleGenerate204(HTTPRequest *req, HTTPResponse *res)
-{
-    DEBUG_MSG("Android Hotspot Request\n");
-    res->setStatusCode(204);
-}
 void handleRestart(HTTPRequest *req, HTTPResponse *res)
 {
     res->setHeader("Content-Type", "text/html");
diff --git a/src/mesh/http/ContentHandler.h b/src/mesh/http/ContentHandler.h
index a31dca701..779058d6b 100644
--- a/src/mesh/http/ContentHandler.h
+++ b/src/mesh/http/ContentHandler.h
@@ -6,7 +6,6 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer);
 void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res);
 void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res);
 void handleHotspot(HTTPRequest *req, HTTPResponse *res);
-void handleGenerate204(HTTPRequest *req, HTTPResponse *res);
 void handleStatic(HTTPRequest *req, HTTPResponse *res);
 void handleRestart(HTTPRequest *req, HTTPResponse *res);
 void handleFormUpload(HTTPRequest *req, HTTPResponse *res);