@@ -936,7 +936,8 @@ - (void)preWarmCommissioningSession
936
936
937
937
- (MTRBaseDevice *)deviceBeingCommissionedWithNodeID : (NSNumber *)nodeID error : (NSError * __autoreleasing *)error
938
938
{
939
- auto block = ^MTRBaseDevice * {
939
+ auto block = ^MTRBaseDevice *
940
+ {
940
941
chip::CommissioneeDeviceProxy * deviceProxy;
941
942
942
943
auto errorCode = self->_cppCommissioner ->GetDeviceBeingCommissioned (nodeID.unsignedLongLongValue , &deviceProxy);
@@ -969,7 +970,7 @@ - (MTRDevice *)_setupDeviceForNodeID:(NSNumber *)nodeID prefetchedClusterData:(N
969
970
// which will be in exactly the state it would be in if it were created
970
971
// while we were running and then we got shut down.
971
972
if ([self isRunning ]) {
972
- [_nodeIDToDeviceMap setObject: deviceToReturn forKey: nodeID];
973
+ [_nodeIDToDeviceMap setObject: deviceToReturn forKey: nodeID];
973
974
}
974
975
975
976
if (prefetchedClusterData) {
@@ -1001,7 +1002,7 @@ - (MTRDevice *)_setupDeviceForNodeID:(NSNumber *)nodeID prefetchedClusterData:(N
1001
1002
- (MTRDevice *)deviceForNodeID : (NSNumber *)nodeID
1002
1003
{
1003
1004
std::lock_guard lock (_deviceMapLock);
1004
- MTRDevice * deviceToReturn = [_nodeIDToDeviceMap objectForKey: nodeID];
1005
+ MTRDevice * deviceToReturn = [_nodeIDToDeviceMap objectForKey: nodeID];
1005
1006
if (!deviceToReturn) {
1006
1007
deviceToReturn = [self _setupDeviceForNodeID: nodeID prefetchedClusterData: nil ];
1007
1008
}
@@ -1013,10 +1014,10 @@ - (void)removeDevice:(MTRDevice *)device
1013
1014
{
1014
1015
std::lock_guard lock (_deviceMapLock);
1015
1016
auto * nodeID = device.nodeID ;
1016
- MTRDevice * deviceToRemove = [_nodeIDToDeviceMap objectForKey: nodeID];
1017
+ MTRDevice * deviceToRemove = [_nodeIDToDeviceMap objectForKey: nodeID];
1017
1018
if (deviceToRemove == device) {
1018
1019
[deviceToRemove invalidate ];
1019
- [_nodeIDToDeviceMap removeObjectForKey: nodeID];
1020
+ [_nodeIDToDeviceMap removeObjectForKey: nodeID];
1020
1021
} else {
1021
1022
MTR_LOG_ERROR (" Error: Cannot remove device %p with nodeID %llu" , device, nodeID.unsignedLongLongValue );
1022
1023
}
@@ -1028,7 +1029,7 @@ - (void)removeDevice:(MTRDevice *)device
1028
1029
std::lock_guard lock (_deviceMapLock);
1029
1030
NSMutableDictionary <NSNumber *, NSNumber *> * deviceAttributeCounts = [NSMutableDictionary dictionary ];
1030
1031
for (NSNumber * nodeID in _nodeIDToDeviceMap) {
1031
- deviceAttributeCounts[nodeID] = @([[_nodeIDToDeviceMap objectForKey: nodeID] unitTestAttributeCount ]);
1032
+ deviceAttributeCounts[nodeID] = @([[_nodeIDToDeviceMap objectForKey: nodeID] unitTestAttributeCount ]);
1032
1033
}
1033
1034
return deviceAttributeCounts;
1034
1035
}
@@ -1095,7 +1096,8 @@ + (nullable NSData *)computePASEVerifierForSetupPasscode:(NSNumber *)setupPassco
1095
1096
1096
1097
- (NSData * _Nullable)attestationChallengeForDeviceID : (NSNumber *)deviceID
1097
1098
{
1098
- auto block = ^NSData * {
1099
+ auto block = ^NSData *
1100
+ {
1099
1101
chip::CommissioneeDeviceProxy * deviceProxy;
1100
1102
1101
1103
auto errorCode = CHIP_NO_ERROR;
@@ -1258,7 +1260,7 @@ - (void)getSessionForNode:(chip::NodeId)nodeID completion:(MTRInternalDeviceConn
1258
1260
// First check if MTRDevice exists from having loaded from storage, or created by a client.
1259
1261
// Do not use deviceForNodeID here, because we don't want to create the device if it does not already exist.
1260
1262
os_unfair_lock_lock (&_deviceMapLock);
1261
- MTRDevice * device = [_nodeIDToDeviceMap objectForKey: @(nodeID)];
1263
+ MTRDevice * device = [_nodeIDToDeviceMap objectForKey: @(nodeID)];
1262
1264
os_unfair_lock_unlock (&_deviceMapLock);
1263
1265
1264
1266
// In the case that this device is known to use thread, queue this with subscription attempts as well, to
@@ -1480,7 +1482,7 @@ - (void)operationalInstanceAdded:(chip::NodeId)nodeID
1480
1482
// Don't use deviceForNodeID here, because we don't want to create the
1481
1483
// device if it does not already exist.
1482
1484
os_unfair_lock_lock (&_deviceMapLock);
1483
- MTRDevice * device = [_nodeIDToDeviceMap objectForKey: @(nodeID)];
1485
+ MTRDevice * device = [_nodeIDToDeviceMap objectForKey: @(nodeID)];
1484
1486
os_unfair_lock_unlock (&_deviceMapLock);
1485
1487
1486
1488
if (device == nil ) {
@@ -1920,7 +1922,8 @@ - (NSString *)openPairingWindowWithPIN:(uint64_t)deviceID
1920
1922
return nil ;
1921
1923
}
1922
1924
1923
- auto block = ^NSString * {
1925
+ auto block = ^NSString *
1926
+ {
1924
1927
chip::SetupPayload setupPayload;
1925
1928
errorCode = chip::Controller::AutoCommissioningWindowOpener::OpenCommissioningWindow (self->_cppCommissioner , deviceID,
1926
1929
chip::System::Clock::Seconds16 (static_cast <uint16_t >(duration)), chip::Crypto::kSpake2p_Min_PBKDF_Iterations ,
0 commit comments