Merge mayhem_marauder from https://github.com/eried/flipperzero-mayhem

mayhem_marauder/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="mayhem_marauder",
     name="[MAYHEM] Marauder",
-    fap_version=(6,0),
+    fap_version=(6,4),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],

mayhem_marauder/scenes/wifi_marauder_scene_start.c

@@ -62,18 +62,24 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END,
      NO_TIP},
     {"Attack",
-     {"deauth", "probe", "rickroll"},
-     3,
-     {"attack -t deauth", "attack -t probe", "attack -t rickroll"},
+     {"deauth", "probe", "rickroll", "sour apple", "swiftpair spam"},
+     5,
+     {"attack -t deauth", "attack -t probe", "attack -t rickroll", "sourapple", "swiftpair"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
-    /*{"Wardrive", {""}, 1, {"wardrive"}, NO_ARGS, FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP},*/ // No GPS for Wardrive on Mayhem
+    /*{"Wardrive", 
+     {"ap", "station", "bt", "bt cont"}, 
+     4, 
+     {"wardrive", "wardrive -s", "btwardrive", "btwardrive -c"}, 
+     NO_ARGS, 
+     FOCUS_CONSOLE_END, 
+     SHOW_STOPSCAN_TIP},*/ // No GPS for Wardrive on Mayhem
     {"Evil Portal",
-     {"start"},
-     1,
-     {"evilportal -c start"},
-     NO_ARGS,
+     {"start", "set html"},
+     2,
+     {"evilportal -c start", "evilportal -c sethtml"},
+     TOGGLE_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
     {"Targeted Deauth",
@@ -152,6 +158,13 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      TOGGLE_ARGS,
      FOCUS_CONSOLE_START,
      NO_TIP},
+    {"List SD",
+     {""},
+     1,
+     {"ls /"},
+     INPUT_ARGS,
+     FOCUS_CONSOLE_END,
+     NO_TIP},
     {"Update", {"sd"}, 1, {"update -s"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Reboot", {""}, 1, {"reboot"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},

mayhem_marauder/wifi_marauder_app.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.6.2"
+#define WIFI_MARAUDER_APP_VERSION "v0.6.4"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 

mayhem_marauder/wifi_marauder_app_i.h

@@ -28,7 +28,7 @@
 
 #include <assets_icons.h>
 
-#define NUM_MENU_ITEMS (20)
+#define NUM_MENU_ITEMS (21)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)