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

# Conflicts:
#	wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

wifi_marauder_companion/application.fam

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

wifi_marauder_companion/docs/changelog.md

@@ -1,3 +1,17 @@
+## v0.7.1
+
+Bug fixes and improvements!
+
+- Back to working on latest official firmware ( @GeorgeBotsev )
+- Now the Evil Portal and wardrive dumps will be saved to a new directory `apps_data/marauder/dumps`, and the "-serial" argument for all commands will respect your "save pcaps" app setting ( @Willy-JL )
+- You'll also notice an `apps_data/marauder/html` directory, to support migrating from the standalone Evil Portal ( @RogueMaster )
+- Fixes an issue with loading scripts due to upstream toolchain changes ( @Willy-JL , @vollukas )
+
+As always, make sure you're running the latest version of Marauder FW on your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/latest
+
+<3 @0xchocolate (cococode)
+
+
 ## v0.7.0
 
 Unified serial update! No more complicated wiring of 2x UART connections - all your boards are supported now, with PCAPs and text both going over just ONE, SINGLE serial channel! Thanks to @Willy-JL for adding this amazing feature and fixing up the app for the new APIs.

wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c

@@ -131,13 +131,17 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
         // Create files *before* sending command
         // (it takes time to iterate through the directory)
         if(app->ok_to_save_logs) {
-            strcpy(
-                app->log_file_path,
-                sequential_file_resolve_path(
-                    app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log"));
-            if(storage_file_open(
-                   app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-                app->is_writing_log = true;
+            char* resolved_path = sequential_file_resolve_path(
+                app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log");
+            if(resolved_path != NULL) {
+                strcpy(app->log_file_path, resolved_path);
+                free(resolved_path);
+                if(storage_file_open(
+                       app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+                    app->is_writing_log = true;
+                } else {
+                    dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
+                }
             } else {
                 dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
             }

wifi_marauder_companion/wifi_marauder_app.c

@@ -112,6 +112,10 @@ void wifi_marauder_make_app_folder(WifiMarauderApp* app) {
     if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_SCRIPTS)) {
         dialog_message_show_storage_error(app->dialogs, "Cannot create\nscripts folder");
     }
+
+    if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_HTML)) {
+        dialog_message_show_storage_error(app->dialogs, "Cannot create\nhtml folder");
+    }
 }
 
 void wifi_marauder_load_settings(WifiMarauderApp* app) {

wifi_marauder_companion/wifi_marauder_app.h

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