mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 12:42:30 +04:00
Code Issues Activity

[FL-3829] NFC App: fix changing UID (#3663)

Browse Source 
* nfc app: fix changing uid on each byte change
* nfc app: remove unused code
This commit is contained in:
gornekich
2024-05-23 13:46:00 +01:00
committed by GitHub
parent 807bec14b1
commit ab2fcaf4ab
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/main/nfc/scenes/nfc_scene_set_uid.c
View File

@@ -2,22 +2,12 @@
#include "../helpers/protocol_support/nfc_protocol_support_gui_common.h" #include "../helpers/protocol_support/nfc_protocol_support_gui_common.h"
static void nfc_scene_set_uid_byte_input_changed_callback(void* context) {
NfcApp* instance = context;
// Retrieve previously saved UID length
const size_t uid_len = scene_manager_get_scene_state(instance->scene_manager, NfcSceneSetUid);
nfc_device_set_uid(instance->nfc_device, instance->byte_input_store, uid_len);
}
void nfc_scene_set_uid_on_enter(void* context) { void nfc_scene_set_uid_on_enter(void* context) {
NfcApp* instance = context; NfcApp* instance = context;
size_t uid_len; size_t uid_len;
const uint8_t* uid = nfc_device_get_uid(instance->nfc_device, &uid_len); const uint8_t* uid = nfc_device_get_uid(instance->nfc_device, &uid_len);
memcpy(instance->byte_input_store, uid, uid_len); memcpy(instance->byte_input_store, uid, uid_len);
// Save UID length for use in callback
scene_manager_set_scene_state(instance->scene_manager, NfcSceneSetUid, uid_len);
// Setup view // Setup view
ByteInput* byte_input = instance->byte_input; ByteInput* byte_input = instance->byte_input;
@@ -25,7 +15,7 @@ void nfc_scene_set_uid_on_enter(void* context) {
byte_input_set_result_callback( byte_input_set_result_callback(
byte_input, byte_input,
nfc_protocol_support_common_byte_input_done_callback, nfc_protocol_support_common_byte_input_done_callback,
nfc_scene_set_uid_byte_input_changed_callback, NULL,
instance, instance,
instance->byte_input_store, instance->byte_input_store,
uid_len); uid_len);
@@ -39,6 +29,9 @@ bool nfc_scene_set_uid_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
if(event.event == NfcCustomEventByteInputDone) { if(event.event == NfcCustomEventByteInputDone) {
size_t uid_len = 0;
nfc_device_get_uid(instance->nfc_device, &uid_len);
nfc_device_set_uid(instance->nfc_device, instance->byte_input_store, uid_len);
if(scene_manager_has_previous_scene(instance->scene_manager, NfcSceneSavedMenu)) { if(scene_manager_has_previous_scene(instance->scene_manager, NfcSceneSavedMenu)) {
if(nfc_save(instance)) { if(nfc_save(instance)) {
scene_manager_next_scene(instance->scene_manager, NfcSceneSaveSuccess); scene_manager_next_scene(instance->scene_manager, NfcSceneSaveSuccess);