From 5a2719663fc8a63c3a610df7ea949572dde884e0 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:55:26 +0300 Subject: [PATCH] fix archive, update changelog --- CHANGELOG.md | 8 +++++++- applications/main/archive/helpers/archive_menu.h | 5 +++-- .../main/archive/views/archive_browser_view.c | 16 +++++----------- assets/resources/subghz/assets/setting_user | 1 + 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87937e80b..0d686c89b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ### New changes -* Plugins: RFID Fuzzer - ability to change time delay (between cards), useful for slow readers, you can adjust it on the go +* Add 312.2 MHz to subghz user config +* PR: Add CAME 12bit 303MHz to SubGHz Bruteforcer (by @derskythe | PR #87) +* Adapted all plugins and other code to new FuriString, fixed archive menu issues with new string type +* SubGHz: proper free of rainbow tables +* OFW: M*LIB: non-inlined strings, FuriString primitive +* OFW PR: Remove string_push_uint64 (OFW PR 1832 by Astrrra) +* OFW PR: updated icon names (OFW PR 1829 by nminaylov) #### [🎲 Download extra apps pack](https://download-directory.github.io/?url=https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed) diff --git a/applications/main/archive/helpers/archive_menu.h b/applications/main/archive/helpers/archive_menu.h index 47b8baa61..4a85b851d 100644 --- a/applications/main/archive/helpers/archive_menu.h +++ b/applications/main/archive/helpers/archive_menu.h @@ -1,5 +1,6 @@ #pragma once +#include #include typedef struct { @@ -22,7 +23,7 @@ static void ArchiveContextMenuItem_t_init_set( static void ArchiveContextMenuItem_t_set( ArchiveContextMenuItem_t* obj, const ArchiveContextMenuItem_t* src) { - obj->text = furi_string_alloc_set(src->text); + furi_string_set(obj->text, src->text); obj->event = src->event; } @@ -43,7 +44,7 @@ ARRAY_DEF( // Using in applications/archive/views/archive_browser_view.c static void archive_menu_add_item(ArchiveContextMenuItem_t* obj, FuriString* text, uint32_t event) { - obj->text = furi_string_alloc_move(text); + obj->text = furi_string_alloc_set(text); obj->event = event; } #pragma GCC diagnostic pop \ No newline at end of file diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c index 024d167ea..071163afe 100644 --- a/applications/main/archive/views/archive_browser_view.c +++ b/applications/main/archive/views/archive_browser_view.c @@ -48,17 +48,11 @@ void archive_browser_set_callback( static void render_item_menu(Canvas* canvas, ArchiveBrowserViewModel* model) { if(menu_array_size(model->context_menu) == 0) { // Context menu is empty, init array - FuriString* item_run; - FuriString* item_pin; - FuriString* item_info; - FuriString* item_rename; - FuriString* item_delete; - - item_run = furi_string_alloc_set("Run In App"); - item_pin = furi_string_alloc_set("Pin"); - item_info = furi_string_alloc_set("Info"); - item_rename = furi_string_alloc_set("Rename"); - item_delete = furi_string_alloc_set("Delete"); + FuriString* item_run = furi_string_alloc_set("Run In App"); + FuriString* item_pin = furi_string_alloc_set("Pin"); + FuriString* item_info = furi_string_alloc_set("Info"); + FuriString* item_rename = furi_string_alloc_set("Rename"); + FuriString* item_delete = furi_string_alloc_set("Delete"); // Need init context menu ArchiveFile_t* selected = diff --git a/assets/resources/subghz/assets/setting_user b/assets/resources/subghz/assets/setting_user index 67174e5f2..e9058a3df 100644 --- a/assets/resources/subghz/assets/setting_user +++ b/assets/resources/subghz/assets/setting_user @@ -19,6 +19,7 @@ Frequency: 309000000 Frequency: 310000000 Frequency: 312000000 Frequency: 312100000 +Frequency: 312200000 Frequency: 313000000 Frequency: 313850000 Frequency: 314000000