Move UseECM check for StartAdvertisement

Moved UseECM check above AppDelegate to ensure status is set before Commissioning Window is activated.
project-chip · Jul 26, 2022 · 2b7179d · 2b7179d
1 parent 34a1b5c
commit 2b7179d
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();