Update marauder companion

application.fam

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

scenes/wifi_marauder_scene_start.c

@@ -62,18 +62,18 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END,
      NO_TIP},
     {"Attack",
-     {"deauth", "probe", "rickroll", "sour apple", "swiftpair spam"},
-     5,
-     {"attack -t deauth", "attack -t probe", "attack -t rickroll", "sourapple", "swiftpair"},
+     {"deauth", "probe", "rickroll", "sour apple", "swiftpair spam", "samsung spam", "google spam", "bt spam all"},
+     8,
+     {"attack -t deauth", "attack -t probe", "attack -t rickroll", "blespam -t apple", "blespam -t windows", "blespam -t samsung", "blespam -t google", "blespam -t all"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
-    /*{"Wardrive", 
-     {"ap", "station", "bt", "bt cont"}, 
-     4, 
-     {"wardrive", "wardrive -s", "btwardrive", "btwardrive -c"}, 
-     NO_ARGS, 
-     FOCUS_CONSOLE_END, 
+    /*{"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", "set html"},

scenes/wifi_marauder_scene_user_input.c

@@ -91,7 +91,7 @@ void wifi_marauder_scene_user_input_ok_callback(void* context) {
         break;
     }
 
-    scene_manager_previous_scene(app->scene_manager);
+    view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventPrevScene);
 }
 
 void wifi_marauder_scene_user_input_on_enter(void* context) {
@@ -143,9 +143,19 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
 }
 
 bool wifi_marauder_scene_user_input_on_event(void* context, SceneManagerEvent event) {
-    UNUSED(context);
-    UNUSED(event);
-    return false;
+    WifiMarauderApp* app = context;
+
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == WifiMarauderEventPrevScene) {
+            scene_manager_previous_scene(app->scene_manager);
+            consumed = true;
+        }
+    }
+
+    return consumed;
+
 }
 
 void wifi_marauder_scene_user_input_on_exit(void* context) {

wifi_marauder_app.h

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

wifi_marauder_custom_event.h

@@ -9,5 +9,6 @@ typedef enum {
     WifiMarauderEventStartSettingsInit,
     WifiMarauderEventStartLogViewer,
     WifiMarauderEventStartScriptSelect,
-    WifiMarauderEventStartSniffPmkidOptions
+    WifiMarauderEventStartSniffPmkidOptions,
+    WifiMarauderEventPrevScene
 } WifiMarauderCustomEvent;