From 59d9002198efc1cac2e1f6b8bc18d62277f690f6 Mon Sep 17 00:00:00 2001
From: Sil 333033 <333033@student.mboutrecht.nl>
Date: Sun, 16 Jul 2023 17:58:18 +0200
Subject: [PATCH] changed hardcoded path and removed mj folder

---
 applications/external/nrf24mousejacker/mousejacker.c | 10 ++--------
 applications/external/nrf24sniff/nrfsniff.c          |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/applications/external/nrf24mousejacker/mousejacker.c b/applications/external/nrf24mousejacker/mousejacker.c
index 1a4d7f4edd..5b3cce3363 100644
--- a/applications/external/nrf24mousejacker/mousejacker.c
+++ b/applications/external/nrf24mousejacker/mousejacker.c
@@ -15,11 +15,8 @@
 
 #define TAG "mousejacker"
 #define LOGITECH_MAX_CHANNEL 85
-#define NRFSNIFF_APP_PATH_FOLDER EXT_PATH("apps_data/nrf24sniff")
 #define NRFSNIFF_APP_PATH_FOLDER_ADDRESSES EXT_PATH("apps_data/nrf24sniff/addresses.txt")
-#define NRFSNIFF_APP_PATH_EXTENSION ".txt"
-#define NRFSNIFF_APP_FILENAME "addresses.txt"
-#define MOUSEJACKER_APP_PATH_FOLDER EXT_PATH("apps_data/mousejacker")
+#define BADKB_FOLDER EXT_PATH("badkb")
 #define MOUSEJACKER_APP_PATH_EXTENSION ".txt"
 #define MAX_ADDRS 100
 
@@ -118,7 +115,7 @@ static bool open_ducky_script(Stream* stream, PluginState* plugin_state) {
     bool result = false;
     FuriString* path;
     path = furi_string_alloc();
-    furi_string_set(path, MOUSEJACKER_APP_PATH_FOLDER);
+    furi_string_set(path, BADKB_FOLDER);
 
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(
@@ -303,9 +300,6 @@ int32_t mousejacker_app(void* p) {
     gui_add_view_port(gui, view_port, GuiLayerFullscreen);
 
     plugin_state->storage = furi_record_open(RECORD_STORAGE);
-    storage_common_migrate(
-        plugin_state->storage, EXT_PATH("mousejacker"), MOUSEJACKER_APP_PATH_FOLDER);
-    storage_common_mkdir(plugin_state->storage, MOUSEJACKER_APP_PATH_FOLDER);
     plugin_state->file_stream = file_stream_alloc(plugin_state->storage);
 
     plugin_state->mjthread = furi_thread_alloc();
diff --git a/applications/external/nrf24sniff/nrfsniff.c b/applications/external/nrf24sniff/nrfsniff.c
index f15f7e80f1..18cbe6fb7a 100644
--- a/applications/external/nrf24sniff/nrfsniff.c
+++ b/applications/external/nrf24sniff/nrfsniff.c
@@ -15,7 +15,7 @@
 #define MAX_ADDRS 100
 #define MAX_CONFIRMED 32
 
-#define NRFSNIFF_APP_PATH_FOLDER EXT_PATH("apps_data/nrf24sniff")
+#define NRFSNIFF_APP_PATH_FOLDER STORAGE_APP_DATA_PATH_PREFIX
 #define NRFSNIFF_APP_FILENAME "addresses.txt"
 #define TAG "nrfsniff"