diff --git a/applications/ibutton/ibutton.c b/applications/ibutton/ibutton.c index b1b5bf62f..8713919b5 100644 --- a/applications/ibutton/ibutton.c +++ b/applications/ibutton/ibutton.c @@ -211,11 +211,12 @@ bool ibutton_save_key(iButton* ibutton, const char* key_name) { bool result = false; do { - // First remove key if it was saved (we rename the key) - ibutton_delete_key(ibutton); - - // Set full file name, for new key + // Check if we has old key if(string_end_with_str_p(ibutton->file_path, IBUTTON_APP_EXTENSION)) { + // First remove old key + ibutton_delete_key(ibutton); + + // Remove old key name from path size_t filename_start = string_search_rchar(ibutton->file_path, '/'); string_left(ibutton->file_path, filename_start); } diff --git a/applications/lfrfid/scene/lfrfid_app_scene_read_success.cpp b/applications/lfrfid/scene/lfrfid_app_scene_read_success.cpp index fd6f46a09..010cac2cf 100644 --- a/applications/lfrfid/scene/lfrfid_app_scene_read_success.cpp +++ b/applications/lfrfid/scene/lfrfid_app_scene_read_success.cpp @@ -81,7 +81,7 @@ void LfRfidAppSceneReadSuccess::on_enter(LfRfidApp* app, bool /* need_restore */ case LfrfidKeyType::KeyIoProxXSF: line_1_text->set_text("HEX:", 65, 23, 0, AlignRight, AlignBottom, FontSecondary); line_2l_text->set_text("FC:", 65, 35, 0, AlignRight, AlignBottom, FontSecondary); - line_2r_text->set_text("V:", 95, 35, 0, AlignRight, AlignBottom, FontSecondary); + line_2r_text->set_text("VС:", 95, 35, 0, AlignRight, AlignBottom, FontSecondary); line_3_text->set_text("Card:", 65, 47, 0, AlignRight, AlignBottom, FontSecondary); for(uint8_t i = 0; i < app->worker.key.get_type_data_count(); i++) { diff --git a/applications/lfrfid/scene/lfrfid_app_scene_save_data.cpp b/applications/lfrfid/scene/lfrfid_app_scene_save_data.cpp index b36ff7e37..3a13e6838 100644 --- a/applications/lfrfid/scene/lfrfid_app_scene_save_data.cpp +++ b/applications/lfrfid/scene/lfrfid_app_scene_save_data.cpp @@ -1,23 +1,10 @@ #include "lfrfid_app_scene_save_data.h" #include -static void print_buffer(const uint8_t* buffer) { - for(uint8_t i = 0; i < LFRFID_KEY_SIZE; i++) { - printf("%02X", buffer[i]); - } -} - void LfRfidAppSceneSaveData::on_enter(LfRfidApp* app, bool need_restore) { auto byte_input = app->view_controller.get(); RfidKey& key = app->worker.key; - printf("k: "); - print_buffer(key.get_data()); - printf(" o: "); - print_buffer(old_key_data); - printf(" n: "); - print_buffer(new_key_data); - printf("\r\n"); if(need_restore) printf("restored\r\n"); if(need_restore) {