commit a6f44fd715a5084d6832b7d922914552c417a2e6
author Boris Zbarsky <bzbarsky@apple.com> Thu Sep 26 19:16:30 2024 -0400
committer GitHub <noreply@github.com> Thu Sep 26 23:16:30 2024 +0000
tree 8fe74422b89d26ef7cccdc6308bb13c2b93993df
parent 427d7013c2f66e58dc920ad845052264b6642226

Get rid of MTRBaseDevice use in MTRDevice. (#35797)

There is no MTRBaseDevice allowed unless our MTRDevice is actually
MTRDevice_Concrete.

src/darwin/Framework/CHIP/MTRDevice.mm

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 552c99c..812c389 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -1141,12 +1141,10 @@
                                            queue:(dispatch_queue_t)queue
                                       completion:(MTRDeviceOpenCommissioningWindowHandler)completion
 {
-    auto * baseDevice = [self newBaseDevice];
-    [baseDevice openCommissioningWindowWithSetupPasscode:setupPasscode
-                                           discriminator:discriminator
-                                                duration:duration
-                                                   queue:queue
-                                              completion:completion];
+    MTR_ABSTRACT_METHOD();
+    dispatch_async(queue, ^{
+        completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
+    });
 }
 
 - (void)openCommissioningWindowWithDiscriminator:(NSNumber *)discriminator
@@ -1154,8 +1152,10 @@
                                            queue:(dispatch_queue_t)queue
                                       completion:(MTRDeviceOpenCommissioningWindowHandler)completion
 {
-    auto * baseDevice = [self newBaseDevice];
-    [baseDevice openCommissioningWindowWithDiscriminator:discriminator duration:duration queue:queue completion:completion];
+    MTR_ABSTRACT_METHOD();
+    dispatch_async(queue, ^{
+        completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
+    });
 }
 
 - (void)downloadLogOfType:(MTRDiagnosticLogType)type
@@ -1163,11 +1163,10 @@
                     queue:(dispatch_queue_t)queue
                completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion
 {
-    auto * baseDevice = [self newBaseDevice];
-    [baseDevice downloadLogOfType:type
-                          timeout:timeout
-                            queue:queue
-                       completion:completion];
+    MTR_ABSTRACT_METHOD();
+    dispatch_async(queue, ^{
+        completion(nil, [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]);
+    });
 }
 
 #pragma mark - Cache management
@@ -1286,11 +1285,6 @@
     return _deviceCachePrimed;
 }
 
-- (MTRBaseDevice *)newBaseDevice
-{
-    return [MTRBaseDevice deviceWithNodeID:self.nodeID controller:self.deviceController];
-}
-
 #pragma mark Log Help
 
 - (nullable NSNumber *)_informationalNumberAtAttributePath:(MTRAttributePath *)attributePath

src/darwin/Framework/CHIP/MTRDevice_XPC.mm

diff --git a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
index 015736e..7806546 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
@@ -266,6 +266,7 @@
 
 // Not Supported via XPC
 //- (oneway void)deviceController:(NSUUID *)controller nodeID:(NSNumber *)nodeID openCommissioningWindowWithSetupPasscode:(NSNumber *)setupPasscode discriminator:(NSNumber *)discriminator duration:(NSNumber *)duration completion:(MTRDeviceOpenCommissioningWindowHandler)completion;
+//- (oneway void)deviceController:(NSUUID *)controller nodeID:(NSNumber *)nodeID openCommissioningWindowWithDiscriminator:(NSNumber *)discriminator duration:(NSNumber *)duration completion:(MTRDeviceOpenCommissioningWindowHandler)completion;
 
 // Not Supported via XPC
 // - (oneway void)downloadLogOfType:(MTRDiagnosticLogType)type nodeID:(NSNumber *)nodeID timeout:(NSTimeInterval)timeout completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion;