Merge branch 'ul-dev' into xfw-dev

This commit is contained in:
Willy-JL
2023-04-28 21:43:56 +01:00
146 changed files with 9594 additions and 1801 deletions

View File

@@ -83,6 +83,11 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
(!storage_file_exists(app->storage, SAVE_PCAP_SETTING_FILEPATH) ||
!storage_file_exists(app->storage, SAVE_LOGS_SETTING_FILEPATH));
// Submenu
app->submenu = submenu_alloc();
view_dispatcher_add_view(
app->view_dispatcher, WifiMarauderAppViewSubmenu, submenu_get_view(app->submenu));
scene_manager_next_scene(app->scene_manager, WifiMarauderSceneStart);
return app;
@@ -102,6 +107,10 @@ void wifi_marauder_make_app_folder(WifiMarauderApp* app) {
if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_LOGS)) {
dialog_message_show_storage_error(app->dialogs, "Cannot create\npcaps folder");
}
if(!storage_simply_mkdir(app->storage, MARAUDER_APP_FOLDER_SCRIPTS)) {
dialog_message_show_storage_error(app->dialogs, "Cannot create\nscripts folder");
}
}
void wifi_marauder_load_settings(WifiMarauderApp* app) {
@@ -136,10 +145,14 @@ void wifi_marauder_app_free(WifiMarauderApp* app) {
view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewConsoleOutput);
view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewTextInput);
view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewWidget);
view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
widget_free(app->widget);
text_box_free(app->text_box);
furi_string_free(app->text_box_store);
wifi_text_input_free(app->text_input);
submenu_free(app->submenu);
variable_item_list_free(app->var_item_list);
storage_file_free(app->capture_file);
storage_file_free(app->log_file);
storage_file_free(app->save_pcap_setting_file);