Merge remote-tracking branch 'RebornedBrain/reborned/open_from_browser' into nfc_refactors_fixes_merge

applications/main/nfc/helpers/protocol_support/nfc_protocol_support.c

@@ -74,7 +74,7 @@ void nfc_protocol_support_on_exit(NfcProtocolSupportScene scene, void* context)
     nfc_protocol_support_scenes[scene].on_exit(instance);
 }
 
-static bool nfc_protocol_support_has_feature(NfcProtocol protocol, NfcProtocolFeature feature) {
+bool nfc_protocol_support_has_feature(NfcProtocol protocol, NfcProtocolFeature feature) {
     return nfc_protocol_support[protocol]->features & feature;
 }
 

applications/main/nfc/helpers/protocol_support/nfc_protocol_support.h

@@ -76,6 +76,7 @@
 #pragma once
 
 #include <gui/scene_manager.h>
+#include <lib/nfc/protocols/nfc_protocol.h>
 
 #include "nfc_protocol_support_common.h"
 
@@ -111,3 +112,5 @@ bool nfc_protocol_support_on_event(
  * @param[in,out] context pointer to a user-specified context (will be passed to concrete handler).
  */
 void nfc_protocol_support_on_exit(NfcProtocolSupportScene scene, void* context);
+
+bool nfc_protocol_support_has_feature(NfcProtocol protocol, NfcProtocolFeature feature);

applications/main/nfc/nfc_app.c

@@ -1,4 +1,5 @@
 #include "nfc_app_i.h"
+#include "helpers/protocol_support/nfc_protocol_support.h"
 
 #include <dolphin/dolphin.h>
 
@@ -475,6 +476,15 @@ static bool nfc_is_hal_ready() {
     }
 }
 
+static void nfc_show_initial_scene_for_device(NfcApp* nfc) {
+    NfcProtocol prot = nfc_device_get_protocol(nfc->nfc_device);
+    uint32_t scene = nfc_protocol_support_has_feature(
+                         prot, NfcProtocolFeatureEmulateFull | NfcProtocolFeatureEmulateUid) ?
+                         NfcSceneEmulate :
+                         NfcSceneSavedMenu;
+    scene_manager_next_scene(nfc->scene_manager, scene);
+}
+
 int32_t nfc_app(void* p) {
     if(!nfc_is_hal_ready()) return 0;
 
@@ -494,7 +504,7 @@ int32_t nfc_app(void* p) {
 
             furi_string_set(nfc->file_path, args);
             if(nfc_load_file(nfc, nfc->file_path, false)) {
-                scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulate);
+                nfc_show_initial_scene_for_device(nfc);
             } else {
                 view_dispatcher_stop(nfc->view_dispatcher);
             }