[Matter.framework] Clear all device controller delegates on controlle…

…r shutdown (#35935)
project-chip · Oct 9, 2024 · a7bbd7b · a7bbd7b
1 parent f2b8a87
commit a7bbd7b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -313,7 +313,7 @@ - (void)_controllerResumed
 
 - (void)shutdown
 {
- // Subclass hook; nothing to do.
+ [self _clearDeviceControllerDelegates];
 }
 
 - (nullable NSNumber *)controllerNodeID
@@ -671,6 +671,14 @@ - (void)removeDeviceControllerDelegate:(id<MTRDeviceControllerDelegate>)delegate
  }
 }
 
+- (void)_clearDeviceControllerDelegates
+{
+ @synchronized(self) {
+ _strongDelegateForSetDelegateAPI = nil;
+ [_delegates removeAllObjects];
+ }
+}
+
 // Iterates the delegates, and remove delegate info objects if the delegate object has dealloc'ed
 // Returns number of delegates called
 - (NSUInteger)_iterateDelegateInfoWithBlock:(void (^_Nullable)(MTRDeviceControllerDelegateInfo * delegateInfo))block

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
@@ -418,6 +418,7 @@ - (void)shutdown
  return;
  }
  [self finalShutdown];
+ [super shutdown];
 }
 
 - (void)finalShutdown