From 8bf1fecfab560b6b65411f7d2ed0f602ccc210a9 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Fri, 2 Sep 2022 16:13:43 -0400
Subject: [PATCH] Address review comment.

---
 .../Framework/CHIP/MTRBaseSubscriptionCallback.h     |  4 ++--
 src/darwin/Framework/CHIP/MTRDevice.mm               | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h
index db9ad6b37b0c8a..38d665453ad0a6 100644
--- a/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h
+++ b/src/darwin/Framework/CHIP/MTRBaseSubscriptionCallback.h
@@ -57,8 +57,8 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac
         , mAttributeReportCallback(attributeReportCallback)
         , mEventReportCallback(eventReportCallback)
         , mErrorCallback(errorCallback)
-        , mSubscriptionEstablishedHandler(subscriptionEstablishedHandler)
         , mResubscriptionCallback(resubscriptionCallback)
+        , mSubscriptionEstablishedHandler(subscriptionEstablishedHandler)
         , mBufferedReadAdapter(*this)
         , mOnDoneHandler(onDoneHandler)
     {
@@ -123,8 +123,8 @@ class MTRBaseSubscriptionCallback : public chip::app::ClusterStateCache::Callbac
     // We set mErrorCallback to nil when queueing error reports, so we
     // make sure to only report one error.
     ErrorCallback _Nullable mErrorCallback = nil;
-    SubscriptionEstablishedHandler _Nullable mSubscriptionEstablishedHandler = nil;
     MTRDeviceResubscriptionScheduledHandler _Nullable mResubscriptionCallback = nil;
+    SubscriptionEstablishedHandler _Nullable mSubscriptionEstablishedHandler = nil;
     chip::app::BufferedReadCallback mBufferedReadAdapter;
 
     // Our lifetime management is a little complicated.  On errors that don't
diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 268243d5115533..7a84d514185329 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -102,8 +102,8 @@ - (id)strongObject
 class SubscriptionCallback final : public MTRBaseSubscriptionCallback {
 public:
     SubscriptionCallback(dispatch_queue_t queue, DataReportCallback attributeReportCallback, DataReportCallback eventReportCallback,
-        ErrorCallback errorCallback, SubscriptionEstablishedHandler subscriptionEstablishedHandler,
-        MTRDeviceResubscriptionScheduledHandler resubscriptionCallback, OnDoneHandler onDoneHandler)
+        ErrorCallback errorCallback, MTRDeviceResubscriptionScheduledHandler resubscriptionCallback,
+        SubscriptionEstablishedHandler subscriptionEstablishedHandler, OnDoneHandler onDoneHandler)
         : MTRBaseSubscriptionCallback(queue, attributeReportCallback, eventReportCallback, errorCallback, resubscriptionCallback,
             subscriptionEstablishedHandler, onDoneHandler)
     {
@@ -327,14 +327,14 @@ - (void)subscribeWithMinInterval:(uint16_t)minInterval maxInterval:(uint16_t)max
                                    // OnError
                                    [self _handleSubscriptionError:error];
                                },
-                               ^(void) {
-                                   // OnSubscriptionEstablished
-                                   [self _handleSubscriptionEstablished];
-                               },
                                ^(NSError * error, NSNumber * resubscriptionDelay) {
                                    // OnResubscriptionNeeded
                                    [self _handleResubscriptionNeeded];
                                },
+                               ^(void) {
+                                   // OnSubscriptionEstablished
+                                   [self _handleSubscriptionEstablished];
+                               },
                                ^(void) {
                                    // OnDone
                                    [self _handleSubscriptionReset];