From e034b52731c73d63b5ef8450c09edefa322dec69 Mon Sep 17 00:00:00 2001 From: "Robin.Gao" Date: Tue, 25 Apr 2023 22:38:39 +0800 Subject: [PATCH] [Darwin]set skipCommissioningComplete to boolean value and append MTR_NEWLY_AVAILABLE annotation --- src/darwin/Framework/CHIP/MTRCommissioningParameters.h | 2 +- src/darwin/Framework/CHIP/MTRDeviceController.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRCommissioningParameters.h b/src/darwin/Framework/CHIP/MTRCommissioningParameters.h index ec5efd34b88fa9..6867c68747581b 100644 --- a/src/darwin/Framework/CHIP/MTRCommissioningParameters.h +++ b/src/darwin/Framework/CHIP/MTRCommissioningParameters.h @@ -84,7 +84,7 @@ NS_ASSUME_NONNULL_BEGIN * Only perform the PASE steps of commissioning. * Commissioning will be completed by another admin on the network. */ -@property (nonatomic, copy, nullable) NSNumber * skipCommissioningComplete; +@property (nonatomic, assign) BOOL skipCommissioningComplete MTR_NEWLY_AVAILABLE; @end diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index c169be2db90a8e..097012d6a8d5be 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -464,7 +464,7 @@ - (BOOL)commissionNodeWithID:(NSNumber *)nodeID params.SetThreadOperationalDataset(AsByteSpan(commissioningParams.threadOperationalDataset)); } if (commissioningParams.skipCommissioningComplete) { - params.SetSkipCommissioningComplete(commissioningParams.skipCommissioningComplete.boolValue); + params.SetSkipCommissioningComplete(commissioningParams.skipCommissioningComplete); } if (commissioningParams.wifiSSID) { chip::ByteSpan ssid = AsByteSpan(commissioningParams.wifiSSID);