From 6ff31bdbbf2650b0216a1270f60659b7e3fb403f Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 5 Sep 2025 08:27:39 -0500 Subject: [PATCH 1/2] fix refactoring error --- esphome/components/captive_portal/captive_portal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp index 148563d0ef..5b30841c3f 100644 --- a/esphome/components/captive_portal/captive_portal.cpp +++ b/esphome/components/captive_portal/captive_portal.cpp @@ -18,7 +18,7 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) { stream->print(get_mac_address_pretty().c_str()); stream->print(F("\",\"name\":\"")); stream->print(App.get_name().c_str()); - stream->print(F("\",\"aps\":[")); + stream->print(F("\",\"aps\":[{}")); #else AsyncResponseStream *stream = request->beginResponseStream(F("application/json")); stream->addHeader(F("cache-control"), F("public, max-age=0, must-revalidate")); From a8352ef2cb4360233a9ca8948e0781e0b56c92ed Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 5 Sep 2025 08:29:32 -0500 Subject: [PATCH 2/2] preen --- esphome/components/captive_portal/captive_portal.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp index 5b30841c3f..5d10dffc64 100644 --- a/esphome/components/captive_portal/captive_portal.cpp +++ b/esphome/components/captive_portal/captive_portal.cpp @@ -11,17 +11,15 @@ namespace captive_portal { static const char *const TAG = "captive_portal"; void CaptivePortal::handle_config(AsyncWebServerRequest *request) { -#ifdef USE_ESP8266 AsyncResponseStream *stream = request->beginResponseStream(F("application/json")); stream->addHeader(F("cache-control"), F("public, max-age=0, must-revalidate")); +#ifdef USE_ESP8266 stream->print(F("{\"mac\":\"")); stream->print(get_mac_address_pretty().c_str()); stream->print(F("\",\"name\":\"")); stream->print(App.get_name().c_str()); stream->print(F("\",\"aps\":[{}")); #else - AsyncResponseStream *stream = request->beginResponseStream(F("application/json")); - stream->addHeader(F("cache-control"), F("public, max-age=0, must-revalidate")); stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str()); #endif