[Fabric-Admin] Cleanup extra override method (project-chip#36109)

rquidute · Oct 17, 2024 · d7f99c7 · d7f99c7
1 parent 190c5c8
commit d7f99c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/examples/fabric-admin/device_manager/DeviceSynchronization.cpp b/examples/fabric-admin/device_manager/DeviceSynchronization.cpp
@@ -239,23 +239,23 @@ void DeviceSynchronizer::GetUniqueId()
     auto remoteBridgeNodeId               = DeviceMgr().GetRemoteBridgeNodeId();
     EndpointId remoteEndpointIdOfInterest = device->GetEndpointId();
 
-    ChipLogDetail(NotSpecified, "Attempting to get UniqueId from remote Fabric Sync Aggregator") CHIP_ERROR err =
-        mUniqueIdGetter.GetUniqueId(
-            [this](std::optional<CharSpan> aUniqueId) {
-                if (aUniqueId.has_value())
-                {
+    ChipLogDetail(NotSpecified, "Attempting to get UniqueId from remote Fabric Sync Aggregator");
+    CHIP_ERROR err = mUniqueIdGetter.GetUniqueId(
+        [this](std::optional<CharSpan> aUniqueId) {
+            if (aUniqueId.has_value())
+            {
 #if defined(PW_RPC_ENABLED)
-                    this->mCurrentDeviceData.has_unique_id = true;
-                    memcpy(this->mCurrentDeviceData.unique_id, aUniqueId.value().data(), aUniqueId.value().size());
+                this->mCurrentDeviceData.has_unique_id = true;
+                memcpy(this->mCurrentDeviceData.unique_id, aUniqueId.value().data(), aUniqueId.value().size());
 #endif
-                }
-                else
-                {
-                    ChipLogError(NotSpecified, "We expected to get UniqueId from remote Fabric Sync Aggregator, but failed");
-                }
-                this->SynchronizationCompleteAddDevice();
-            },
-            *mController, remoteBridgeNodeId, remoteEndpointIdOfInterest);
+            }
+            else
+            {
+                ChipLogError(NotSpecified, "We expected to get UniqueId from remote Fabric Sync Aggregator, but failed");
+            }
+            this->SynchronizationCompleteAddDevice();
+        },
+        *mController, remoteBridgeNodeId, remoteEndpointIdOfInterest);
 
     if (err == CHIP_NO_ERROR)
     {

diff --git a/examples/fabric-admin/device_manager/UniqueIdGetter.cpp b/examples/fabric-admin/device_manager/UniqueIdGetter.cpp
@@ -95,11 +95,6 @@ void UniqueIdGetter::OnAttributeData(const ConcreteDataAttributePath & path, TLV
     }
 }
 
-void UniqueIdGetter::OnReportEnd()
-{
-    // We will call mOnDoneCallback in OnDone.
-}
-
 void UniqueIdGetter::OnError(CHIP_ERROR error)
 {
     ChipLogProgress(NotSpecified, "Error Getting UID: %" CHIP_ERROR_FORMAT, error.Format());

diff --git a/examples/fabric-admin/device_manager/UniqueIdGetter.h b/examples/fabric-admin/device_manager/UniqueIdGetter.h
@@ -51,7 +51,6 @@ class UniqueIdGetter : public chip::app::ReadClient::Callback
     ///////////////////////////////////////////////////////////////
     void OnAttributeData(const chip::app::ConcreteDataAttributePath & path, chip::TLV::TLVReader * data,
                          const chip::app::StatusIB & status) override;
-    void OnReportEnd() override;
     void OnError(CHIP_ERROR error) override;
     void OnDone(chip::app::ReadClient * apReadClient) override;