From ae47327391d807961295b9c159ad7962fe629d0e Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Mon, 6 Mar 2023 18:14:47 +0000 Subject: [PATCH] Properly migrate badusb and unirf files --- applications/main/bad_kb/bad_kb_app.c | 12 ++++++++++++ applications/main/bad_kb/bad_kb_app_i.h | 2 +- applications/main/subghz_remote/subghz_remote_app.c | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/applications/main/bad_kb/bad_kb_app.c b/applications/main/bad_kb/bad_kb_app.c index 2934a50c2..9f2a3145a 100644 --- a/applications/main/bad_kb/bad_kb_app.c +++ b/applications/main/bad_kb/bad_kb_app.c @@ -83,6 +83,18 @@ BadKbApp* bad_kb_app_alloc(char* arg) { furi_string_set(app->file_path, arg); } + Storage* storage = furi_record_open(RECORD_STORAGE); + // Remove old pre-included files to avoid duplicates on migrate + storage_simply_remove(storage, EXT_PATH("badusb/layouts")); + storage_simply_remove(storage, EXT_PATH("badusb/.badusb.settings")); + storage_simply_remove(storage, EXT_PATH("badusb/Kiosk-Evasion-Bruteforce.txt")); + storage_simply_remove(storage, EXT_PATH("badusb/Wifi-Stealer_ORG.txt")); + storage_simply_remove(storage, EXT_PATH("badusb/demo_macos.txt")); + storage_simply_remove(storage, EXT_PATH("badusb/demo_windows.txt")); + storage_common_migrate(storage, EXT_PATH("badusb"), BAD_KB_APP_BASE_FOLDER); + storage_simply_mkdir(storage, BAD_KB_APP_BASE_FOLDER); + furi_record_close(RECORD_STORAGE); + bad_kb_load_settings(app); app->gui = furi_record_open(RECORD_GUI); diff --git a/applications/main/bad_kb/bad_kb_app_i.h b/applications/main/bad_kb/bad_kb_app_i.h index b7194ac3c..a55875676 100644 --- a/applications/main/bad_kb/bad_kb_app_i.h +++ b/applications/main/bad_kb/bad_kb_app_i.h @@ -16,7 +16,7 @@ #include #include "views/bad_kb_view.h" -#define BAD_KB_APP_BASE_FOLDER ANY_PATH("badkb") +#define BAD_KB_APP_BASE_FOLDER EXT_PATH("badkb") #define BAD_KB_APP_PATH_LAYOUT_FOLDER BAD_KB_APP_BASE_FOLDER "/assets/layouts" #define BAD_KB_APP_PATH_BOUND_KEYS_FOLDER EXT_PATH("badkb/.bt_keys") #define BAD_KB_APP_PATH_BOUND_KEYS_FILE BAD_KB_APP_PATH_BOUND_KEYS_FOLDER "/.devices.keys" diff --git a/applications/main/subghz_remote/subghz_remote_app.c b/applications/main/subghz_remote/subghz_remote_app.c index e61903185..941cdb889 100644 --- a/applications/main/subghz_remote/subghz_remote_app.c +++ b/applications/main/subghz_remote/subghz_remote_app.c @@ -812,6 +812,11 @@ int32_t subghz_remote_app(void* p) { app->file_result = 3; Storage* storage = furi_record_open(RECORD_STORAGE); + // Remove old pre-included files to avoid duplicates on migrate + storage_simply_remove(storage, EXT_PATH("subghz/unirf/CVS_Walgreens.txt")); + storage_simply_remove(storage, EXT_PATH("subghz/unirf/Gas_Sign_Edit.txt")); + storage_simply_remove(storage, EXT_PATH("subghz/unirf/Ridin_Dirty.txt")); + storage_simply_remove(storage, EXT_PATH("subghz/unirf/Tesla_Handicap.txt")); storage_common_migrate(storage, EXT_PATH("subghz/unirf"), SUBREMOTEMAP_FOLDER); if(!storage_simply_mkdir(storage, SUBREMOTEMAP_FOLDER)) {