Skip to content

Commit 6609559

Browse files
Move the remaining pending shutdown API bits to MTRDeviceController_Concrete.
1 parent 8750c55 commit 6609559

File tree

3 files changed

+10
-24
lines changed

3 files changed

+10
-24
lines changed

src/darwin/Framework/CHIP/MTRDeviceController.mm

-14
Original file line numberDiff line numberDiff line change
@@ -320,20 +320,6 @@ - (void)_controllerResumed
320320
// Subclass hook; nothing to do.
321321
}
322322

323-
- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate
324-
{
325-
// TODO: Once the factory knows it's dealing with MTRDeviceController_Concrete, this can be removed, and its
326-
// declaration moved to MTRDeviceController_Concrete.
327-
return NO;
328-
}
329-
330-
- (void)clearPendingShutdown
331-
{
332-
// TODO: Once the factory knows it's dealing with MTRDeviceController_Concrete, this can be removed, and its
333-
// declaration moved to MTRDeviceController_Concrete.
334-
MTR_ABSTRACT_METHOD();
335-
}
336-
337323
- (void)shutdown
338324
{
339325
MTR_ABSTRACT_METHOD();

src/darwin/Framework/CHIP/MTRDeviceController_Concrete.h

+10
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,16 @@ NS_ASSUME_NONNULL_BEGIN
8484
*/
8585
- (void)removeRunAssertion;
8686

87+
/**
88+
* This method returns TRUE if this controller matches the fabric reference and node ID as listed in the parameters.
89+
*/
90+
- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate;
91+
92+
/**
93+
* Clear any pending shutdown request.
94+
*/
95+
- (void)clearPendingShutdown;
96+
8797
@end
8898

8999
NS_ASSUME_NONNULL_END

src/darwin/Framework/CHIP/MTRDeviceController_Internal.h

-10
Original file line numberDiff line numberDiff line change
@@ -265,16 +265,6 @@ NS_ASSUME_NONNULL_BEGIN
265265
*/
266266
- (void)directlyGetSessionForNode:(chip::NodeId)nodeID completion:(MTRInternalDeviceConnectionCallback)completion;
267267

268-
/**
269-
* This method returns TRUE if this controller matches the fabric reference and node ID as listed in the parameters.
270-
*/
271-
- (BOOL)matchesPendingShutdownControllerWithOperationalCertificate:(nullable MTRCertificateDERBytes)operationalCertificate andRootCertificate:(nullable MTRCertificateDERBytes)rootCertificate;
272-
273-
/**
274-
* Clear any pending shutdown request.
275-
*/
276-
- (void)clearPendingShutdown;
277-
278268
@end
279269

280270
/**

0 commit comments

Comments
 (0)