commit a39d800e464582cc07414ea76603ee5442ff8f89
author Jiacheng Guo <gjc@google.com> Thu Apr 16 21:52:08 2020
committer GitHub <noreply@github.com> Thu Apr 16 21:52:08 2020
tree 02bcf3ff9bbaecc9c70e1c5bb762ffd11a06e15d
parent da24278dbfe9ced27ffcdd37e6897265e47cab31

[dbus] wipe persistent data on factory reset (#400)

This change fixes the behavior of factory reset. It will wipe persistent
network data now.

src/dbus/server/dbus_thread_object.cpp

diff --git a/src/dbus/server/dbus_thread_object.cpp b/src/dbus/server/dbus_thread_object.cpp
index a066a15..376f218 100644
--- a/src/dbus/server/dbus_thread_object.cpp
+++ b/src/dbus/server/dbus_thread_object.cpp
@@ -263,21 +263,20 @@
 void DBusThreadObject::FactoryResetHandler(DBusRequest &aRequest)
 {
     aRequest.ReplyOtResult(OT_ERROR_NONE);
+    otInstanceFactoryReset(mNcp->GetThreadHelper()->GetInstance());
     mNcp->Reset();
-
-    {
-        auto threadHelper = mNcp->GetThreadHelper();
-        threadHelper->AddDeviceRoleHandler(std::bind(&DBusThreadObject::DeviceRoleHandler, this, _1));
-        SignalPropertyChanged(OTBR_DBUS_THREAD_INTERFACE, OTBR_DBUS_PROPERTY_DEVICE_ROLE,
-                              GetDeviceRoleName(OT_DEVICE_ROLE_DISABLED));
-    }
+    mNcp->GetThreadHelper()->AddDeviceRoleHandler(std::bind(&DBusThreadObject::DeviceRoleHandler, this, _1));
+    SignalPropertyChanged(OTBR_DBUS_THREAD_INTERFACE, OTBR_DBUS_PROPERTY_DEVICE_ROLE,
+                          GetDeviceRoleName(OT_DEVICE_ROLE_DISABLED));
 }
 
 void DBusThreadObject::ResetHandler(DBusRequest &aRequest)
 {
-    auto threadHelper = mNcp->GetThreadHelper();
+    mNcp->Reset();
+    mNcp->GetThreadHelper()->AddDeviceRoleHandler(std::bind(&DBusThreadObject::DeviceRoleHandler, this, _1));
+    SignalPropertyChanged(OTBR_DBUS_THREAD_INTERFACE, OTBR_DBUS_PROPERTY_DEVICE_ROLE,
+                          GetDeviceRoleName(OT_DEVICE_ROLE_DISABLED));
 
-    otInstanceReset(threadHelper->GetInstance());
     aRequest.ReplyOtResult(OT_ERROR_NONE);
 }