Move connect callback calling to OnNetworkConnected handler

project-chip · Feb 21, 2022 · b26a72e · b26a72e
1 parent 4875036
commit b26a72e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp b/src/platform/mbed/NetworkCommissioningWiFiDriver.cpp
@@ -171,6 +171,7 @@ Status WiFiDriverImpl::ReorderNetwork(ByteSpan networkId, uint8_t index)
 
 void WiFiDriverImpl::ExecuteWiFiInterfaceChange(nsapi_connection_status_t status)
 {
+
     switch (status)
     {
     case NSAPI_STATUS_LOCAL_UP:
@@ -193,12 +194,6 @@ void WiFiDriverImpl::ExecuteWiFiInterfaceChange(nsapi_connection_status_t status
         ChipLogDetail(DeviceLayer, "Unknown connection status: 0x%08X", status);
         break;
     }
-
-    if (mConnectCallback)
-    {
-        mConnectCallback->OnResult(Status::kSuccess, CharSpan(), status);
-    }
-    mConnectCallback = nullptr;
 }
 
 void WiFiDriverImpl::OnWiFiInterfaceEvent(nsapi_event_t event, intptr_t data)
@@ -419,6 +414,12 @@ void WiFiDriverImpl::OnNetworkConnected()
 {
     ChipLogDetail(DeviceLayer, "OnNetworkConnected");
 
+    if (mConnectCallback)
+    {
+        mConnectCallback->OnResult(Status::kSuccess, CharSpan(), 0);
+        mConnectCallback = nullptr;
+    }
+
     ChipDeviceEvent event;
     event.Type                          = DeviceEventType::kWiFiConnectivityChange;
     event.WiFiConnectivityChange.Result = kConnectivity_Established;