diff --git a/applications/external/evil_portal/evil_portal_app_i.h b/applications/external/evil_portal/evil_portal_app_i.h index bbe82cbd8..5fa6f62b8 100644 --- a/applications/external/evil_portal/evil_portal_app_i.h +++ b/applications/external/evil_portal/evil_portal_app_i.h @@ -30,9 +30,6 @@ #define SET_AP_CMD "setap" #define RESET_CMD "reset" -#define HTML_EXTENSION ".html" -#define HTML_FOLDER APP_DATA_PATH("html") - struct Evil_PortalApp { Gui* gui; ViewDispatcher* view_dispatcher; diff --git a/applications/external/evil_portal/helpers/evil_portal_storage.h b/applications/external/evil_portal/helpers/evil_portal_storage.h index ad0b8a392..234b853e6 100644 --- a/applications/external/evil_portal/helpers/evil_portal_storage.h +++ b/applications/external/evil_portal/helpers/evil_portal_storage.h @@ -6,8 +6,10 @@ #include #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_INDEX_DEFAULT_PATH PORTAL_FILE_DIRECTORY_PATH "/html/xtreme.html" +#define EVIL_PORTAL_INDEX_DEFAULT_PATH HTML_FOLDER "/xtreme.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" diff --git a/assets/resources/apps_data/evil_portal/ap.config.txt b/assets/resources/apps_data/evil_portal/ap.config.txt deleted file mode 100644 index a69f2a885..000000000 --- a/assets/resources/apps_data/evil_portal/ap.config.txt +++ /dev/null @@ -1 +0,0 @@ -Xtreme Demo \ No newline at end of file diff --git a/assets/resources/apps_data/evil_portal/xtreme.html b/assets/resources/apps_data/evil_portal/html/xtreme.html similarity index 100% rename from assets/resources/apps_data/evil_portal/xtreme.html rename to assets/resources/apps_data/evil_portal/html/xtreme.html