diff --git a/CHANGELOG.md b/CHANGELOG.md index 897d7a907..d0526484d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,6 +97,7 @@ - NFC: - Support MIFARE DESFire Transaction MAC file type, fixes reading some EV2+ cards (by @Willy-JL) - Improve NDEF parser handling and display of raw non-text data (by @Willy-JL) + - Improve loading of parser plugins (by @Willy-JL) - OFW: Added naming for DESFire cards + fix MF3ICD40 cards unable to be read (by @Demae) - OFW: FeliCa Protocol Expose Read Block API and Allow Specifying Service (by @zinongli) - OFW: Enable MFUL sync poller to be provided with passwords (by @GMMan) diff --git a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c index 1db8bed25..b559667be 100644 --- a/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c +++ b/applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c @@ -312,6 +312,10 @@ static void nfc_protocol_support_scene_read_saved_menu_on_exit(NfcApp* instance) static void nfc_protocol_support_scene_read_success_on_enter(NfcApp* instance) { Widget* widget = instance->widget; + popup_set_header(instance->popup, "Parsing", 85, 27, AlignCenter, AlignTop); + popup_set_icon(instance->popup, 12, 23, &A_Loading_24); + view_dispatcher_switch_to_view(instance->view_dispatcher, NfcViewPopup); + FuriString* temp_str = furi_string_alloc(); if(nfc_supported_cards_parse(instance->nfc_supported_cards, instance->nfc_device, temp_str)) { widget_add_text_scroll_element( diff --git a/applications/main/nfc/nfc_app.c b/applications/main/nfc/nfc_app.c index cf8844c85..db09dde05 100644 --- a/applications/main/nfc/nfc_app.c +++ b/applications/main/nfc/nfc_app.c @@ -416,6 +416,11 @@ bool nfc_load_from_file_select(NfcApp* instance) { if(!dialog_file_browser_show( instance->dialogs, instance->file_path, instance->file_path, &browser_options)) break; + + nfc_show_loading_popup(instance, true); + nfc_supported_cards_load_cache(instance->nfc_supported_cards); + nfc_show_loading_popup(instance, false); + success = nfc_load_file(instance, instance->file_path, true); } while(!success); @@ -526,11 +531,6 @@ int32_t nfc_app(void* p) { } else { view_dispatcher_attach_to_gui( nfc->view_dispatcher, nfc->gui, ViewDispatcherTypeFullscreen); - // Load plugins (parsers) one time in case if we running app normally - nfc_show_loading_popup(nfc, true); - nfc_supported_cards_load_cache(nfc->nfc_supported_cards); - nfc_show_loading_popup(nfc, false); - // Switch to the initial scene scene_manager_next_scene(nfc->scene_manager, NfcSceneStart); } diff --git a/applications/main/nfc/scenes/nfc_scene_detect.c b/applications/main/nfc/scenes/nfc_scene_detect.c index 7ef3f9d87..a824c990d 100644 --- a/applications/main/nfc/scenes/nfc_scene_detect.c +++ b/applications/main/nfc/scenes/nfc_scene_detect.c @@ -16,6 +16,10 @@ void nfc_scene_detect_scan_callback(NfcScannerEvent event, void* context) { void nfc_scene_detect_on_enter(void* context) { NfcApp* instance = context; + nfc_show_loading_popup(instance, true); + nfc_supported_cards_load_cache(instance->nfc_supported_cards); + nfc_show_loading_popup(instance, false); + // Setup view popup_reset(instance->popup); popup_set_header(instance->popup, "Reading", 97, 15, AlignCenter, AlignTop);