[FL-3667] NFC Magic fix gen4 detection

nfc_magic/.catalog/changelog.md

@@ -1,3 +1,6 @@
+## 1.3
+ - Fix incorrect gen4 password usage
+
 ## 1.2
  - Minimal changes for recent API updates
 

nfc_magic/application.fam

@@ -10,7 +10,7 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="Application for writing to NFC tags with modifiable sector 0",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_icon="assets/125_10px.png",
     fap_category="NFC",
     fap_private_libs=[

nfc_magic/lib/magic/protocols/gen4/gen4_poller.c

@@ -194,6 +194,7 @@ NfcCommand gen4_poller_wipe_handler(Gen4Poller* instance) {
                 instance->state = Gen4PollerStateFail;
                 break;
             }
+            instance->password = 0;
             error = gen4_poller_write_block(
                 instance, instance->password, instance->current_block, gen4_poller_default_block_0);
             if(error != Gen4PollerErrorNone) {

nfc_magic/nfc_magic_app.c

@@ -23,6 +23,7 @@ void nfc_magic_app_tick_event_callback(void* context) {
 
 void nfc_magic_app_show_loading_popup(void* context, bool show) {
     NfcMagicApp* instance = context;
+
     if(show) {
         // Raise timer priority so that animations can play
         furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);

nfc_magic/scenes/nfc_magic_scene_change_key.c

@@ -59,6 +59,7 @@ void nfc_magic_scene_change_key_on_enter(void* context) {
     nfc_magic_app_blink_start(instance);
 
     instance->gen4_poller = gen4_poller_alloc(instance->nfc);
+    gen4_poller_set_password(instance->gen4_poller, instance->gen4_password);
     gen4_poller_start(
         instance->gen4_poller, nfc_mafic_scene_change_key_gen4_poller_callback, instance);
 }
@@ -83,6 +84,7 @@ bool nfc_magic_scene_change_key_on_event(void* context, SceneManagerEvent event)
             nfc_magic_scene_change_key_setup_view(instance);
             consumed = true;
         } else if(event.event == NfcMagicCustomEventWorkerSuccess) {
+            instance->gen4_password = instance->gen4_password_new;
             scene_manager_next_scene(instance->scene_manager, NfcMagicSceneSuccess);
             consumed = true;
         } else if(event.event == NfcMagicCustomEventWorkerFail) {

nfc_magic/scenes/nfc_magic_scene_check.c

@@ -24,6 +24,7 @@ void nfc_magic_scene_check_on_enter(void* context) {
     nfc_magic_app_blink_start(instance);
 
     nfc_magic_scanner_start(instance->scanner, nfc_magic_check_worker_callback, instance);
+    nfc_magic_scanner_set_gen4_password(instance->scanner, instance->gen4_password);
 
     view_dispatcher_switch_to_view(instance->view_dispatcher, NfcMagicAppViewPopup);
 }

nfc_magic/scenes/nfc_magic_scene_write.c

@@ -93,6 +93,7 @@ void nfc_magic_scene_write_on_enter(void* context) {
             instance->gen1a_poller, nfc_mafic_scene_write_gen1_poller_callback, instance);
     } else {
         instance->gen4_poller = gen4_poller_alloc(instance->nfc);
+        gen4_poller_set_password(instance->gen4_poller, instance->gen4_password);
         gen4_poller_start(
             instance->gen4_poller, nfc_mafic_scene_write_gen4_poller_callback, instance);
     }