From 5cae0ac1654e1f2c7a307e742aea3a22e94b17ec Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Wed, 18 Oct 2023 01:16:52 +0300
Subject: [PATCH] upd wifi marauder

https://github.com/justcallmekoko/flipperzero-wifi-marauder/tree/feature_wifi_marauder_app

PR in original repo by justcallmekoko
---
 application.fam                    |  2 +-
 scenes/wifi_marauder_scene_start.c | 21 ++++++++++++++-------
 wifi_marauder_app.h                |  2 +-
 wifi_marauder_app_i.h              |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/application.fam b/application.fam
index ed02d60ebc4..2a09c606c00 100644
--- a/application.fam
+++ b/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="esp32_wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    fap_version=(6,3),
+    fap_version=(6,4),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],
diff --git a/scenes/wifi_marauder_scene_start.c b/scenes/wifi_marauder_scene_start.c
index 716999fd682..b74e2cc7b84 100644
--- a/scenes/wifi_marauder_scene_start.c
+++ b/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"},
-     4,
-     {"attack -t deauth", "attack -t probe", "attack -t rickroll", "sourapple"},
+     {"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},
@@ -76,10 +76,10 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END, 
      SHOW_STOPSCAN_TIP},
     {"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",
@@ -151,6 +151,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},
diff --git a/wifi_marauder_app.h b/wifi_marauder_app.h
index a491a1fa2d9..4bc3a3b22c0 100644
--- a/wifi_marauder_app.h
+++ b/wifi_marauder_app.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.6.3"
+#define WIFI_MARAUDER_APP_VERSION "v0.6.4"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 
diff --git a/wifi_marauder_app_i.h b/wifi_marauder_app_i.h
index 2d22fff3c47..af4e7646739 100644
--- a/wifi_marauder_app_i.h
+++ b/wifi_marauder_app_i.h
@@ -26,7 +26,7 @@
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
 
-#define NUM_MENU_ITEMS (22)
+#define NUM_MENU_ITEMS (23)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)