tweaks

Author: acegoal07

scenes/nfc_playlist_scene_config.h

@@ -4,7 +4,7 @@ ADD_SCENE(nfc_playlist, playlist_edit, PlaylistEdit)
 ADD_SCENE(nfc_playlist, playlist_rename, PlaylistRename)
 ADD_SCENE(nfc_playlist, main_menu, MainMenu)
 ADD_SCENE(nfc_playlist, name_new_playlist, NameNewPlaylist)
-ADD_SCENE(nfc_playlist, nfc_select, NfcSelect)
+ADD_SCENE(nfc_playlist, nfc_add, NfcAdd)
 ADD_SCENE(nfc_playlist, nfc_remove, NfcRemove)
 ADD_SCENE(nfc_playlist, playlist_select, PlaylistSelect)
 ADD_SCENE(nfc_playlist, settings, Settings)

scenes/nfc_playlist_scene_confirm_delete.c

@@ -13,13 +13,13 @@ void nfc_playlist_confirm_delete_scene_on_enter(void* context) {
    FuriString* file_name = furi_string_alloc();
    path_extract_filename_no_ext(furi_string_get_cstr(nfc_playlist->settings.playlist_path), file_name);
    FuriString* temp_str = furi_string_alloc_printf("\e#Delete %s?\e#", furi_string_get_cstr(file_name));
+   furi_string_free(file_name);
 
    widget_add_text_box_element(nfc_playlist->widget, 0, 0, 128, 23, AlignCenter, AlignCenter, furi_string_get_cstr(temp_str), false);
    widget_add_button_element(nfc_playlist->widget, GuiButtonTypeLeft, "Cancel", nfc_playlist_confirm_delete_menu_callback, nfc_playlist);
    widget_add_button_element(nfc_playlist->widget, GuiButtonTypeRight, "Delete", nfc_playlist_confirm_delete_menu_callback, nfc_playlist);
 
    furi_string_free(temp_str);
-   furi_string_free(file_name);
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Widget);
 }

scenes/nfc_playlist_scene_emulation.c

@@ -20,7 +20,9 @@ int32_t nfc_playlist_emulation_task(void* context) {
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
 
-   if (file_stream_open(stream, furi_string_get_cstr(nfc_playlist->settings.playlist_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
+   if (nfc_playlist->settings.playlist_length == 0) {
+      popup_set_header(nfc_playlist->popup, "The playlist you have\nselected is empty", 64, 10, AlignCenter, AlignTop);
+   } else if (file_stream_open(stream, furi_string_get_cstr(nfc_playlist->settings.playlist_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
       EmulationState = NfcPlaylistEmulationState_Emulating;
       int file_position = 0;
 
@@ -105,30 +107,27 @@ int32_t nfc_playlist_emulation_task(void* context) {
             nfc_playlist_emulation_worker_clear_nfc_data(nfc_playlist->nfc_playlist_emulation_worker);
          }
       }
-      popup_reset(nfc_playlist->popup);
-      if (nfc_playlist->settings.playlist_length == 0) {
-         popup_set_header(nfc_playlist->popup, "Empty playlist", 64, 10, AlignCenter, AlignTop);
-      } else {
-         popup_set_header(nfc_playlist->popup, EmulationState == NfcPlaylistEmulationState_Canceled ? "Emulation stopped" : "Emulation finished", 64, 10, AlignCenter, AlignTop);
-      }
-      popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
       stop_blink(nfc_playlist);
 
-      EmulationState = NfcPlaylistEmulationState_Stopped;
       furi_string_free(line);
       furi_string_free(tmp_header_str);
       furi_string_free(tmp_counter_str);
       furi_string_free(tmp_file_name);
       furi_string_free(tmp_file_ext);
+      file_stream_close(stream);
+
+      popup_reset(nfc_playlist->popup);
+      popup_set_header(nfc_playlist->popup, EmulationState == NfcPlaylistEmulationState_Canceled ? "Emulation stopped" : "Emulation finished", 64, 10, AlignCenter, AlignTop);
    } else {
       popup_set_header(nfc_playlist->popup, "Failed to open playlist", 64, 10, AlignCenter, AlignTop);
-      popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
    }
+   popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
 
-   file_stream_close(stream);
    furi_record_close(RECORD_STORAGE);
    stream_free(stream);
 
+   EmulationState = NfcPlaylistEmulationState_Stopped;
+
    return 0;
 }
 

scenes/nfc_playlist_scene_nfc_select.c scenes/nfc_playlist_scene_nfc_add.cscenes/nfc_playlist_scene_nfc_select.c renamed to scenes/nfc_playlist_scene_nfc_add.c

@@ -1,6 +1,6 @@
 #include "../nfc_playlist.h"
 
-void nfc_playlist_nfc_select_menu_callback(void* context) {
+void nfc_playlist_nfc_add_menu_callback(void* context) {
    NfcPlaylist* nfc_playlist = context;
 
    Storage* storage = furi_record_open(RECORD_STORAGE);
@@ -12,6 +12,7 @@ void nfc_playlist_nfc_select_menu_callback(void* context) {
       while(stream_read_line(stream, line)) {
          furi_string_cat_printf(tmp_str, "%s", furi_string_get_cstr(line));
       }
+      furi_string_free(line);
 
       if (!furi_string_empty(tmp_str)) {
          furi_string_cat_printf(tmp_str, "\n%s", furi_string_get_cstr(nfc_playlist->file_browser_output));
@@ -20,7 +21,6 @@ void nfc_playlist_nfc_select_menu_callback(void* context) {
       }
 
       stream_clean(stream);
-      furi_string_free(line);
       stream_write_string(stream, tmp_str);
       file_stream_close(stream);
       furi_string_free(tmp_str);
@@ -34,7 +34,7 @@ void nfc_playlist_nfc_select_menu_callback(void* context) {
    scene_manager_previous_scene(nfc_playlist->scene_manager);
 }
 
-void nfc_playlist_nfc_select_scene_on_enter(void* context) {
+void nfc_playlist_nfc_add_scene_on_enter(void* context) {
    NfcPlaylist* nfc_playlist = context;
    file_browser_configure(
       nfc_playlist->file_browser,
@@ -44,21 +44,21 @@ void nfc_playlist_nfc_select_scene_on_enter(void* context) {
       true,
       &I_Nfc_10px,
       true);
-   file_browser_set_callback(nfc_playlist->file_browser, nfc_playlist_nfc_select_menu_callback, nfc_playlist);
+   file_browser_set_callback(nfc_playlist->file_browser, nfc_playlist_nfc_add_menu_callback, nfc_playlist);
    FuriString* tmp_str = furi_string_alloc_set_str("/ext/nfc/");
    file_browser_start(nfc_playlist->file_browser, tmp_str);
    furi_string_free(tmp_str);
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileBrowser);
 }
 
-bool nfc_playlist_nfc_select_scene_on_event(void* context, SceneManagerEvent event) {
+bool nfc_playlist_nfc_add_scene_on_event(void* context, SceneManagerEvent event) {
    UNUSED(event);
    UNUSED(context);
    return false;
 }
 
-void nfc_playlist_nfc_select_scene_on_exit(void* context) {
+void nfc_playlist_nfc_add_scene_on_exit(void* context) {
    NfcPlaylist* nfc_playlist = context;
    file_browser_stop(nfc_playlist->file_browser);
 }

scenes/nfc_playlist_scene_nfc_remove.c

@@ -85,8 +85,8 @@ bool nfc_playlist_nfc_remove_scene_on_event(void* context, SceneManagerEvent eve
                   }
                }
 
-               stream_clean(stream);
                furi_string_free(line);
+               stream_clean(stream);
                stream_write_string(stream, tmp_str);
                furi_string_free(tmp_str);
                file_stream_close(stream);

scenes/nfc_playlist_scene_playlist_edit.c

@@ -94,7 +94,7 @@ bool nfc_playlist_playlist_edit_scene_on_event(void* context, SceneManagerEvent
             consumed = true;
             break;
          case NfcPlaylistMenuSelection_AddNfcItem:
-            scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NfcSelect);
+            scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NfcAdd);
             consumed = true;
             break;
          case NfcPlaylistMenuSelection_RemoveNfcItem:

scenes/nfc_playlist_scene_settings.c

@@ -73,6 +73,8 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
    furi_string_printf(tmp_str, "%ds", options_emulate_delay[nfc_playlist->settings.emulate_delay]);
    variable_item_set_current_value_text(emulation_delay_setting, furi_string_get_cstr(tmp_str));
 
+   furi_string_free(tmp_str);
+
    VariableItem* emulation_led_indicator_setting = variable_item_list_add(
       nfc_playlist->variable_item_list,
       "LED Indicator",
@@ -97,7 +99,6 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
    variable_item_set_current_value_text(credits, "Credits");
 
    variable_item_list_set_enter_callback(nfc_playlist->variable_item_list, nfc_playlist_settings_menu_callback, nfc_playlist);
-   furi_string_free(tmp_str);
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_VariableItemList);
 }
@@ -121,6 +122,8 @@ bool nfc_playlist_settings_scene_on_event(void* context, SceneManagerEvent event
             variable_item_set_current_value_index(emulation_delay_setting, nfc_playlist->settings.emulate_delay);
             furi_string_printf(tmp_str, "%ds", options_emulate_delay[nfc_playlist->settings.emulate_delay]);
             variable_item_set_current_value_text(emulation_delay_setting, furi_string_get_cstr(tmp_str));
+            
+            furi_string_free(tmp_str);
 
             nfc_playlist->settings.emulate_led_indicator = default_emulate_led_indicator;
             VariableItem* emulation_led_indicator_setting = variable_item_list_get(nfc_playlist->variable_item_list, NfcPlaylistSettings_LedIndicator);
@@ -132,7 +135,6 @@ bool nfc_playlist_settings_scene_on_event(void* context, SceneManagerEvent event
             variable_item_set_current_value_index(emulation_skip_error_setting, nfc_playlist->settings.skip_error);
             variable_item_set_current_value_text(emulation_skip_error_setting, nfc_playlist->settings.skip_error ? "ON" : "OFF");
 
-            furi_string_free(tmp_str);
             consumed = true;
             break;
          default: