Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 21:58:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'fork-ofw/nfc-plugin-cache-names' into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2024-07-05 17:52:59 +02:00
parent d7e595bcf7 1abd374aa1
commit 57f377af58
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -53,8 +53,8 @@
- NFC: - NFC:
- EMV Transactions menu less nested in UI, hide if data unavailable (by @Willy-JL) - EMV Transactions menu less nested in UI, hide if data unavailable (by @Willy-JL)
- Mention using MFKey app after Detect Reader (by @Willy-JL) - Mention using MFKey app after Detect Reader (by @Willy-JL)
- Cache plugin name not full path, saves some RAM (by @Willy-JL)
- UL: Better plugin loading, faster launch from favourites, no lag in Saved menu (by @xMasterX) - UL: Better plugin loading, faster launch from favourites, no lag in Saved menu (by @xMasterX)
- OFW: Cache plugin name not full path, saves some RAM (by @Willy-JL & @gornekich)
- OFW: Update link to mfkey32 (by @Astrrra) - OFW: Update link to mfkey32 (by @Astrrra)
- Sub-GHz: - Sub-GHz:
- Refactor Weather protocols in Sub-GHz app, shows only correct data (by @Willy-JL) - Refactor Weather protocols in Sub-GHz app, shows only correct data (by @Willy-JL)

31
applications/main/nfc/helpers/nfc_supported_cards.c
View File

@@ -41,7 +41,6 @@ typedef enum {
typedef struct { typedef struct {
Storage* storage; Storage* storage;
File* directory; File* directory;
FuriString* file_path;
char file_name[256]; char file_name[256];
FlipperApplication* app; FlipperApplication* app;
} NfcSupportedCardsLoadContext; } NfcSupportedCardsLoadContext;
@@ -86,7 +85,6 @@ static NfcSupportedCardsLoadContext* nfc_supported_cards_load_context_alloc(void
instance->storage = furi_record_open(RECORD_STORAGE); instance->storage = furi_record_open(RECORD_STORAGE);
instance->directory = storage_file_alloc(instance->storage); instance->directory = storage_file_alloc(instance->storage);
instance->file_path = furi_string_alloc();
if(!storage_dir_open(instance->directory, NFC_SUPPORTED_CARDS_PLUGINS_PATH)) { if(!storage_dir_open(instance->directory, NFC_SUPPORTED_CARDS_PLUGINS_PATH)) {
FURI_LOG_D(TAG, "Failed to open directory: %s", NFC_SUPPORTED_CARDS_PLUGINS_PATH); FURI_LOG_D(TAG, "Failed to open directory: %s", NFC_SUPPORTED_CARDS_PLUGINS_PATH);
@@ -100,8 +98,6 @@ static void nfc_supported_cards_load_context_free(NfcSupportedCardsLoadContext*
flipper_application_free(instance->app); flipper_application_free(instance->app);
} }
furi_string_free(instance->file_path);
storage_dir_close(instance->directory); storage_dir_close(instance->directory);
storage_file_free(instance->directory); storage_file_free(instance->directory);
@@ -117,15 +113,13 @@ static const NfcSupportedCardsPlugin* nfc_supported_cards_get_plugin(
furi_assert(name); furi_assert(name);
const NfcSupportedCardsPlugin* plugin = NULL; const NfcSupportedCardsPlugin* plugin = NULL;
FuriString* plugin_path = furi_string_alloc_printf(
"%s/%s%s", NFC_SUPPORTED_CARDS_PLUGINS_PATH, name, NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX);
do { do {
if(instance->app) flipper_application_free(instance->app); if(instance->app) flipper_application_free(instance->app);
instance->app = flipper_application_alloc(instance->storage, api_interface); instance->app = flipper_application_alloc(instance->storage, api_interface);
// Reconstruct path if(flipper_application_preload(instance->app, furi_string_get_cstr(plugin_path)) !=
path_concat(NFC_SUPPORTED_CARDS_PLUGINS_PATH, name, instance->file_path);
furi_string_cat(instance->file_path, NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX);
if(flipper_application_preload(instance->app, furi_string_get_cstr(instance->file_path)) !=
FlipperApplicationPreloadStatusSuccess) FlipperApplicationPreloadStatusSuccess)
break; break;
if(!flipper_application_is_plugin(instance->app)) break; if(!flipper_application_is_plugin(instance->app)) break;
@@ -141,6 +135,7 @@ static const NfcSupportedCardsPlugin* nfc_supported_cards_get_plugin(
plugin = descriptor->entry_point; plugin = descriptor->entry_point;
} while(false); } while(false);
furi_string_free(plugin_path);
return plugin; return plugin;
} }
@@ -156,13 +151,19 @@ static const NfcSupportedCardsPlugin* nfc_supported_cards_get_next_plugin(
instance->directory, NULL, instance->file_name, sizeof(instance->file_name))) instance->directory, NULL, instance->file_name, sizeof(instance->file_name)))
break; break;
furi_string_set(instance->file_path, instance->file_name); size_t suffix_len = strlen(NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX);
if(!furi_string_end_with_str(instance->file_path, NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX)) size_t file_name_len = strlen(instance->file_name);
continue; if(file_name_len <= suffix_len) break;
size_t trim_suffix = size_t suffix_start_pos = file_name_len - suffix_len;
furi_string_size(instance->file_path) - strlen(NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX); if(memcmp(
instance->file_name[trim_suffix] = '\0'; &instance->file_name[suffix_start_pos],
NFC_SUPPORTED_CARDS_PLUGIN_SUFFIX,
suffix_len) != 0)
break;
// Trim suffix from file_name to save memory. The suffix will be concatenated on plugin load.
instance->file_name[suffix_start_pos] = '\0';
plugin = nfc_supported_cards_get_plugin(instance, instance->file_name, api_interface); plugin = nfc_supported_cards_get_plugin(instance, instance->file_name, api_interface);
} while(plugin == NULL); //-V654 } while(plugin == NULL); //-V654