Merge branch 'ofw_dev' into dev

Flipper-XFW · Mar 5, 2024 · 4e7f25a · 4e7f25a
2 parents 88b354b + 5e47048
commit 4e7f25a
Show file tree

Hide file tree

Showing 9 changed files with 1,779 additions and 1,013 deletions.
diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
@@ -246,6 +246,7 @@ bool archive_scene_browser_on_event(void* context, SceneManagerEvent event) {
             break;
         case ArchiveBrowserEventFileMenuDelete:
             if(archive_get_tab(browser) != ArchiveTabFavorites) {
+                archive_show_file_menu(browser, false);
                 scene_manager_set_scene_state(
                     archive->scene_manager, ArchiveAppSceneBrowser, SCENE_STATE_NEED_REFRESH);
                 scene_manager_next_scene(archive->scene_manager, ArchiveAppSceneDelete);

diff --git a/applications/main/archive/scenes/archive_scene_delete.c b/applications/main/archive/scenes/archive_scene_delete.c
@@ -26,6 +26,12 @@ void archive_scene_delete_on_enter(void* context) {
     filename = furi_string_alloc();
 
     ArchiveFile_t* current = archive_get_current_file(app->browser);
+
+    FuriString* filename_no_ext = furi_string_alloc();
+    path_extract_filename(current->path, filename_no_ext, true);
+    strlcpy(app->text_store, furi_string_get_cstr(filename_no_ext), MAX_NAME_LEN);
+    furi_string_free(filename_no_ext);
+
     path_extract_filename(current->path, filename, false);
 
     char delete_str[64];

diff --git a/applications/main/nfc/api/mosgortrans/mosgortrans_util.c b/applications/main/nfc/api/mosgortrans/mosgortrans_util.c
diff --git a/applications/main/nfc/api/mosgortrans/mosgortrans_util.h b/applications/main/nfc/api/mosgortrans/mosgortrans_util.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <bit_lib.h>
+#include <datetime.h>
+#include <furi/core/string.h>
+#include <nfc/protocols/mf_classic/mf_classic.h>
+#include <furi_hal_rtc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool mosgortrans_parse_transport_block(const MfClassicBlock* block, FuriString* result);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/applications/main/nfc/api/nfc_app_api_table_i.h b/applications/main/nfc/api/nfc_app_api_table_i.h
@@ -1,4 +1,5 @@
 #include "gallagher/gallagher_util.h"
+#include "mosgortrans/mosgortrans_util.h"
 
 /* 
  * A list of app's private functions and objects to expose for plugins.
@@ -10,4 +11,8 @@ static constexpr auto nfc_app_api_table = sort(create_array_t<sym_entry>(
         gallagher_deobfuscate_and_parse_credential,
         void,
         (GallagherCredential * credential, const uint8_t* cardholder_data_obfuscated)),
-    API_VARIABLE(GALLAGHER_CARDAX_ASCII, const uint8_t*)));
+    API_VARIABLE(GALLAGHER_CARDAX_ASCII, const uint8_t*),
+    API_METHOD(
+        mosgortrans_parse_transport_block,
+        bool,
+        (const MfClassicBlock* block, FuriString* result))));
diff --git a/applications/main/nfc/application.fam b/applications/main/nfc/application.fam
@@ -146,6 +146,15 @@ App(
     sources=["plugins/supported_cards/aime.c"],
 )
 
+App(
+    appid="bip_parser",
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="bip_plugin_ep",
+    targets=["f7"],
+    requires=["nfc"],
+    sources=["plugins/supported_cards/bip.c"],
+)
+
 App(
     appid="saflok_parser",
     apptype=FlipperAppType.PLUGIN,