Skip to content

Commit 00be201

Browse files
Get rid of MTRBaseDevice use in MTRDevice.
There is no MTRBaseDevice allowed unless our MTRDevice is actually MTRDevice_Concrete.
1 parent 8323604 commit 00be201

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

src/darwin/Framework/CHIP/MTRDevice.mm

+12-18
Original file line numberDiff line numberDiff line change
@@ -1141,33 +1141,32 @@ - (void)openCommissioningWindowWithSetupPasscode:(NSNumber *)setupPasscode
11411141
queue:(dispatch_queue_t)queue
11421142
completion:(MTRDeviceOpenCommissioningWindowHandler)completion
11431143
{
1144-
auto * baseDevice = [self newBaseDevice];
1145-
[baseDevice openCommissioningWindowWithSetupPasscode:setupPasscode
1146-
discriminator:discriminator
1147-
duration:duration
1148-
queue:queue
1149-
completion:completion];
1144+
MTR_ABSTRACT_METHOD();
1145+
dispatch_async(queue, ^{
1146+
completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
1147+
});
11501148
}
11511149

11521150
- (void)openCommissioningWindowWithDiscriminator:(NSNumber *)discriminator
11531151
duration:(NSNumber *)duration
11541152
queue:(dispatch_queue_t)queue
11551153
completion:(MTRDeviceOpenCommissioningWindowHandler)completion
11561154
{
1157-
auto * baseDevice = [self newBaseDevice];
1158-
[baseDevice openCommissioningWindowWithDiscriminator:discriminator duration:duration queue:queue completion:completion];
1155+
MTR_ABSTRACT_METHOD();
1156+
dispatch_async(queue, ^{
1157+
completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
1158+
});
11591159
}
11601160

11611161
- (void)downloadLogOfType:(MTRDiagnosticLogType)type
11621162
timeout:(NSTimeInterval)timeout
11631163
queue:(dispatch_queue_t)queue
11641164
completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion
11651165
{
1166-
auto * baseDevice = [self newBaseDevice];
1167-
[baseDevice downloadLogOfType:type
1168-
timeout:timeout
1169-
queue:queue
1170-
completion:completion];
1166+
MTR_ABSTRACT_METHOD();
1167+
dispatch_async(queue, ^{
1168+
completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
1169+
});
11711170
}
11721171

11731172
#pragma mark - Cache management
@@ -1286,11 +1285,6 @@ - (BOOL)deviceCachePrimed
12861285
return _deviceCachePrimed;
12871286
}
12881287

1289-
- (MTRBaseDevice *)newBaseDevice
1290-
{
1291-
return [MTRBaseDevice deviceWithNodeID:self.nodeID controller:self.deviceController];
1292-
}
1293-
12941288
#pragma mark Log Help
12951289

12961290
- (nullable NSNumber *)_informationalNumberAtAttributePath:(MTRAttributePath *)attributePath

src/darwin/Framework/CHIP/MTRDevice_XPC.mm

+1
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
266266

267267
// Not Supported via XPC
268268
//- (oneway void)deviceController:(NSUUID *)controller nodeID:(NSNumber *)nodeID openCommissioningWindowWithSetupPasscode:(NSNumber *)setupPasscode discriminator:(NSNumber *)discriminator duration:(NSNumber *)duration completion:(MTRDeviceOpenCommissioningWindowHandler)completion;
269+
//- (oneway void)deviceController:(NSUUID *)controller nodeID:(NSNumber *)nodeID openCommissioningWindowWithDiscriminator:(NSNumber *)discriminator duration:(NSNumber *)duration completion:(MTRDeviceOpenCommissioningWindowHandler)completion;
269270

270271
// Not Supported via XPC
271272
// - (oneway void)downloadLogOfType:(MTRDiagnosticLogType)type nodeID:(NSNumber *)nodeID timeout:(NSTimeInterval)timeout completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion;

0 commit comments

Comments
 (0)