Added check for valid SSID

This commit is contained in:
Magnus Persson 2022-04-08 20:15:25 +02:00
parent 2e42b86444
commit 5c80b780a0

View File

@ -89,8 +89,11 @@ bool WifiConnection::hasConfig() {
String ssid = WiFi.SSID(); String ssid = WiFi.SSID();
if (ssid.length()) { if (ssid.length()) {
Log.notice(F("WIFI: Found credentials in EEPORM." CR)); Log.notice(F("WIFI: Found credentials in EEPORM." CR));
myConfig.setWifiSSID(WiFi.SSID()); myConfig.setWifiSSID(ssid);
myConfig.setWifiPass(WiFi.psk());
if (WiFi.psk().length())
myConfig.setWifiPass(WiFi.psk());
myConfig.saveFile(); myConfig.saveFile();
return true; return true;
} }
@ -144,8 +147,13 @@ void WifiConnection::startPortal() {
if (myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD)) { if (myWifiManager->startConfigPortal(WIFI_DEFAULT_SSID, WIFI_DEFAULT_PWD)) {
Log.notice(F("WIFI: Exited portal, connected to wifi. Rebooting..." CR)); Log.notice(F("WIFI: Exited portal, connected to wifi. Rebooting..." CR));
myConfig.setWifiSSID(myWifiManager->getSSID());
myConfig.setWifiPass(myWifiManager->getPW()); if (myWifiManager->getSSID().length())
myConfig.setWifiSSID(myWifiManager->getSSID());
if (myWifiManager->getPW().length())
myConfig.setWifiPass(myWifiManager->getPW());
myConfig.saveFile(); myConfig.saveFile();
} else { } else {
Log.notice( Log.notice(