Update AppDelegate to report error param and callback for when sessio…

…n establishment starts (project-chip#28138)
sharadb-amazon · Aug 1, 2023 · e9c168d · e9c168d
1 parent a2ae23a
commit e9c168d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -81,8 +81,9 @@ namespace {
 class AppCallbacks : public AppDelegate
 {
 public:
+    void OnCommissioningSessionEstablishmentStarted() {}
     void OnCommissioningSessionStarted() override { bluetoothLED.Set(true); }
-    void OnCommissioningSessionStopped() override
+    void OnCommissioningSessionStopped(CHIP_ERROR err) override
     {
         bluetoothLED.Set(false);
         pairingWindowLED.Set(false);

diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp
@@ -82,8 +82,9 @@ namespace {
 class AppCallbacks : public AppDelegate
 {
 public:
+    void OnCommissioningSessionEstablishmentStarted() {}
     void OnCommissioningSessionStarted() override { bluetoothLED.Set(true); }
-    void OnCommissioningSessionStopped() override
+    void OnCommissioningSessionStopped(CHIP_ERROR err) override
     {
         bluetoothLED.Set(false);
         pairingWindowLED.Set(false);

diff --git a/src/app/server/AppDelegate.h b/src/app/server/AppDelegate.h
@@ -22,12 +22,18 @@
 
 #pragma once
 
+#include <lib/core/CHIPError.h>
+
 class AppDelegate
 {
 public:
     virtual ~AppDelegate() {}
+    /**
+     * This is called on start of session establishment process
+     */
+    virtual void OnCommissioningSessionEstablishmentStarted() {}
     virtual void OnCommissioningSessionStarted() {}
-    virtual void OnCommissioningSessionStopped() {}
+    virtual void OnCommissioningSessionStopped(CHIP_ERROR err) {}
 
     /*
      * This is called anytime a basic or enhanced commissioning window is opened.

diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -139,7 +139,7 @@ void CommissioningWindowManager::HandleFailedAttempt(CHIP_ERROR err)
 
         if (mAppDelegate != nullptr)
         {
-            mAppDelegate->OnCommissioningSessionStopped();
+            mAppDelegate->OnCommissioningSessionStopped(err);
         }
     }
 }
@@ -149,6 +149,12 @@ void CommissioningWindowManager::OnSessionEstablishmentStarted()
     // As per specifications, section 5.5: Commissioning Flows
     constexpr System::Clock::Timeout kPASESessionEstablishmentTimeout = System::Clock::Seconds16(60);
     DeviceLayer::SystemLayer().StartTimer(kPASESessionEstablishmentTimeout, HandleSessionEstablishmentTimeout, this);
+
+    ChipLogProgress(AppServer, "Commissioning session establishment step started");
+    if (mAppDelegate != nullptr)
+    {
+        mAppDelegate->OnCommissioningSessionEstablishmentStarted();
+    }
 }
 
 void CommissioningWindowManager::OnSessionEstablished(const SessionHandle & session)