From fc87dc5dd250c3bf65f5b1232da1a52a4c1176c9 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Fri, 26 Jan 2024 23:04:55 +0000
Subject: [PATCH] Reset expansion settings on install for now

---
 .../system/updater/util/update_task_worker_backup.c       | 8 ++++++++
 furi/flipper.c                                            | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/applications/system/updater/util/update_task_worker_backup.c b/applications/system/updater/util/update_task_worker_backup.c
index 50d54cf14..3e249bf9f 100644
--- a/applications/system/updater/util/update_task_worker_backup.c
+++ b/applications/system/updater/util/update_task_worker_backup.c
@@ -5,6 +5,7 @@
 #include <furi_hal.h>
 #include <storage/storage.h>
 #include <desktop/views/desktop_view_slideshow.h>
+#include <expansion/expansion_settings_filename.h>
 #include <toolbox/path.h>
 #include <update_util/dfu_file.h>
 #include <update_util/lfs_backup.h>
@@ -165,6 +166,13 @@ static bool update_task_post_update(UpdateTask* update_task) {
 
         CHECK_RESULT(lfs_backup_unpack(update_task->storage, furi_string_get_cstr(file_path)));
 
+#ifdef FURI_NDEBUG
+        // Production
+        // Currently no expansion modules exist, disable listening on UART
+        storage_common_remove(update_task->storage, EXPANSION_SETTINGS_OLD_PATH);
+        storage_common_remove(update_task->storage, EXPANSION_SETTINGS_PATH);
+#endif
+
         if(update_task->state.groups & UpdateTaskStageGroupResources) {
             TarUnpackProgress progress = {
                 .update_task = update_task,
diff --git a/furi/flipper.c b/furi/flipper.c
index 9bb9f7a72..e0119aa89 100644
--- a/furi/flipper.c
+++ b/furi/flipper.c
@@ -66,8 +66,8 @@ void flipper_migrate_files() {
     storage_common_remove(storage, POWER_SETTINGS_OLD_PATH);
     storage_common_copy(storage, BT_KEYS_STORAGE_OLD_PATH, BT_KEYS_STORAGE_PATH);
     storage_common_remove(storage, BT_KEYS_STORAGE_OLD_PATH);
-    storage_common_copy(storage, EXPANSION_SETTINGS_OLD_PATH, EXPANSION_SETTINGS_PATH);
-    storage_common_remove(storage, EXPANSION_SETTINGS_OLD_PATH);
+    // storage_common_copy(storage, EXPANSION_SETTINGS_OLD_PATH, EXPANSION_SETTINGS_PATH); // Reset on install for now
+    // storage_common_remove(storage, EXPANSION_SETTINGS_OLD_PATH);
     // storage_common_copy(storage, NOTIFICATION_SETTINGS_OLD_PATH, NOTIFICATION_SETTINGS_PATH); // Not compatible anyway
     storage_common_remove(storage, NOTIFICATION_SETTINGS_OLD_PATH);
     // Ext -> Int