1
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-13 13:09:49 +04:00

NFC app: MF Custom UID, fix SAK & ATQA save

This commit is contained in:
gid9798
2023-08-14 15:33:03 +03:00
parent 7bd8846288
commit f18df25a96
2 changed files with 3 additions and 2 deletions

View File

@@ -58,7 +58,8 @@ bool nfc_scene_save_name_on_event(void* context, SceneManagerEvent event) {
if(strcmp(nfc->dev->dev_name, "") != 0) { if(strcmp(nfc->dev->dev_name, "") != 0) {
nfc_device_delete(nfc->dev, true); nfc_device_delete(nfc->dev, true);
} }
if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetUid)) { if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetUid) &&
(!scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetTypeMfUid))) {
nfc->dev->dev_data.nfc_data = nfc->dev_edit_data; nfc->dev->dev_data.nfc_data = nfc->dev_edit_data;
} }
strlcpy(nfc->dev->dev_name, nfc->text_store, strlen(nfc->text_store) + 1); strlcpy(nfc->dev->dev_name, nfc->text_store, strlen(nfc->text_store) + 1);

View File

@@ -57,7 +57,7 @@ bool nfc_scene_set_type_on_event(void* context, SceneManagerEvent event) {
scene_manager_next_scene(nfc->scene_manager, NfcSceneSetSak); scene_manager_next_scene(nfc->scene_manager, NfcSceneSetSak);
consumed = true; consumed = true;
} else if(event.event == SubmenuIndexMFClassicCustomUID) { } else if(event.event == SubmenuIndexMFClassicCustomUID) {
nfc->dev->format = NfcDeviceSaveFormatMifareClassic; nfc_device_clear(nfc->dev);
scene_manager_next_scene(nfc->scene_manager, NfcSceneSetTypeMfUid); scene_manager_next_scene(nfc->scene_manager, NfcSceneSetTypeMfUid);
consumed = true; consumed = true;
} else { } else {