forked from DarkFlippers/unleashed-firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FL-2701], [FL-2702], [FL-2699] NFC fixes (#1478)
* nfc: change read scene views * nfc: rework return after save success * nfc: add fallback to read UID of unrecognized iso14443-3 * nfc: show mifare desfire on read success * nfc: add restore original confirm scene * nfc: fix icon name * nfc: clear 6 bit in SAK to emulate 14443-4 uids * nfc: don't change original sak
- Loading branch information
Showing
11 changed files
with
98 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
applications/nfc/scenes/nfc_scene_restore_original_confirm.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#include "../nfc_i.h" | ||
|
||
void nfc_scene_restore_original_confirm_dialog_callback(DialogExResult result, void* context) { | ||
Nfc* nfc = context; | ||
|
||
view_dispatcher_send_custom_event(nfc->view_dispatcher, result); | ||
} | ||
|
||
void nfc_scene_restore_original_confirm_on_enter(void* context) { | ||
Nfc* nfc = context; | ||
DialogEx* dialog_ex = nfc->dialog_ex; | ||
|
||
dialog_ex_set_header(dialog_ex, "Restore card data?", 64, 0, AlignCenter, AlignTop); | ||
dialog_ex_set_icon(dialog_ex, 5, 15, &I_Restoring); | ||
dialog_ex_set_text( | ||
dialog_ex, "It will be returned\nto its original state.", 47, 21, AlignLeft, AlignTop); | ||
dialog_ex_set_left_button_text(dialog_ex, "Cancel"); | ||
dialog_ex_set_right_button_text(dialog_ex, "Restore"); | ||
dialog_ex_set_context(dialog_ex, nfc); | ||
dialog_ex_set_result_callback(dialog_ex, nfc_scene_restore_original_confirm_dialog_callback); | ||
|
||
view_dispatcher_switch_to_view(nfc->view_dispatcher, NfcViewDialogEx); | ||
} | ||
|
||
bool nfc_scene_restore_original_confirm_on_event(void* context, SceneManagerEvent event) { | ||
Nfc* nfc = context; | ||
bool consumed = false; | ||
|
||
if(event.type == SceneManagerEventTypeCustom) { | ||
if(event.event == DialogExResultRight) { | ||
if(!nfc_device_restore(nfc->dev, true)) { | ||
scene_manager_search_and_switch_to_previous_scene( | ||
nfc->scene_manager, NfcSceneStart); | ||
} else { | ||
scene_manager_next_scene(nfc->scene_manager, NfcSceneRestoreOriginal); | ||
} | ||
consumed = true; | ||
} else if(event.event == DialogExResultLeft) { | ||
consumed = scene_manager_previous_scene(nfc->scene_manager); | ||
} | ||
} else if(event.type == SceneManagerEventTypeBack) { | ||
consumed = true; | ||
} | ||
|
||
return consumed; | ||
} | ||
|
||
void nfc_scene_restore_original_confirm_on_exit(void* context) { | ||
Nfc* nfc = context; | ||
|
||
// Clean view | ||
dialog_ex_reset(nfc->dialog_ex); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters