Remove the boolean that tracks if we are in a BDX session

nivi-apple · Nov 7, 2023 · 7cf9d6d · 7cf9d6d
1 parent 7fadbd3
commit 7cf9d6d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -1402,7 +1402,9 @@ - (void)_invokeCompletion:(void (^)(NSURL * _Nullable logResult, NSError * error
                     error:(NSError * _Nullable)error
 {
     if (self->_diagnosticLogsTransferHandler != nil) {
+        self->_diagnosticLogsTransferHandler->Reset();
         delete (self->_diagnosticLogsTransferHandler);
+        self->_diagnosticLogsTransferHandler = nil;
     }
     dispatch_async(queue, ^{
         completion(filepath, error);
@@ -1437,10 +1439,6 @@ - (void)_downloadLogOfType:(MTRDiagnosticLogType)type
         [self _invokeCompletionWithError:completion queue:queue error:[NSError errorWithDomain:MTRErrorDomain code:MTRErrorCodeInvalidState userInfo:nil]];
     }
 
-    if (self->_diagnosticLogsTransferHandler != nil && self->_diagnosticLogsTransferHandler->IsInBDXSession()) {
-        [self _invokeCompletionWithError:completion queue:queue error:[NSError errorWithDomain:MTRInteractionErrorDomain code:MTRInteractionErrorCodeBusy userInfo:nil]];
-    }
-
     self->_diagnosticLogsTransferHandler = new MTRDiagnosticLogsTransferHandler(filePath, ^(bool result) {
         if (result == YES) {
             [self _invokeCompletion:completion filepath:filePath queue:queue error:nil];
@@ -1471,7 +1469,7 @@ - (void)_downloadLogOfType:(MTRDiagnosticLogType)type
             [cluster retrieveLogsRequestWithParams:requestParams expectedValues:nil expectedValueInterval:nil
                                         completion:^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable response, NSError * _Nullable error) {
                                             // If we are in a BDX session and there is no error, do nothing. Completion will be called when BDX succeeds or fails.
-                                            if (self->_diagnosticLogsTransferHandler != nil && self->_diagnosticLogsTransferHandler->IsInBDXSession() && error == nil) {
+                                            if (self->_diagnosticLogsTransferHandler != nil && error == nil) {
                                                 return;
                                             }
 

diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.h b/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.h
@@ -50,8 +50,8 @@ class MTRDiagnosticLogsTransferHandler : public chip::bdx::Responder {
     void HandleTransferSessionOutput(chip::bdx::TransferSession::OutputEvent & event) override;
 
     void AbortTransfer(chip::bdx::StatusCode reason);
-
-    bool IsInBDXSession() { return mInitialized; }
+  
+    void Reset();
 
 protected:
     CHIP_ERROR OnMessageReceived(chip::Messaging::ExchangeContext * _Nonnull ec, const chip::PayloadHeader & payloadHeader,
@@ -70,8 +70,6 @@ class MTRDiagnosticLogsTransferHandler : public chip::bdx::Responder {
 
     CHIP_ERROR OnBlockReceived(chip::bdx::TransferSession::OutputEvent & event);
 
-    void Reset();
-
     // The fabric index of the node with which the BDX session is established.
     chip::Optional<chip::FabricIndex> mFabricIndex;
 

diff --git a/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.mm b/src/darwin/Framework/CHIP/MTRDiagnosticLogsTransferHandler.mm
@@ -77,7 +77,6 @@
     acceptData.Length = mTransfer.GetTransferLength();
 
     mTransfer.AcceptTransfer(acceptData);
-    mInitialized = true;
     return CHIP_NO_ERROR;
 }
 
@@ -93,7 +92,6 @@
     } else if (event.EventType != TransferSession::OutputEventType::kMsgToSend || !event.msgTypeData.HasMessageType(MessageType::BlockAckEOF)) {
         error = CHIP_ERROR_INTERNAL;
     }
-    Reset();
 
     // Notify the MTRDevice via the callback that the BDX transfer has completed with error or success.
     if (mCallback) {
@@ -225,7 +223,6 @@
 void MTRDiagnosticLogsTransferHandler::Reset()
 {
     assertChipStackLockedByCurrentThread();
-    mInitialized = false;
     mFileURL = nil;
     mFileHandle = nil;