From 4bbb9d9c3acb174f23a262aacdcc6a86595b6ec3 Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Sat, 30 Sep 2023 23:46:58 -0700
Subject: [PATCH] fix ci

---
 .../MTROTAUnsolicitedBDXMessageHandler.mm     |  4 ----
 .../bdx/AsyncTransferFacilitator.cpp          | 22 ++-----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm b/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm
index 2352adfb3f162d..e08b42e7ba8605 100644
--- a/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm
+++ b/src/darwin/Framework/CHIP/MTROTAUnsolicitedBDXMessageHandler.mm
@@ -28,10 +28,6 @@
 {
     assertChipStackLockedByCurrentThread();
 
-    if (mExchangeMgr) {
-        mExchangeMgr->UnregisterUnsolicitedMessageHandlerForProtocol(Protocols::BDX::Id);
-        mExchangeMgr = nullptr;
-    }
     MTROTAUnsolicitedBDXMessageHandler::mNumberOfDelegates = 0;
 }
 
diff --git a/src/protocols/bdx/AsyncTransferFacilitator.cpp b/src/protocols/bdx/AsyncTransferFacilitator.cpp
index d679b56405d5f8..79c506a5472dc2 100644
--- a/src/protocols/bdx/AsyncTransferFacilitator.cpp
+++ b/src/protocols/bdx/AsyncTransferFacilitator.cpp
@@ -94,12 +94,7 @@ CHIP_ERROR AsyncTransferFacilitator::OnMessageReceived(Messaging::ExchangeContex
         // If its a message of type kMsgToSend, send the message over the exchange.
         if (outEvent.EventType == TransferSession::OutputEventType::kMsgToSend)
         {
-            err = SendMessage(outEvent);
-            if (err != CHIP_NO_ERROR)
-            {
-                // TODO: Should we abort transfer here or let the other side timeout
-                return err;
-            }
+            SendMessage(outEvent);
         }
         else
         {
@@ -188,20 +183,7 @@ void AsyncResponder::NotifyEventHandled(CHIP_ERROR eventHandlingResult)
     {
         if (outEvent.EventType == TransferSession::OutputEventType::kMsgToSend)
         {
-            CHIP_ERROR err = AsyncTransferFacilitator::SendMessage(outEvent);
-            if (err != CHIP_NO_ERROR)
-            {
-                // TODO: Should we abort transfer here or let the other side timeout
-                return;
-            }
-        }
-        else if (outEvent.EventType == TransferSession::OutputEventType::kInternalError ||
-                 outEvent.EventType == TransferSession::OutputEventType::kTransferTimeout ||
-                 outEvent.EventType == TransferSession::OutputEventType::kStatusReceived)
-        {
-            HandleTransferSessionOutput(outEvent);
-            CleanUp();
-            return;
+            AsyncTransferFacilitator::SendMessage(outEvent);
         }
         mTransfer.GetNextAction(outEvent);
     };