[FL-1968] Pin code locking (#788)
* Gui: code input module * Gui: fix size to fit frame * Desktop: PIN config and lock option * Gui: code input: cleanup, offset input fields if no header present * Desktop: move code unlock to desktop_locked scene * Desktop: fix unlock with back key * Desktop: bump settings version * Desktop: correct scene usage. Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -15,12 +15,39 @@ void desktop_scene_locked_on_enter(void* context) {
|
||||
desktop_locked_update_hint_timeout(locked_view);
|
||||
desktop_locked_set_dolphin_animation(locked_view);
|
||||
|
||||
uint32_t state = scene_manager_get_scene_state(desktop->scene_manager, DesktopViewLocked);
|
||||
|
||||
desktop_locked_with_pin(desktop->locked_view, state == DesktopLockedWithPin);
|
||||
|
||||
view_port_enabled_set(desktop->lock_viewport, true);
|
||||
osTimerStart(locked_view->timer, 63);
|
||||
|
||||
view_dispatcher_switch_to_view(desktop->view_dispatcher, DesktopViewLocked);
|
||||
}
|
||||
|
||||
static bool desktop_scene_locked_check_pin(Desktop* desktop, DesktopMainEvent event) {
|
||||
bool match = false;
|
||||
|
||||
size_t length = desktop->pincode_buffer.length;
|
||||
length = code_input_push(desktop->pincode_buffer.data, length, event);
|
||||
desktop->pincode_buffer.length = length;
|
||||
|
||||
match = code_input_compare(
|
||||
desktop->pincode_buffer.data,
|
||||
length,
|
||||
desktop->settings.pincode.data,
|
||||
desktop->settings.pincode.length);
|
||||
|
||||
if(match) {
|
||||
desktop->pincode_buffer.length = 0;
|
||||
desktop->settings.locked = false;
|
||||
desktop_settings_save(&desktop->settings);
|
||||
desktop_main_unlocked(desktop->main_view);
|
||||
}
|
||||
|
||||
return match;
|
||||
}
|
||||
|
||||
bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
|
||||
Desktop* desktop = (Desktop*)context;
|
||||
|
||||
@@ -36,7 +63,17 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
|
||||
case DesktopLockedEventUpdate:
|
||||
desktop_locked_manage_redraw(desktop->locked_view);
|
||||
consumed = true;
|
||||
break;
|
||||
case DesktopLockedEventInputReset:
|
||||
desktop->pincode_buffer.length = 0;
|
||||
break;
|
||||
default:
|
||||
if(desktop_scene_locked_check_pin(desktop, event.event)) {
|
||||
scene_manager_set_scene_state(
|
||||
desktop->scene_manager, DesktopSceneMain, DesktopMainEventUnlocked);
|
||||
scene_manager_next_scene(desktop->scene_manager, DesktopSceneMain);
|
||||
consumed = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user