From 3aa7c516c141133b4b4d7f355db897f380c138ae Mon Sep 17 00:00:00 2001
From: Wang Qixiang <43193572+wqx6@users.noreply.github.com>
Date: Tue, 6 Feb 2024 17:31:39 +0800
Subject: [PATCH] ESP32: Add a menuconfig option to enable/disable persist
 subscription (#30889)

* ESP32: Add a menuconfig option to enable/disable persist subscription

* enable persistent subscription by default
---
 config/esp32/components/chip/CMakeLists.txt | 6 ++++++
 config/esp32/components/chip/Kconfig        | 7 +++++++
 src/platform/device.gni                     | 4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
index e32588db436e2c..669b552b7beab9 100644
--- a/config/esp32/components/chip/CMakeLists.txt
+++ b/config/esp32/components/chip/CMakeLists.txt
@@ -185,6 +185,12 @@ if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
         endif()
 endif()
 
+if (CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS)
+    chip_gn_arg_append("chip_persist_subscriptions"                 "true")
+else()
+    chip_gn_arg_append("chip_persist_subscriptions"                 "false")
+endif()
+
 if (CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
     chip_gn_arg_append("chip_enable_ble_controller"             "true")
 endif()
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
index b6195b68b9bd65..18ac98fddb4b30 100644
--- a/config/esp32/components/chip/Kconfig
+++ b/config/esp32/components/chip/Kconfig
@@ -114,6 +114,13 @@ menu "CHIP Core"
             help
                 Some device types don't require the read client. Enabling this option may save some flash/ram.
 
+        config ENABLE_PERSIST_SUBSCRIPTIONS
+            bool "Enable persist subscriptions"
+            default y
+            help
+                Enable persist subscriptions to make the device resume the subscriptions from the persist
+                subscriptions information after reboot.
+
         config BUILD_CHIP_TESTS
             bool "Build CHIP tests"
             default n
diff --git a/src/platform/device.gni b/src/platform/device.gni
index cf1dc07325a664..f2bd5275b3579f 100644
--- a/src/platform/device.gni
+++ b/src/platform/device.gni
@@ -103,8 +103,8 @@ declare_args() {
 
   # Enable Subscription persistence / resumption for CI and supported platforms
   if (chip_device_platform == "darwin" || chip_device_platform == "linux" ||
-      chip_device_platform == "esp32" || chip_device_platform == "fake" ||
-      chip_device_platform == "efr32" || chip_device_platform == "SiWx917") {
+      chip_device_platform == "fake" || chip_device_platform == "efr32" ||
+      chip_device_platform == "SiWx917") {
     chip_persist_subscriptions = true
   } else {
     chip_persist_subscriptions = false