diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f710da29..26de6e5a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ ### New changes -* OFW PR: keeloq, new option for gen manufacture code & Update keeloq_mfcodes (KGB, Teco) (OFW PR 1748 by Skorpionm) -* FAAC, BFT keys not removed, new keeloq type changed to 6, FAAC is 5 -* Some minor gui fix in nfc +* OFW: Fixed NFC Mifare classic dict attack uses wrong keys (OFW PR 1769) +* Infrared: removed duplicate function, moved reset to scene exit #### **DFU files no longer included in releases to avoid issues with wrong manual installation of assets - use .tgz file with qFlipper, or install automatically via web updater or use microSD update package** diff --git a/applications/main/infrared/infrared_brute_force.c b/applications/main/infrared/infrared_brute_force.c index ace59cfed..89272de7e 100644 --- a/applications/main/infrared/infrared_brute_force.c +++ b/applications/main/infrared/infrared_brute_force.c @@ -157,7 +157,3 @@ void infrared_brute_force_add_record( InfraredBruteForceRecordDict_set_at(brute_force->records, key, value); string_clear(key); } - -void infrared_brute_force_reset(InfraredBruteForce* brute_force) { - InfraredBruteForceRecordDict_reset(brute_force->records); -} diff --git a/applications/main/infrared/infrared_brute_force.h b/applications/main/infrared/infrared_brute_force.h index de41a8631..fff472e79 100644 --- a/applications/main/infrared/infrared_brute_force.h +++ b/applications/main/infrared/infrared_brute_force.h @@ -21,4 +21,3 @@ void infrared_brute_force_add_record( InfraredBruteForce* brute_force, uint32_t index, const char* name); -void infrared_brute_force_reset(InfraredBruteForce* brute_force); diff --git a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c index 539a25816..86f3260fd 100644 --- a/applications/main/infrared/scenes/common/infrared_scene_universal_common.c +++ b/applications/main/infrared/scenes/common/infrared_scene_universal_common.c @@ -33,8 +33,6 @@ static void infrared_scene_universal_common_hide_popup(Infrared* infrared) { void infrared_scene_universal_common_on_enter(void* context) { Infrared* infrared = context; - infrared_brute_force_clear_records(infrared->brute_force); - button_panel_reset_selection(infrared->button_panel); view_stack_add_view(infrared->view_stack, button_panel_get_view(infrared->button_panel)); } @@ -89,6 +87,6 @@ void infrared_scene_universal_common_on_exit(void* context) { Infrared* infrared = context; ButtonPanel* button_panel = infrared->button_panel; view_stack_remove_view(infrared->view_stack, button_panel_get_view(button_panel)); - infrared_brute_force_reset(infrared->brute_force); + infrared_brute_force_clear_records(infrared->brute_force); button_panel_reset(button_panel); }