[nrf noup] fix handling of LastNetworkID in Wi-Fi driver

LuDuda · markaj-nordic · commit 88f942fb3570 · 2024-03-08T11:18:35.000+01:00
This commit makes sure that correct Network ID is provided to the
Network Commissioning cluster from the platform's Wi-Fi driver.

Signed-off-by: Łukasz Duda &lt;lukasz.duda@nordicsemi.no&gt;
diff --git a/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp b/src/platform/nrfconnect/wifi/NrfWiFiDriver.cpp
@@ -122,7 +122,13 @@ void NrfWiFiDriver::OnNetworkStatusChanged(Status status)
 
     if (mpNetworkStatusChangeCallback)
     {
-        mpNetworkStatusChangeCallback->OnNetworkingStatusChange(status, NullOptional, NullOptional);
+        WiFiManager::WiFiInfo wifiInfo;
+
+        if (CHIP_NO_ERROR == WiFiManager::Instance().GetWiFiInfo(wifiInfo))
+        {
+            mpNetworkStatusChangeCallback->OnNetworkingStatusChange(status,
+                MakeOptional(ByteSpan(wifiInfo.mSsid, wifiInfo.mSsidLen)), NullOptional);
+        }
     }
 
     if (mpConnectCallback)

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,13 @@ void NrfWiFiDriver::OnNetworkStatusChanged(Status status)`
`122`	`122`
`123`	`123`	`if (mpNetworkStatusChangeCallback)`
`124`	`124`	`{`
`125`		`- mpNetworkStatusChangeCallback->OnNetworkingStatusChange(status, NullOptional, NullOptional);`
	`125`	`+ WiFiManager::WiFiInfo wifiInfo;`
	`126`	`+`
	`127`	`+ if (CHIP_NO_ERROR == WiFiManager::Instance().GetWiFiInfo(wifiInfo))`
	`128`	`+ {`
	`129`	`+ mpNetworkStatusChangeCallback->OnNetworkingStatusChange(status,`
	`130`	`+ MakeOptional(ByteSpan(wifiInfo.mSsid, wifiInfo.mSsidLen)), NullOptional);`
	`131`	`+ }`
`126`	`132`	`}`
`127`	`133`
`128`	`134`	`if (mpConnectCallback)`