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

Desktop: Fix PIN locked with no PIN set edge case

Browse Source
This commit is contained in:
Willy-JL
2024-09-02 00:45:59 +02:00
parent 9a1372435e
commit dd7cd8f487
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -13,5 +13,6 @@
- Desktop: - Desktop:
- Fix disabling keybinds (by @Willy-JL) - Fix disabling keybinds (by @Willy-JL)
- Sanity check PIN length for good measure (by @Willy-JL) - Sanity check PIN length for good measure (by @Willy-JL)
- Fix PIN locked with no PIN set edge case (by @Willy-JL)
- Settings: Fix duplicates in Power Settings when opening submenus (by @Willy-JL) - Settings: Fix duplicates in Power Settings when opening submenus (by @Willy-JL)
- RGB Backlight: Fix config migration (by @Willy-JL) - RGB Backlight: Fix config migration (by @Willy-JL)

10
applications/services/desktop/desktop.c
View File

@@ -384,13 +384,14 @@ void desktop_lock(Desktop* desktop, bool with_pin) {
furi_assert(!desktop->locked); furi_assert(!desktop->locked);
with_pin = with_pin && desktop_pin_code_is_set(); with_pin = with_pin && desktop_pin_code_is_set();
if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagLock)) { if(with_pin) {
furi_hal_rtc_set_flag(FuriHalRtcFlagLock);
} else {
furi_hal_rtc_reset_flag(FuriHalRtcFlagLock);
furi_hal_rtc_set_pin_fails(0); furi_hal_rtc_set_pin_fails(0);
} }
if(with_pin) { if(with_pin && !momentum_settings.allow_locked_rpc_commands) {
furi_hal_rtc_set_flag(FuriHalRtcFlagLock);
if(!momentum_settings.allow_locked_rpc_commands) {
Cli* cli = furi_record_open(RECORD_CLI); Cli* cli = furi_record_open(RECORD_CLI);
cli_session_close(cli); cli_session_close(cli);
furi_record_close(RECORD_CLI); furi_record_close(RECORD_CLI);
@@ -398,7 +399,6 @@ void desktop_lock(Desktop* desktop, bool with_pin) {
bt_close_rpc_connection(bt); bt_close_rpc_connection(bt);
furi_record_close(RECORD_BT); furi_record_close(RECORD_BT);
} }
}
desktop_auto_lock_inhibit(desktop); desktop_auto_lock_inhibit(desktop);
scene_manager_set_scene_state( scene_manager_set_scene_state(