Merge pull request #396 from ESurge/420

Bad USB as FAP

applications/main/application.fam

@@ -11,7 +11,8 @@ App(
         "lfrfid",
         "nfc",
         "subghz",
-        "bad_usb",
+        #"bad_usb",
+        "bad_usb_loader",
         # "u2f",
         "u2f_loader",
         "fap_loader",

applications/main/archive/scenes/archive_scene_browser.c

@@ -63,6 +63,14 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec
             char* result =
                 malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
 
+            strcpy(result, tmpType);
+            strcat(result, furi_string_get_cstr(selected->path));
+            status = loader_start(loader, "Applications", result);
+        } else if(strcmp(flipper_app_name[selected->type], "Bad USB") == 0) {
+            char* tmpType = "/ext/apps/Main/bad_usb.fap¯";
+            char* result =
+                malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
+
             strcpy(result, tmpType);
             strcat(result, furi_string_get_cstr(selected->path));
             status = loader_start(loader, "Applications", result);

applications/main/bad_usb/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="bad_usb",
     name="Bad USB",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="bad_usb_app",
     cdefines=["APP_BAD_USB"],
     requires=[
@@ -11,4 +11,7 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    fap_category="Main",
+    fap_icon="badusb_10px.png",
+    fap_icon_assets="images",
 )

applications/main/bad_usb_loader/application.fam

@@ -0,0 +1,14 @@
+App(
+    appid="bad_usb_loader",
+    name="Bad USB",
+    apptype=FlipperAppType.APP,
+    entry_point="bad_usb_loader_app",
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=int(2 * 1024),
+    icon="A_BadUsb_14",
+    order=80,
+	link="/ext/apps/Main/bad_usb.fap",
+)

applications/main/bad_usb_loader/bad_usb_loader_app.c

@@ -0,0 +1,9 @@
+#include <applications/services/loader/loader_i.h>
+
+#define TAG "bad_usb_loader_app"
+
+int32_t bad_usb_loader_app(void* p) {
+    UNUSED(p);
+
+    return 0;
+}