[Darwin] Rename MTRPairingStatus to MTRCommissioningStatus

project-chip · Sep 14, 2022 · 75a40fb · 75a40fb
1 parent d691b0a
commit 75a40fb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/examples/darwin-framework-tool/commands/pairing/DeviceControllerDelegateBridge.mm b/examples/darwin-framework-tool/commands/pairing/DeviceControllerDelegateBridge.mm
@@ -23,22 +23,22 @@ @interface CHIPToolDeviceControllerDelegate ()
 @end
 
 @implementation CHIPToolDeviceControllerDelegate
-- (void)onStatusUpdate:(MTRPairingStatus)status
+- (void)onStatusUpdate:(MTRCommissioningStatus)status
 {
     NSLog(@"Pairing Status Update: %lu", status);
     switch (status) {
-    case MTRPairingStatusSuccess:
+    case MTRCommissioningStatusSuccess:
         ChipLogProgress(chipTool, "Secure Pairing Success");
         ChipLogProgress(chipTool, "CASE establishment successful");
         break;
-    case MTRPairingStatusFailed:
+    case MTRCommissioningStatusFailed:
         ChipLogError(chipTool, "Secure Pairing Failed");
         _commandBridge->SetCommandExitStatus(CHIP_ERROR_INCORRECT_STATE);
         break;
-    case MTRPairingStatusDiscoveringMoreDevices:
+    case MTRCommissioningStatusDiscoveringMoreDevices:
         ChipLogProgress(chipTool, "Secure Pairing Discovering More Devices");
         break;
-    case MTRPairingStatusUnknown:
+    case MTRCommissioningStatusUnknown:
         ChipLogError(chipTool, "Uknown Pairing Status");
         break;
     }

diff --git a/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h b/examples/darwin-framework-tool/commands/tests/TestCommandBridge.h
@@ -48,7 +48,7 @@ constexpr const char * kDefaultKey = "default";
 @property chip::NodeId deviceId;
 @property BOOL active; // Whether to pass on notifications to the commandBridge
 
-- (void)onStatusUpdate:(MTRPairingStatus)status;
+- (void)onStatusUpdate:(MTRCommissioningStatus)status;
 - (void)onPairingComplete:(NSError * _Nullable)error;
 - (void)onPairingDeleted:(NSError * _Nullable)error;
 - (void)onCommissioningComplete:(NSError * _Nullable)error;
@@ -530,12 +530,12 @@ class TestCommandBridge : public CHIPCommandBridge,
 NS_ASSUME_NONNULL_BEGIN
 
 @implementation TestDeviceControllerDelegate
-- (void)onStatusUpdate:(MTRPairingStatus)status
+- (void)onStatusUpdate:(MTRCommissioningStatus)status
 {
     if (_active) {
-        if (status == MTRPairingStatusSuccess) {
+        if (status == MTRCommissioningStatusSuccess) {
             NSLog(@"Secure pairing success");
-        } else if (status == MTRPairingStatusFailed) {
+        } else if (status == MTRCommissioningStatusFailed) {
             _active = NO;
             NSLog(@"Secure pairing failed");
             _commandBridge->OnStatusUpdate(chip::app::StatusIB(chip::Protocols::InteractionModel::Status::Failure));

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegate.h b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegate.h
@@ -19,11 +19,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM(NSUInteger, MTRPairingStatus) {
-    MTRPairingStatusUnknown = 0,
-    MTRPairingStatusSuccess = 1,
-    MTRPairingStatusFailed = 2,
-    MTRPairingStatusDiscoveringMoreDevices = 3
+typedef NS_ENUM(NSUInteger, MTRCommissioningStatus) {
+    MTRCommissioningStatusUnknown = 0,
+    MTRCommissioningStatusSuccess = 1,
+    MTRCommissioningStatusFailed = 2,
+    MTRCommissioningStatusDiscoveringMoreDevices = 3
 };
 
 /**
@@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, MTRPairingStatus) {
  * Notify the delegate when pairing status gets updated
  *
  */
-- (void)onStatusUpdate:(MTRPairingStatus)status;
+- (void)onStatusUpdate:(MTRCommissioningStatus)status;
 
 /**
  * Notify the delegate when pairing is completed

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.h
@@ -42,7 +42,7 @@ class MTRDeviceControllerDelegateBridge : public chip::Controller::DevicePairing
     _Nullable id<MTRDeviceControllerDelegate> mDelegate;
     _Nullable dispatch_queue_t mQueue;
 
-    MTRPairingStatus MapStatus(chip::Controller::DevicePairingDelegate::Status status);
+    MTRCommissioningStatus MapStatus(chip::Controller::DevicePairingDelegate::Status status);
 };
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm
@@ -36,18 +36,18 @@
     }
 }
 
-MTRPairingStatus MTRDeviceControllerDelegateBridge::MapStatus(chip::Controller::DevicePairingDelegate::Status status)
+MTRCommissioningStatus MTRDeviceControllerDelegateBridge::MapStatus(chip::Controller::DevicePairingDelegate::Status status)
 {
-    MTRPairingStatus rv = MTRPairingStatusUnknown;
+    MTRCommissioningStatus rv = MTRCommissioningStatusUnknown;
     switch (status) {
     case chip::Controller::DevicePairingDelegate::Status::SecurePairingSuccess:
-        rv = MTRPairingStatusSuccess;
+        rv = MTRCommissioningStatusSuccess;
         break;
     case chip::Controller::DevicePairingDelegate::Status::SecurePairingFailed:
-        rv = MTRPairingStatusFailed;
+        rv = MTRCommissioningStatusFailed;
         break;
     case chip::Controller::DevicePairingDelegate::Status::SecurePairingDiscoveringMoreDevices:
-        rv = MTRPairingStatusDiscoveringMoreDevices;
+        rv = MTRCommissioningStatusDiscoveringMoreDevices;
         break;
     }
     return rv;
@@ -60,9 +60,9 @@
     id<MTRDeviceControllerDelegate> strongDelegate = mDelegate;
     if ([strongDelegate respondsToSelector:@selector(onStatusUpdate:)]) {
         if (strongDelegate && mQueue) {
-            MTRPairingStatus pairingStatus = MapStatus(status);
+            MTRCommissioningStatus commissioningStatus = MapStatus(status);
             dispatch_async(mQueue, ^{
-                [strongDelegate onStatusUpdate:pairingStatus];
+                [strongDelegate onStatusUpdate:commissioningStatus];
             });
         }
     }