[Darwin] expose the "getDeviceBeingCommissioned" API to ObjC (#12811)

project-chip · Nov 10, 2023 · c8d9450 · c8d9450
1 parent 2f3f917
commit c8d9450
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.h b/src/darwin/Framework/CHIP/CHIPDeviceController.h
@@ -56,6 +56,7 @@ typedef void (^CHIPDeviceConnectionCallback)(CHIPDevice * _Nullable device, NSEr
 - (void)updateDevice:(uint64_t)deviceID fabricId:(uint64_t)fabricId;
 
 - (BOOL)isDevicePaired:(uint64_t)deviceID error:(NSError * __autoreleasing *)error;
+- (nullable CHIPDevice *)getDeviceBeingCommissioned:(uint64_t)deviceId error:(NSError * __autoreleasing *)error;
 - (BOOL)getConnectedDevice:(uint64_t)deviceID
  queue:(dispatch_queue_t)queue
  completionHandler:(CHIPDeviceConnectionCallback)completionHandler;

diff --git a/src/darwin/Framework/CHIP/CHIPDeviceController.mm b/src/darwin/Framework/CHIP/CHIPDeviceController.mm
@@ -405,6 +405,25 @@ - (BOOL)isDevicePaired:(uint64_t)deviceID error:(NSError * __autoreleasing *)err
  return paired;
 }
 
+- (CHIPDevice *)getDeviceBeingCommissioned:(uint64_t)deviceId error:(NSError * __autoreleasing *)error
+{
+ CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE;
+ if (![self isRunning]) {
+ [self checkForError:errorCode logMsg:kErrorNotRunning error:error];
+ return nil;
+ }
+
+ chip::CommissioneeDeviceProxy * deviceProxy;
+ errorCode = self->_cppCommissioner->GetDeviceBeingCommissioned(deviceId, &deviceProxy);
+ if (errorCode != CHIP_NO_ERROR) {
+ if (error) {
+ *error = [CHIPError errorForCHIPErrorCode:errorCode];
+ }
+ return nil;
+ }
+ return [[CHIPDevice alloc] initWithDevice:deviceProxy];
+}
+
 - (BOOL)getConnectedDevice:(uint64_t)deviceID
  queue:(dispatch_queue_t)queue
  completionHandler:(CHIPDeviceConnectionCallback)completionHandler