From faf5fbdc31f42c5a94f722337a2e9074496af379 Mon Sep 17 00:00:00 2001
From: Pascal Gollor <kalle@pgollor.de>
Date: Thu, 1 Oct 2015 18:52:46 +0200
Subject: [PATCH 1/2] use String return for both SSID functions

---
 .../esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp       | 6 +++---
 .../esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index b5509de9c6..f40014e550 100644
--- a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -536,13 +536,13 @@ void * ESP8266WiFiClass::_getScanInfoByIndex(int i)
     return reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult) + i;
 }
 
-const char* ESP8266WiFiClass::SSID(uint8_t i)
+String ESP8266WiFiClass::SSID(uint8_t i)
 {
     struct bss_info* it = reinterpret_cast<struct bss_info*>(_getScanInfoByIndex(i));
     if (!it)
-        return 0;
+        return "";
 
-    return reinterpret_cast<const char*>(it->ssid);
+    return String(reinterpret_cast<const char*>(it->ssid));
 }
 
 uint8_t * ESP8266WiFiClass::BSSID(uint8_t i)
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
index ebfe6106a2..70538127f1 100644
--- a/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
+++ b/hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.h
@@ -239,7 +239,7 @@ class ESP8266WiFiClass
 	 *
      * return: ssid string of the specified item on the networks scanned list
      */
-    const char*	SSID(uint8_t networkItem);
+    String SSID(uint8_t networkItem);
 
     /*
      * Return the encryption type of the networks discovered during the scanNetworks

From d4c17b02d51df984ecc38390c09a1bb73578fb1a Mon Sep 17 00:00:00 2001
From: Pascal Gollor <kalle@pgollor.de>
Date: Thu, 1 Oct 2015 18:58:02 +0200
Subject: [PATCH 2/2] adapt examples for String return type from SSID

---
 .../DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardware/esp8266com/esp8266/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino b/hardware/esp8266com/esp8266/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
index 4164506cef..8d0e1b89f1 100644
--- a/hardware/esp8266com/esp8266/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
+++ b/hardware/esp8266com/esp8266/libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino
@@ -73,7 +73,7 @@ void handleWifi() {
   Serial.println("scan done");
   if (n > 0) {
     for (int i = 0; i < n; i++) {
-      server.sendContent(String() + "\r\n<tr><td>SSID " + String(WiFi.SSID(i)) + String((WiFi.encryptionType(i) == ENC_TYPE_NONE)?" ":" *") + " (" + WiFi.RSSI(i) + ")</td></tr>");
+      server.sendContent(String() + "\r\n<tr><td>SSID " + WiFi.SSID(i) + String((WiFi.encryptionType(i) == ENC_TYPE_NONE)?" ":" *") + " (" + WiFi.RSSI(i) + ")</td></tr>");
     }
   } else {
     server.sendContent(String() + "<tr><td>No WLAN found</td></tr>");