Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 17:08:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge desktop service changes, refactor some old code

Browse Source
This commit is contained in:
Willy-JL
2024-08-08 00:40:32 +02:00
parent b14944b029
commit 7905b829cf
6 changed files with 243 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
applications/services/desktop/scenes/desktop_scene_lock_menu.c
View File

@@ -10,10 +10,17 @@
#include <desktop/desktop_settings.h>
#include "../views/desktop_view_lock_menu.h"
#include "desktop_scene.h"
#include "../helpers/pin.h"
#include "../helpers/pin_code.h"
#include <power/power_service/power.h>
#define TAG "DesktopSceneLock"
typedef enum {
CheckPinNo,
CheckPinLock,
CheckPinLockOff,
} CheckPin;
void desktop_scene_lock_menu_callback(DesktopEvent event, void* context) {
Desktop* desktop = (Desktop*)context;
view_dispatcher_send_custom_event(desktop->view_dispatcher, event);
@@ -22,17 +29,14 @@ void desktop_scene_lock_menu_callback(DesktopEvent event, void* context) {
void desktop_scene_lock_menu_on_enter(void* context) {
Desktop* desktop = (Desktop*)context;
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, CheckPinNo);
desktop_lock_menu_set_callback(desktop->lock_menu, desktop_scene_lock_menu_callback, desktop);
desktop_lock_menu_set_pin_state(
desktop->lock_menu, desktop_pin_is_valid(&desktop->settings.pin_code));
desktop_lock_menu_set_pin_state(desktop->lock_menu, desktop_pin_code_is_set());
desktop_lock_menu_set_stealth_mode_state(
desktop->lock_menu, furi_hal_rtc_is_flag_set(FuriHalRtcFlagStealthMode));
desktop_lock_menu_set_idx(desktop->lock_menu, 3);
Gui* gui = furi_record_open(RECORD_GUI);
gui_set_hide_statusbar(gui, true);
furi_record_close(RECORD_GUI);
gui_set_hide_statusbar(desktop->gui, true);
view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewIdLockMenu);
}
@@ -57,13 +61,14 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
bool consumed = false;
if(event.type == SceneManagerEventTypeTick) {
int check_pin_changed =
CheckPin check_pin_changed =
scene_manager_get_scene_state(desktop->scene_manager, DesktopSceneLockMenu);
if(check_pin_changed && desktop_pin_code_is_set()) {
if(check_pin_changed != CheckPinNo && desktop_pin_code_is_set()) {
desktop_lock_menu_set_pin_state(desktop->lock_menu, true);
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
scene_manager_set_scene_state(
desktop->scene_manager, DesktopSceneLockMenu, CheckPinNo);
desktop_lock(desktop, true);
if(check_pin_changed == 2) {
if(check_pin_changed == CheckPinLockOff) {
Power* power = furi_record_open(RECORD_POWER);
furi_delay_ms(500);
power_off(power);
@@ -85,18 +90,19 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
break;
case DesktopLockMenuEventLockPinCode:
desktop_scene_lock_menu_save_settings(desktop);
if(desktop_pin_is_valid(&desktop->settings.pin_code)) {
if(desktop_pin_code_is_set()) {
desktop_lock(desktop, true);
} else {
loader_start_detached_with_gui_error(
desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 1);
scene_manager_set_scene_state(
desktop->scene_manager, DesktopSceneLockMenu, CheckPinLock);
}
consumed = true;
break;
case DesktopLockMenuEventLockPinOff:
desktop_scene_lock_menu_save_settings(desktop);
if(desktop_pin_is_valid(&desktop->settings.pin_code)) {
if(desktop_pin_code_is_set()) {
desktop_lock(desktop, true);
Power* power = furi_record_open(RECORD_POWER);
furi_delay_ms(500);
@@ -105,7 +111,8 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
} else {
loader_start_detached_with_gui_error(
desktop->loader, "Desktop", DESKTOP_SETTINGS_RUN_PIN_SETUP_ARG);
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 2);
scene_manager_set_scene_state(
desktop->scene_manager, DesktopSceneLockMenu, CheckPinLockOff);
}
consumed = true;
break;
@@ -124,7 +131,7 @@ bool desktop_scene_lock_menu_on_event(void* context, SceneManagerEvent event) {
break;
}
} else if(event.type == SceneManagerEventTypeBack) {
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, 0);
scene_manager_set_scene_state(desktop->scene_manager, DesktopSceneLockMenu, CheckPinNo);
}
return consumed;
}
@@ -133,7 +140,5 @@ void desktop_scene_lock_menu_on_exit(void* context) {
Desktop* desktop = (Desktop*)context;
desktop_scene_lock_menu_save_settings(desktop);
Gui* gui = furi_record_open(RECORD_GUI);
gui_set_hide_statusbar(gui, false);
furi_record_close(RECORD_GUI);
gui_set_hide_statusbar(desktop->gui, false);
}

3
applications/services/desktop/scenes/desktop_scene_pin_input.c
View File

@@ -59,10 +59,9 @@ static void desktop_scene_pin_input_done_callback(const DesktopPinCode* pin_code
} else {
uint32_t pin_fails = furi_hal_rtc_get_pin_fails() + 1;
if(pin_fails >= 10 && momentum_settings.bad_pins_format) {
furi_hal_rtc_reset_registers();
furi_hal_rtc_set_flag(FuriHalRtcFlagStorageFormatInternal);
storage_sd_format(furi_record_open(RECORD_STORAGE));
furi_record_close(RECORD_STORAGE);
furi_hal_rtc_reset_registers();
power_reboot(PowerBootModeNormal);
}
furi_hal_rtc_set_pin_fails(pin_fails);