Squashed 'applications/external/' changes from f232070e064..1fb63f0d97c

1fb63f0d97c SubGHz Playlist: Fix crash with region lock
ae55aa3176b SubGHz Playlist: Show item play fail, some UI fixes
a442bf147c6 Ethernet: Same appid for compatibility
f245471ff7a Quac!: Fix SubGHz protocols and crash (#11)
3cad714758c IFTTT: Fix memleaks and wrong free's (#10)
8706bacad2f Remove redundant extra API
7b65d07fbab Merge pokemon_trading from https://github.com/EstebanFuentealba/Flipper-Zero-Game-Boy-Pokemon-Trading
47eb81ffd3f Merge magspoof from https://github.com/zacharyweiss/magspoof_flipper
282237f Merge pull request #24 from kbembedded/main
16a33e8 application.fam: Update for 2.0
a76f760 Update dependabot.yml
719d3d1 Create dependabot.yml
333894f images: update images used in app catalog
8dd4699 README_catalog: update app catalog README with latest
1f86352 README: update with latest features
678bfdd changelog: update with 2.0 changes
833f02e pokemon_pins: note MALVEKE pinout as <= rev 2.5
22ce90b pokemon_data: update for new sprite sizes
a32c6f1 sprites: custom sprites
9c62035 sprites: add custom sprites
1c88c1a trade: turn on backlight with each byte received over EXT
9359890 trade: do dolphin deed after a completed trade
7e5b99c assets: add surprised pika for exit conf
d2c52ab gblink: bump to v0.61
33d56d9 gitignore: ignore dist/ folder
691746f README/es: Fix typo
2d12faf pokemon_data: remove MALVEKE check
a982886 patch_list: Add party_sz to main pokemon data struct
e0581ec pokemon: support gen ii trades
57dac60 char_encode: add hyphen character support

git-subtree-dir: applications/external
git-subtree-split: 1fb63f0d97cce732d8dadf869d1ee89aa32efcf0

ethernet/application.fam

@@ -1,5 +1,5 @@
 App(
-    appid="ethernet",
+    appid="finik_eth",
     name="[W5500] Ethernet",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="finik_eth_app",
@@ -14,7 +14,6 @@ App(
     fap_version="1.0",
     fap_category="GPIO/Debug",
     fap_icon_assets="images",
-    fap_icon_assets_symbol="finik_eth",
     fap_private_libs=[
         Lib(
             cflags=[

ifttt/ifttt_virtual_button.c

@@ -36,9 +36,7 @@ void save_settings_file(FlipperFormat* file, Settings* settings) {
     flipper_format_write_string_cstr(file, CONF_EVENT, settings->save_event);
 }
 
-Settings* load_settings() {
-    Settings* settings = malloc(sizeof(Settings));
-
+Settings* load_settings(Settings* settings) {
     settings->save_ssid = "";
     settings->save_password = "";
     settings->save_key = "";
@@ -63,26 +61,28 @@ Settings* load_settings() {
             uint32_t value;
             if(flipper_format_read_header(file, string_value, &value)) {
                 if(flipper_format_read_string(file, CONF_SSID, text_ssid_value)) {
-                    settings->save_ssid = malloc(furi_string_size(text_ssid_value) + 1);
-                    strcpy(settings->save_ssid, furi_string_get_cstr(text_ssid_value));
+                    settings->save_ssid = (char*)furi_string_get_cstr(text_ssid_value);
                 }
                 if(flipper_format_read_string(file, CONF_PASSWORD, text_password_value)) {
-                    settings->save_password = malloc(furi_string_size(text_password_value) + 1);
-                    strcpy(settings->save_password, furi_string_get_cstr(text_password_value));
+                    settings->save_password = (char*)furi_string_get_cstr(text_password_value);
                 }
                 if(flipper_format_read_string(file, CONF_KEY, text_key_value)) {
-                    settings->save_key = malloc(furi_string_size(text_key_value) + 1);
-                    strcpy(settings->save_key, furi_string_get_cstr(text_key_value));
+                    settings->save_key = (char*)furi_string_get_cstr(text_key_value);
                 }
                 if(flipper_format_read_string(file, CONF_EVENT, text_event_value)) {
-                    settings->save_event = malloc(furi_string_size(text_event_value) + 1);
-                    strcpy(settings->save_event, furi_string_get_cstr(text_event_value));
+                    settings->save_event = (char*)furi_string_get_cstr(text_event_value);
                 }
             }
             flipper_format_file_close(file);
         }
     }
 
+    // We assigned some constant / internal buffer of furi string, so duplicate it and free at exit
+    settings->save_ssid = strdup(settings->save_ssid);
+    settings->save_password = strdup(settings->save_password);
+    settings->save_key = strdup(settings->save_key);
+    settings->save_event = strdup(settings->save_event);
+
     furi_string_free(text_ssid_value);
     furi_string_free(text_password_value);
     furi_string_free(text_key_value);
@@ -203,6 +203,7 @@ void ifttt_virtual_button_app_free(VirtualButtonApp* app) {
     free(app->settings.save_ssid);
     free(app->settings.save_password);
     free(app->settings.save_key);
+    free(app->settings.save_event);
 
     // Views
     view_dispatcher_remove_view(app->view_dispatcher, VirtualButtonAppViewSendView);
@@ -242,7 +243,7 @@ int32_t ifttt_virtual_button_app(void* p) {
 
     uint32_t first_scene = VirtualButtonAppSceneStart;
     VirtualButtonApp* app = ifttt_virtual_button_app_alloc(first_scene);
-    memcpy(&app->settings, load_settings(), sizeof(Settings));
+    load_settings(&app->settings);
     send_serial_command_config(app->serial_handle, ESerialCommand_Config, &(app->settings));
 
     view_dispatcher_run(app->view_dispatcher);

magspoof/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    assignees:
+      - "zacharyweiss"

nfc_maker/scenes/nfc_maker_scene_save_name.c

@@ -17,7 +17,13 @@ void nfc_maker_scene_save_name_on_enter(void* context) {
     text_input_set_header_text(text_input, "Save the NFC tag:");
 
     FuriString* prefix = furi_string_alloc();
-    nfc_device_get_abbreviated_name(app->nfc_device, prefix);
+    furi_string_set(prefix, nfc_device_get_name(app->nfc_device, NfcDeviceNameTypeFull));
+    furi_string_replace(prefix, "Mifare", "MF");
+    furi_string_replace(prefix, " Classic", "C"); // MFC
+    furi_string_replace(prefix, "Desfire", "Des"); // MF Des
+    furi_string_replace(prefix, "Ultralight", "UL"); // MF UL
+    furi_string_replace(prefix, " Plus", "+"); // NTAG I2C+
+    furi_string_replace(prefix, " (Unknown)", "");
     furi_string_replace_all(prefix, " ", "_");
     name_generator_make_auto(app->save_buf, BIG_INPUT_LEN, furi_string_get_cstr(prefix));
     furi_string_free(prefix);

pokemon_trading/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .vscode
+dist/