From b0b94c70e0e80d4e57cde6f17d79ec966409e7d6 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 10 May 2023 13:56:39 +0100
Subject: [PATCH] Fix forgetting badkb and bt remote keys

---
 .../scenes/bt_settings_scene_forget_dev_confirm.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_confirm.c b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_confirm.c
index e39e5a737..ff5989245 100644
--- a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_confirm.c
+++ b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_confirm.c
@@ -31,14 +31,15 @@ bool bt_settings_scene_forget_dev_confirm_on_event(void* context, SceneManagerEv
         if(event.event == DialogExResultLeft) {
             consumed = scene_manager_previous_scene(app->scene_manager);
         } else if(event.event == DialogExResultRight) {
-            bt_forget_bonded_devices(app->bt);
-            // also remove keys of badkb and bt remote
-            bt_keys_storage_set_storage_path(app->bt, BAD_KB_KEYS_PATH);
-            bt_forget_bonded_devices(app->bt);
-            bt_keys_storage_set_storage_path(
-                app->bt, EXT_PATH("apps_data/hid_ble") "/" HID_BT_KEYS_STORAGE_NAME);
-            bt_forget_bonded_devices(app->bt);
             bt_keys_storage_set_default_path(app->bt);
+            bt_forget_bonded_devices(app->bt);
+
+            // also remove keys of badkb and bt remote
+            Storage* storage = furi_record_open(RECORD_STORAGE);
+            storage_simply_remove(storage, BAD_KB_KEYS_PATH);
+            storage_simply_remove(
+                storage, EXT_PATH("apps_data/hid_ble/") HID_BT_KEYS_STORAGE_NAME);
+            furi_record_close(RECORD_STORAGE);
 
             scene_manager_next_scene(app->scene_manager, BtSettingsAppSceneForgetDevSuccess);
             consumed = true;