Addressed review comments

src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm

@@ -48,7 +48,7 @@
 constexpr System::Clock::Timeout kBdxInitReceivedTimeout = System::Clock::Seconds16(10 * 60);
 
 // Time in seconds after which the requestor should retry calling query image if busy status is receieved
-constexpr uint32_t kDelayedActionTime = 120;
+constexpr uint32_t kDelayedActionTimeSeconds = 120;
 
 constexpr System::Clock::Timeout kBdxTimeout = System::Clock::Seconds16(5 * 60); // OTA Spec mandates >= 5 minutes
 constexpr System::Clock::Timeout kBdxPollIntervalMs = System::Clock::Milliseconds32(50);
@@ -184,9 +184,9 @@ CHIP_ERROR OnMessageToSend(TransferSession::OutputEvent & event)
             mExchangeCtx->Close();
             mExchangeCtx = nullptr;
             ResetState();
-        }
-        // If we sent a status report and it was successful, set the Exchange context to null and call ResetState.
-        if (event.msgTypeData.HasMessageType(Protocols::SecureChannel::MsgType::StatusReport) && err == CHIP_NO_ERROR) {
+        } else if (event.msgTypeData.HasMessageType(Protocols::SecureChannel::MsgType::StatusReport) {
+            // If the send was successful for a status report, since we are not expecting a response the exchange context is
+            // already closed. We need to null out the reference to avoid having a dangling pointer.
             mExchangeCtx = nullptr;
             ResetState();
         }
@@ -444,6 +444,9 @@ CHIP_ERROR ConfigureState(chip::FabricIndex fabricIndex, chip::NodeId nodeId)
 
         // Start a timer to track whether we receive a BDX init after a successful query image in a reasonable amount of time
         CHIP_ERROR err = mSystemLayer->StartTimer(kBdxInitReceivedTimeout, HandleBdxInitReceivedTimeoutExpired, this);
+
+        // The caller of this method maps CHIP_ERROR to specific BDX Status Codes (see GetBdxStatusCodeFromChipError)
+        // and those are used by the BDX session to prepare the status report.
         VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_ERROR_INCORRECT_STATE);
 
         mFabricIndex.SetValue(fabricIndex);
@@ -632,7 +635,7 @@ bool GetPeerNodeInfo(CommandHandler * commandHandler, const ConcreteCommandPath
                               if (err == CHIP_ERROR_BUSY) {
                                   Commands::QueryImageResponse::Type busyResponse;
                                   busyResponse.status = static_cast<OTAQueryStatus>(MTROTASoftwareUpdateProviderOTAQueryStatusBusy);
-                                  busyResponse.delayedActionTime.SetValue(response.delayedActionTime.ValueOr(kDelayedActionTime));
+                                  busyResponse.delayedActionTime.SetValue(response.delayedActionTime.ValueOr(kDelayedActionTimeSeconds));
                                   handler->AddResponse(cachedCommandPath, busyResponse);
                                   handle.Release();
                                   return;