From a66531b98f158b7b527269c3d07e7855c349b45b Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:09:21 +0000
Subject: [PATCH] Improve detection and command timings

---
 .../scenes/evil_portal_scene_console_output.c | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/applications/external/evil_portal/scenes/evil_portal_scene_console_output.c b/applications/external/evil_portal/scenes/evil_portal_scene_console_output.c
index 63f36ab9a..5bf0e5f16 100644
--- a/applications/external/evil_portal/scenes/evil_portal_scene_console_output.c
+++ b/applications/external/evil_portal/scenes/evil_portal_scene_console_output.c
@@ -121,9 +121,11 @@ void evil_portal_scene_console_output_on_enter(void* context) {
             furi_string_printf(data, "setap=%s\n", (char*)app->ap_name);
             furi_string_reset(app->captured_line);
             evil_portal_uart_tx((uint8_t*)(furi_string_get_cstr(data)), furi_string_size(data));
-            // For some reason evil portal messes up "ap set" with newlines and random letters, "p set" works
-            for(uint8_t t = 0; t < 20 && !captured(app, "p set"); t++) furi_delay_ms(100);
-            bool icanhazmarauder = !captured(app, "p set"); // Evil portal didn't respond
+            // TODO: move timeouts and commands elsewhere, can't block input cycle
+            for(uint8_t t = 0; t < 69 && !captured(app, "ap set") && !captured(app, "\n>"); t++)
+                furi_delay_ms(100);
+            bool icanhazmarauder = !captured(app, "ap set") && // Evil portal didn't respond
+                                   captured(app, "\n>"); // Marauder did respond
             // Not evil portal, set up marauder
             if(icanhazmarauder) {
                 furi_string_printf(data, "clearlist -s\nssid -a -n '%s'\n", app->ap_name);
@@ -131,7 +133,7 @@ void evil_portal_scene_console_output_on_enter(void* context) {
                 evil_portal_uart_tx(
                     (uint8_t*)(furi_string_get_cstr(data)), furi_string_size(data));
                 // Marauder echoes the command, maybe still init so wait a while for echo
-                for(uint8_t t = 0; t < 42 && !captured(app, (char*)app->ap_name); t++)
+                for(uint8_t t = 0; t < 10 && !captured(app, (char*)app->ap_name); t++)
                     furi_delay_ms(100);
             }
             free(app->ap_name);
@@ -142,18 +144,17 @@ void evil_portal_scene_console_output_on_enter(void* context) {
                 evil_portal_uart_tx(
                     (uint8_t*)("evilportal -c sethtmlstr\n"),
                     strlen("evilportal -c sethtmlstr\n"));
-                for(uint8_t t = 0; t < 5 && !captured(app, "Setting HTML from serial..."); t++)
+                for(uint8_t t = 0; t < 10 && !captured(app, "\n>") &&
+                                   !captured(app, "Setting HTML from serial...");
+                    t++)
                     furi_delay_ms(100);
                 // Check for active attack
-                if(captured(app, ">") && !captured(app, "Setting HTML from serial...")) {
-                    furi_string_reset(app->captured_line);
-                } else {
+                if(!(captured(app, "\n>") && !captured(app, "Setting HTML from serial..."))) {
                     furi_string_reset(app->captured_line);
                     evil_portal_uart_tx(app->index_html, strlen((char*)app->index_html));
                     evil_portal_uart_tx((uint8_t*)("\n"), 1);
-                    for(uint8_t t = 0; t < 15 && !captured(app, "html set"); t++)
+                    for(uint8_t t = 0; t < 20 && !captured(app, "html set"); t++)
                         furi_delay_ms(100);
-                    furi_delay_ms(100);
                     evil_portal_uart_tx(
                         (uint8_t*)("evilportal -c start\n"), strlen("evilportal -c start\n"));
                 }