From 272c206c95394a840a539f6bb94a6afc1686f6c3 Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Tue, 15 Oct 2024 18:16:22 -0700
Subject: [PATCH 1/2] Moving more stuff out of the base

---
 src/darwin/Framework/CHIP/MTRDevice.mm        | 30 +-------------
 .../Framework/CHIP/MTRDevice_Concrete.mm      |  5 ---
 src/darwin/Framework/CHIP/MTRDevice_XPC.mm    | 40 +++++++++++++++++++
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index a584bd68e06f9f..774ce0a28bae05 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -541,35 +541,7 @@ - (BOOL)deviceUsesThread
 // method will need to be updated to reflect that.
 - (BOOL)_deviceUsesThread
 {
-    os_unfair_lock_assert_owner(&self->_lock);
-
-#ifdef DEBUG
-    // Note: This is a hack to allow our unit tests to test the subscription pooling behavior we have implemented for thread, so we mock devices to be a thread device
-    __block BOOL pretendThreadEnabled = NO;
-    [self _callFirstDelegateSynchronouslyWithBlock:^(id testDelegate) {
-        if ([testDelegate respondsToSelector:@selector(unitTestPretendThreadEnabled:)]) {
-            pretendThreadEnabled = [testDelegate unitTestPretendThreadEnabled:self];
-        }
-    }];
-    if (pretendThreadEnabled) {
-        return YES;
-    }
-#endif
-
-    MTRClusterPath * networkCommissioningClusterPath = [MTRClusterPath clusterPathWithEndpointID:@(kRootEndpointId) clusterID:@(MTRClusterIDTypeNetworkCommissioningID)];
-    MTRDeviceClusterData * networkCommissioningClusterData = [self _clusterDataForPath:networkCommissioningClusterPath];
-    NSNumber * networkCommissioningClusterFeatureMapValueNumber = networkCommissioningClusterData.attributes[@(MTRClusterGlobalAttributeFeatureMapID)][MTRValueKey];
-
-    if (networkCommissioningClusterFeatureMapValueNumber == nil)
-        return NO;
-    if (![networkCommissioningClusterFeatureMapValueNumber isKindOfClass:[NSNumber class]]) {
-        MTR_LOG_ERROR("%@ Unexpected NetworkCommissioning FeatureMap value %@", self, networkCommissioningClusterFeatureMapValueNumber);
-        return NO;
-    }
-
-    uint32_t networkCommissioningClusterFeatureMapValue = static_cast<uint32_t>(networkCommissioningClusterFeatureMapValueNumber.unsignedLongValue);
-
-    return (networkCommissioningClusterFeatureMapValue & MTRNetworkCommissioningFeatureThreadNetworkInterface) != 0 ? YES : NO;
+    return NO;
 }
 
 - (NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> *)_clusterDataToPersistSnapshot
diff --git a/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm b/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
index 68b610cb25c7d7..88e2493fe457c6 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
@@ -1646,11 +1646,6 @@ - (void)_scheduleClusterDataPersistence
     }
     [_mostRecentReportTimes addObject:[NSDate now]];
 
-    {
-        std::lock_guard lock(_descriptionLock);
-        _mostRecentReportTimeForDescription = [_mostRecentReportTimes lastObject];
-    }
-
     // Calculate running average and update multiplier - need at least 2 items to calculate intervals
     if (_mostRecentReportTimes.count > 2) {
         NSTimeInterval cumulativeIntervals = 0;
diff --git a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
index aefa2fffc1eeb7..09302c75a72ca5 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
@@ -309,4 +309,44 @@ - (void)downloadLogOfType:(MTRDiagnosticLogType)type
 // Not Supported via XPC
 // - (oneway void)downloadLogOfType:(MTRDiagnosticLogType)type nodeID:(NSNumber *)nodeID timeout:(NSTimeInterval)timeout completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion;
 
+
+#pragma mark - Storage Overrides
+
+- (NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> *)_clusterDataToPersistSnapshot
+{
+    return nil;
+}
+
+
+- (BOOL)_dataStoreExists
+{
+    return NO;
+}
+
+- (void)_persistClusterData
+{
+
+}
+
+- (BOOL)_deviceIsReportingExcessively
+{
+    return NO;
+}
+
+- (void)_persistClusterDataAsNeeded
+{
+}
+
+- (void)_scheduleClusterDataPersistence
+{
+}
+
+- (void)_resetStorageBehaviorState
+{
+}
+
+- (void)setStorageBehaviorConfiguration:(MTRDeviceStorageBehaviorConfiguration *)storageBehaviorConfiguration
+{
+}
+
 @end

From 151a7ac3933c0c22c8465c66412c0c3bb5ae95c8 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Wed, 16 Oct 2024 01:24:33 +0000
Subject: [PATCH 2/2] Restyled by clang-format

---
 src/darwin/Framework/CHIP/MTRDevice_XPC.mm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
index 09302c75a72ca5..5d9f4f1154e220 100644
--- a/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice_XPC.mm
@@ -309,7 +309,6 @@ - (void)downloadLogOfType:(MTRDiagnosticLogType)type
 // Not Supported via XPC
 // - (oneway void)downloadLogOfType:(MTRDiagnosticLogType)type nodeID:(NSNumber *)nodeID timeout:(NSTimeInterval)timeout completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion;
 
-
 #pragma mark - Storage Overrides
 
 - (NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> *)_clusterDataToPersistSnapshot
@@ -317,7 +316,6 @@ - (void)downloadLogOfType:(MTRDiagnosticLogType)type
     return nil;
 }
 
-
 - (BOOL)_dataStoreExists
 {
     return NO;
@@ -325,7 +323,6 @@ - (BOOL)_dataStoreExists
 
 - (void)_persistClusterData
 {
-
 }
 
 - (BOOL)_deviceIsReportingExcessively