Merge branch 'UNLEASHED' into 420

This commit is contained in:
RogueMaster
2022-10-12 00:13:02 -04:00
101 changed files with 3254 additions and 2195 deletions
@@ -72,12 +72,11 @@ bool subbrute_scene_run_attack_on_event(void* context, SceneManagerEvent event)
notification_message(instance->notifications, &sequence_display_backlight_on);
notification_message(instance->notifications, &sequence_double_vibro);
scene_manager_next_scene(instance->scene_manager, SubBruteSceneSetupAttack);
} else if(
event.event == SubBruteCustomEventTypeTransmitNotStarted ||
event.event == SubBruteCustomEventTypeBackPressed) {
if (subbrute_worker_is_running(instance->worker)) {
if(subbrute_worker_is_running(instance->worker)) {
// Notify
notification_message(instance->notifications, &sequence_single_vibro);
}
@@ -47,9 +47,14 @@ bool subbrute_scene_save_name_on_event(void* context, SceneManagerEvent event) {
if(strcmp(instance->text_store, "")) {
furi_string_reset(instance->file_path);
furi_string_cat_printf(
instance->file_path, "%s/%s%s", SUBBRUTE_PATH, instance->text_store, SUBBRUTE_FILE_EXT);
instance->file_path,
"%s/%s%s",
SUBBRUTE_PATH,
instance->text_store,
SUBBRUTE_FILE_EXT);
if(subbrute_device_save_file(instance->device, furi_string_get_cstr(instance->file_path))) {
if(subbrute_device_save_file(
instance->device, furi_string_get_cstr(instance->file_path))) {
scene_manager_next_scene(instance->scene_manager, SubBruteSceneSaveSuccess);
success = true;
consumed = true;