Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 23, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdfe7ad
nfc app: fix changing uid on each byte change
gornekich May 23, 2024
63d9741
nfc app: remove unused code
gornekich May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions applications/main/nfc/scenes/nfc_scene_set_uid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,20 @@

#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) {
NfcApp* instance = context;

size_t uid_len;
const uint8_t* uid = nfc_device_get_uid(instance->nfc_device, &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
ByteInput* byte_input = instance->byte_input;
byte_input_set_header_text(byte_input, "Enter UID in hex");
byte_input_set_result_callback(
byte_input,
nfc_protocol_support_common_byte_input_done_callback,
nfc_scene_set_uid_byte_input_changed_callback,
NULL,
instance,
instance->byte_input_store,
uid_len);
Expand All @@ -39,6 +29,9 @@ bool nfc_scene_set_uid_on_event(void* context, SceneManagerEvent event) {

if(event.type == SceneManagerEventTypeCustom) {
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(nfc_save(instance)) {
scene_manager_next_scene(instance->scene_manager, NfcSceneSaveSuccess);
Expand Down
Loading