Merge wifi_marauder_companion from https://github.com/0xchocolate/flipperzero-wifi-marauder

wifi_marauder_companion/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="esp32_wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    fap_version=(6, 5),
+    fap_version=(6, 6),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],

wifi_marauder_companion/docs/changelog.md

@@ -1,10 +1,29 @@
-## v0.6.3
+## v0.6.6
 
-BT wardriving and Sour Apple! Requires a board with BT support. Thanks to @justcallmekoko for adding the new commands!
+Bug fixes and new BLE spam commands! Thanks to @justcallmekoko for adding the new commands! I also fixed the script user input bug where it would hang after selecting "save".
+
+The BLE spam command format has changed and requires at least **FW v0.13.6**. Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+
+Note: if you're flashing directly from your flipper using the [ESP Flasher app](https://github.com/0xchocolate/flipperzero-esp-flasher), grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.)
+
+By the way, want to support app development by buying me a coffee? You finally have that option! https://ko-fi.com/cococode
+
+<3 @0xchocolate (cococode)
+
+
+## v0.6.5
+
+New option to load Evil Portal HTML files from the flipper sd card!
 
-Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v0.13.0
 
-Note: if you're flashing directly from your flipper using the ESP Flasher app, grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.)
+## v0.6.4
+
+swiftpair spam and ESP32 sd card commands: sethtml, ls. Requires a board with BT and sd card support. Thanks to @justcallmekoko for adding the new commands!
+
+
+## v0.6.3
+
+BT wardriving and Sour Apple! Requires a board with BT support. Thanks to @justcallmekoko for adding the new commands!
 
 
 ## v0.6.2
@@ -13,10 +32,6 @@ Happy wardriving! Thanks to @justcallmekoko for adding the gps and wardrive comm
 
 Instructions to install a GPS module: https://github.com/justcallmekoko/ESP32Marauder/wiki/gps-modification
 
-Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v0.11.1
-
-Note: if you're flashing directly from your flipper using the ESP Flasher app, grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.)
-
 
 ## v0.6.1
 

wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -62,9 +62,9 @@ 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},

wifi_marauder_companion/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) {
@@ -144,9 +144,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_companion/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_companion/wifi_marauder_custom_event.h

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