Move UseECM check for StartAdvertisement (project-chip#21249)

* Move UseECM check for StartAdvertisement Moved UseECM check above AppDelegate to ensure status is set before Commissioning Window is activated. * Fix restyle issue Co-authored-by: Boris Zbarsky <[email protected]>
isiu-apple · Sep 16, 2022 · 39fe894 · 39fe894
1 parent e8e1a1e
commit 39fe894
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/app/server/AppDelegate.h b/src/app/server/AppDelegate.h
@@ -28,6 +28,13 @@ class AppDelegate
     virtual ~AppDelegate() {}
     virtual void OnCommissioningSessionStarted() {}
     virtual void OnCommissioningSessionStopped() {}
+
+    /*
+     * This is called anytime a basic or enhanced commissioning window is opened.
+     *
+     * The type of the window can be retrieved by calling
+     * CommissioningWindowManager::CommissioningWindowStatus()
+     */
     virtual void OnCommissioningWindowOpened() {}
     virtual void OnCommissioningWindowClosed() {}
 };
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -374,11 +374,6 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
     }
 #endif // CONFIG_NETWORK_LAYER_BLE
 
-    if (mAppDelegate != nullptr)
-    {
-        mAppDelegate->OnCommissioningWindowOpened();
-    }
-
     if (mUseECM)
     {
         mWindowStatus = AdministratorCommissioning::CommissioningWindowStatus::kEnhancedWindowOpen;
@@ -388,6 +383,11 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
         mWindowStatus = AdministratorCommissioning::CommissioningWindowStatus::kBasicWindowOpen;
     }
 
+    if (mAppDelegate != nullptr)
+    {
+        mAppDelegate->OnCommissioningWindowOpened();
+    }
+
     // reset all advertising, switching to our new commissioning mode.
     app::DnssdServer::Instance().StartServer();