From cb40b0d0dcc8135c7cf9dc78f2b47d89404047ad Mon Sep 17 00:00:00 2001
From: Adrian Gielniewski <adrian.gielniewski@gmail.com>
Date: Tue, 4 Feb 2025 21:31:31 +0100
Subject: [PATCH] [nrf noup] Remove dependncy to Server

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@gmail.com>
---
 src/app/server/Server.cpp         | 5 +++++
 src/app/server/Server.h           | 2 ++
 src/lib/shell/commands/Device.cpp | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index 426e3c6865..628afc9042 100644
--- 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
index 2f61197fce..3d1797626b 100644
--- 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
index e4fe4ee878..29fe2c1cc4 100644
--- a/src/lib/shell/commands/Device.cpp
+++ b/src/lib/shell/commands/Device.cpp
@@ -15,7 +15,6 @@
  *    limitations under the License.
  */
 
-#include <app/server/Server.h>
 #include <lib/shell/Commands.h>
 #include <lib/shell/Engine.h>
 #include <lib/shell/SubShellCommand.h>
@@ -23,6 +22,9 @@
 #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;
 }