Fixes & Improvements for 0.94.1

README.md

@@ -1,20 +1,3 @@
-<p>
-  <h1 align="center"><b><a href='https://rogue-master.net'><img src="https://rogue-master.net/img/rmlogo.png" width="40%"></a></b></h1>
-</p>
-
-<h1 align="center"><a href='https://discord.gg/gF2bBUzAFe' target='_blank'><img src='https://rogue-master.net/img/Discord.png' alt='Discord' title='Discord'></a>
-&nbsp;<a href='https://github.com/RogueMaster/flipperzero-firmware-wPlugins/releases/latest' target='_blank'><img src='https://rogue-master.net/img/Github.png' alt='Firmware GitHub' title='Firmware GitHub'></a>
-&nbsp;<a href='https://www.patreon.com/RogueMaster?filters[tag]=Latest%20Release' target='_blank'><img src='https://rogue-master.net/img/Patreon.png' alt='Latest PATREON Release' title='Latest PATREON Release'></a>
-&nbsp;<a href='https://shop.rogue-master.net/' target='_blank'><img src='https://rogue-master.net/img/Merch.png' alt='RM Merch'' title='RM Merch'></a>
-&nbsp;<a href='https://github.com/RogueMaster/awesome-flipperzero-withModules' target='_blank'><img src='https://rogue-master.net/img/Resources.png' alt='More Research / Assets' title='More Research / Assets'></a></h1>
-
-# [Support Me On Patreon to get the best assets updated frequently!](https://www.patreon.com/RogueMaster)
-
-## [This repo is an improved fork of the OG Evil Portal app by bigbrodude6119!](https://github.com/bigbrodude6119/flipper-zero-evil-portal)
-
-- I have made some changes to file names and accepted some PRs that were open.
-- Also gave it a more descriptive application.fam file.
-
 # Flipper Zero Evil Portal
 
 An evil captive portal Wi-Fi access point using the Flipper Zero and Wi-Fi dev board

flipper/flipper-evil-portal/application.fam → application.fam

@@ -1,17 +1,15 @@
 App(
-    appid="esp32_evil_portal",
-    name="[ESP32] Evil Portal",
+    appid="evil_portal",
+    name="Evil Portal",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="evil_portal_app",
-    # cdefines=["APP_EVIL_PORTAL"],
-    requires=["gui"],
     stack_size=1 * 1024,
-    order=90,
+    resources="resources",
     fap_icon="icons/evil_portal_10px.png",
     fap_category="GPIO/ESP32",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="evil_portal",
-    fap_author="@bigbrodude6119",
+    fap_author="bigbrodude6119",
     fap_weburl="https://github.com/bigbrodude6119/flipper-zero-evil-portal",
     fap_version=(0, 2),
     fap_description="An evil captive portal Wi-Fi access point using the Flipper Zero and Wi-Fi dev board WIP",

flipper/flipper-evil-portal/evil_portal_app.c → evil_portal_app.c

@@ -124,11 +124,23 @@ int32_t evil_portal_app(void* p) {
     UNUSED(p);
     Evil_PortalApp* evil_portal_app = evil_portal_app_alloc();
 
+    uint8_t attempts = 0;
+    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
+    while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
+        furi_hal_power_enable_otg();
+        furi_delay_ms(10);
+    }
+    furi_delay_ms(200);
+
     evil_portal_app->uart = evil_portal_uart_init(evil_portal_app);
 
     view_dispatcher_run(evil_portal_app->view_dispatcher);
 
     evil_portal_app_free(evil_portal_app);
 
+    if(furi_hal_power_is_otg_enabled() && !otg_was_enabled) {
+        furi_hal_power_disable_otg();
+    }
+
     return 0;
 }

flipper/flipper-evil-portal/evil_portal_app_i.h → evil_portal_app_i.h

@@ -28,9 +28,6 @@
 #define SET_AP_CMD "setap"
 #define RESET_CMD "reset"
 
-#define HTML_EXTENSION ".html"
-#define HTML_FOLDER ANY_PATH("apps_data/esp32_evil_portal/html")
-
 struct Evil_PortalApp {
     Gui* gui;
     ViewDispatcher* view_dispatcher;

flipper/flipper-evil-portal/helpers/evil_portal_storage.h → helpers/evil_portal_storage.h

@@ -5,7 +5,9 @@
 #include <storage/storage.h>
 #include <string.h>
 
-#define PORTAL_FILE_DIRECTORY_PATH EXT_PATH("apps_data/evil_portal")
+#define PORTAL_FILE_DIRECTORY_PATH EXT_PATH("apps_data/.evil_portal")
+#define HTML_EXTENSION ".html"
+#define HTML_FOLDER PORTAL_FILE_DIRECTORY_PATH "/html"
 #define EVIL_PORTAL_INDEX_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/index.html"
 #define EVIL_PORTAL_AP_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/ap.config.txt"
 #define EVIL_PORTAL_LOG_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/logs"