From 66095591098d55e525bb0f41a2fa0e5eb9dc8302 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 23 Sep 2024 14:39:18 -0400 Subject: [PATCH] Move the remaining pending shutdown API bits to MTRDeviceController_Concrete. --- src/darwin/Framework/CHIP/MTRDeviceController.mm | 14 -------------- .../Framework/CHIP/MTRDeviceController_Concrete.h | 10 ++++++++++ .../Framework/CHIP/MTRDeviceController_Internal.h | 10 ---------- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index e069ea79a990c8..862df52c645a9b 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -320,20 +320,6 @@ - (void)_controllerResumed // Subclass hook; nothing to do. } -- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate -{ - // TODO: Once the factory knows it's dealing with MTRDeviceController_Concrete, this can be removed, and its - // declaration moved to MTRDeviceController_Concrete. - return NO; -} - -- (void)clearPendingShutdown -{ - // TODO: Once the factory knows it's dealing with MTRDeviceController_Concrete, this can be removed, and its - // declaration moved to MTRDeviceController_Concrete. - MTR_ABSTRACT_METHOD(); -} - - (void)shutdown { MTR_ABSTRACT_METHOD(); diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h index 42c4092cc2ada6..399cfd216dd189 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h +++ b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h @@ -84,6 +84,16 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)removeRunAssertion; +/** + * This method returns TRUE if this controller matches the fabric reference and node ID as listed in the parameters. + */ +- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate; + +/** + * Clear any pending shutdown request. + */ +- (void)clearPendingShutdown; + @end NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h index 182eb609f06820..ce8067052e4cb4 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h +++ b/src/darwin/Framework/CHIP/MTRDeviceController_Internal.h @@ -265,16 +265,6 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)directlyGetSessionForNode:(chip::NodeId)nodeID completion:(MTRInternalDeviceConnectionCallback)completion; -/** - * This method returns TRUE if this controller matches the fabric reference and node ID as listed in the parameters. - */ -- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate; - -/** - * Clear any pending shutdown request. - */ -- (void)clearPendingShutdown; - @end /**