[nrf noup] Remove dependncy to Server

Signed-off-by: Adrian Gielniewski <[email protected]>
nrfconnect · Feb 10, 2025 · 161d2d6 · 161d2d6
1 parent 42af0b0
commit 161d2d6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -796,4 +796,9 @@ Crypto::DefaultSessionKeystore CommonCaseDeviceServerInitParams::sSessionKeystor
 app::DefaultICDCheckInBackOffStrategy CommonCaseDeviceServerInitParams::sDefaultICDCheckInBackOffStrategy;
 #endif
 
+void ServerScheduleFactoryReset()
+{
+    chip::Server::GetInstance().ScheduleFactoryReset();
+}
+
 } // namespace chip
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -704,4 +704,6 @@ class Server
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 };
 
+void ServerScheduleFactoryReset();
+
 } // namespace chip
diff --git a/src/lib/shell/commands/Device.cpp b/src/lib/shell/commands/Device.cpp
@@ -15,14 +15,16 @@
  *    limitations under the License.
  */
 
-#include <app/server/Server.h>
 #include <lib/shell/Commands.h>
 #include <lib/shell/Engine.h>
 #include <lib/shell/SubShellCommand.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
 
 namespace chip {
+
+void ServerScheduleFactoryReset();
+
 namespace Shell {
 
 static CHIP_ERROR FactoryResetHandler(int argc, char ** argv)
@@ -31,7 +33,7 @@ static CHIP_ERROR FactoryResetHandler(int argc, char ** argv)
 #if CHIP_CONFIG_TEST
     DeviceLayer::ConfigurationMgr().InitiateFactoryReset();
 #else
-    chip::Server::GetInstance().ScheduleFactoryReset();
+    ServerScheduleFactoryReset();
 #endif // CHIP_TEST
     return CHIP_NO_ERROR;
 }