Properly migrate badusb and unirf files

This commit is contained in:
Willy-JL
2023-03-06 18:14:47 +00:00
parent 05d6cbfc6a
commit ae47327391
3 changed files with 18 additions and 1 deletions
+12
View File
@@ -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);
+1 -1
View File
@@ -16,7 +16,7 @@
#include <gui/modules/byte_input.h>
#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"
@@ -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)) {