From 16d821142d8d1a9193d3eb2065ec86a89d476a74 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Thu, 15 Feb 2024 01:19:28 +0000 Subject: [PATCH] Revert "Battery Info > About from FAP -1.4kb DFU" This reverts commit 20d898a0e01b5d10a186b26186dcf310e129575b. --- .../settings/power_settings_app/about.c | 1 + .../power_settings_app/power_settings_app.c | 24 ++----------------- 2 files changed, 3 insertions(+), 22 deletions(-) create mode 100644 applications/settings/power_settings_app/about.c diff --git a/applications/settings/power_settings_app/about.c b/applications/settings/power_settings_app/about.c new file mode 100644 index 000000000..a6a605667 --- /dev/null +++ b/applications/settings/power_settings_app/about.c @@ -0,0 +1 @@ +#include \ No newline at end of file diff --git a/applications/settings/power_settings_app/power_settings_app.c b/applications/settings/power_settings_app/power_settings_app.c index eb3521196..1f87b4959 100644 --- a/applications/settings/power_settings_app/power_settings_app.c +++ b/applications/settings/power_settings_app/power_settings_app.c @@ -1,6 +1,5 @@ #include "power_settings_app.h" -#include -#include +#include static bool power_settings_custom_event_callback(void* context, uint32_t event) { furi_assert(context); @@ -113,26 +112,7 @@ int32_t power_settings_app(void* p) { view_dispatcher_run(app->view_dispatcher); if(app->battery_info->exit_to_about) { app->battery_info->exit_to_about = false; - - bool stay = false; - FlipperApplication* fap = flipper_application_alloc( - furi_record_open(RECORD_STORAGE), firmware_api_interface); - do { - FlipperApplicationPreloadStatus preload_res = - flipper_application_preload(fap, EXT_PATH("apps/assets/about.fap")); - if(preload_res != FlipperApplicationPreloadStatusSuccess) break; - FlipperApplicationLoadStatus load_status = flipper_application_map_to_memory(fap); - if(load_status != FlipperApplicationLoadStatusSuccess) break; - FuriThread* thread = flipper_application_alloc_thread(fap, NULL); - furi_thread_set_appid(thread, "about"); - furi_thread_start(thread); - furi_thread_join(thread); - if(furi_thread_get_return_code(thread) == 1) stay = true; - } while(0); - flipper_application_free(fap); - furi_record_close(RECORD_STORAGE); - - if(stay) { + if(about_settings_app("about_battery")) { scene_manager_next_scene(app->scene_manager, first_scene); continue; }