Skip to content

Commit

Permalink
upd evilportal
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed Nov 28, 2023
1 parent fd7cdae commit a750fd5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void evil_portal_read_index_html(void* context) {
File* index_html = storage_file_alloc(storage);
if(storage_file_open(
index_html, EVIL_PORTAL_INDEX_SAVE_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
app->index_html = malloc((size_t)fi.size);
app->index_html = malloc((size_t)fi.size + 1);
uint8_t* buf_ptr = app->index_html;
size_t read = 0;
while(read < fi.size) {
Expand All @@ -33,7 +33,7 @@ void evil_portal_read_index_html(void* context) {
read += now_read;
buf_ptr += now_read;
}
free(buf_ptr);
*buf_ptr = '\0';
}
storage_file_close(index_html);
storage_file_free(index_html);
Expand Down Expand Up @@ -94,8 +94,6 @@ void evil_portal_read_ap_name(void* context) {
buf_ptr += now_read;
}
*buf_ptr = '\0';
buf_ptr++;
free(buf_ptr);
}
storage_file_close(ap_name);
storage_file_free(ap_name);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
#include "../evil_portal_app_i.h"
#include "../helpers/evil_portal_storage.h"

void evil_portal_show_loading_popup(Evil_PortalApp* app, bool show) {
ViewStack* view_stack = app->view_stack;
Loading* loading = app->loading;
if(show) {
// Raise timer priority so that animations can play
furi_timer_set_thread_priority(FuriTimerThreadPriorityElevated);
view_stack_add_view(view_stack, loading_get_view(loading));
} else {
view_stack_remove_view(view_stack, loading_get_view(loading));
// Restore default timer priority
furi_timer_set_thread_priority(FuriTimerThreadPriorityNormal);
}
}

void evil_portal_scene_select_html_on_enter(void* context) {
Evil_PortalApp* app = context;
DialogsFileBrowserOptions browser_options;
Expand All @@ -33,9 +19,7 @@ void evil_portal_scene_select_html_on_enter(void* context) {

if(success) {
//Replace HTML File
evil_portal_show_loading_popup(app, true);
evil_portal_replace_index_html(app->file_path);
evil_portal_show_loading_popup(app, false);
}

scene_manager_search_and_switch_to_previous_scene(app->scene_manager, Evil_PortalSceneStart);
Expand Down

0 comments on commit a750fd5

Please sign in to comment.