update commissioner discovery controller logic

lazarkov · Jul 15, 2024 · 6702e1a · 6702e1a
1 parent b5e49ad
commit 6702e1a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/controller/CommissionerDiscoveryController.cpp b/src/controller/CommissionerDiscoveryController.cpp
@@ -589,9 +589,13 @@ void CommissionerDiscoveryController::Cancel()
         return;
     }
     UDCClientState * client = mUdcServer->GetUDCClients().FindUDCClientState(mCurrentInstance);
-    if (client == nullptr || client->GetUDCClientProcessingState() != UDCClientProcessingState::kPromptingUser)
+
+    // state needs to be either kPromptingUser or kObtainingOnboardingPayload
+    if (client == nullptr || !(client->GetUDCClientProcessingState() == UDCClientProcessingState::kPromptingUser ||
+          client->GetUDCClientProcessingState() == UDCClientProcessingState::kObtainingOnboardingPayload ||
+          client->GetUDCClientProcessingState() == UDCClientProcessingState::kWaitingForCommissionerPasscodeReady))
     {
-        ChipLogError(AppServer, "UX Cancel: invalid state for cancel");
+        ChipLogError(AppServer, "UX Cancel: invalid state for cancel, state: %hhu", client->GetUDCClientProcessingState());
         return;
     }
     client->SetUDCClientProcessingState(UDCClientProcessingState::kUserDeclined);