Просмотр исходного кода

Merge nfc_playlist from https://github.com/acegoal07/FlipperZero_NFC_Playlist

# Conflicts:
#	nfc_playlist/scenes/nfc_playlist_scene_emulation.c
Willy-JL 1 год назад
Родитель
Сommit
a8e7da3aa9

+ 0 - 1
nfc_playlist/README.md

@@ -13,7 +13,6 @@ An example file can be found in the repository
 This app was design, built and tested using the <a href="https://github.com/Next-Flip/Momentum-Firmware">Momentum</a> so keep that in mind when building the FAP for yourself
 ## Supported Firmwares
 As i know these firmwares are supported and working if you know any more please let me know
-- <a href="https://github.com/Flipper-XFW/Xtreme-Firmware">Xtreme</a>
 - <a href="https://github.com/Next-Flip/Momentum-Firmware">Momentum</a>
 - <a href="https://github.com/RogueMaster/flipperzero-firmware-wPlugins">RogueMaster</a>
 ## Settings:

+ 1 - 1
nfc_playlist/application.fam

@@ -8,7 +8,7 @@ App(
     fap_category="NFC",
     fap_author="@acegoal07",
     fap_weburl="https://github.com/acegoal07/FlipperZero_NFC_Playlist/tree/main",
-    fap_version="2.3",
+    fap_version="2.4",
     fap_icon_assets="assets",
     fap_icon="assets/Playlist_10px.png",
     fap_private_libs=[

+ 6 - 3
nfc_playlist/scenes/nfc_playlist_scene_emulation.c

@@ -89,14 +89,15 @@ int32_t nfc_playlist_emulation_task(void* context) {
             int time_counter_ms =
                 (options_emulate_timeout[nfc_playlist->settings.emulate_timeout] * 1000);
 
-            if(!strcasestr(furi_string_get_cstr(tmp_file_ext), ".nfc")) {
+            int ext_check = furi_string_cmpi_str(tmp_file_ext, ".nfc");
+            if(ext_check != 0 && ext_check != 10) {
                 if(nfc_playlist->settings.skip_error) {
                     skip_delay = true;
                     continue;
                 }
                 furi_string_printf(
                     tmp_header_str,
-                    "ERROR invalid file:\n%s",
+                    "ERROR invalid file type:\n%s",
                     furi_string_get_cstr(tmp_file_name));
                 popup_set_header(
                     nfc_playlist->popup,
@@ -125,7 +126,9 @@ int32_t nfc_playlist_emulation_task(void* context) {
                     continue;
                 }
                 furi_string_printf(
-                    tmp_header_str, "ERROR not found:\n%s", furi_string_get_cstr(tmp_file_name));
+                    tmp_header_str,
+                    "ERROR file not found:\n%s",
+                    furi_string_get_cstr(tmp_file_name));
                 popup_set_header(
                     nfc_playlist->popup,
                     furi_string_get_cstr(tmp_header_str),