Merge branch 'dev'

This commit is contained in:
RebornedBrain 2024-01-10 19:18:51 +03:00
commit 843fa3eecc
4 changed files with 4 additions and 1 deletions

View file

@ -414,7 +414,7 @@ bool desktop_api_is_locked(Desktop* instance) {
void desktop_api_unlock(Desktop* instance) {
furi_assert(instance);
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopLockedEventUnlocked);
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopGlobalApiUnlock);
}
FuriPubSub* desktop_api_get_status_pubsub(Desktop* instance) {

View file

@ -83,6 +83,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) {
case DesktopLockedEventUnlocked:
case DesktopGlobalApiUnlock:
desktop_unlock(desktop);
consumed = true;
break;

View file

@ -126,6 +126,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
consumed = true;
break;
case DesktopPinInputEventUnlocked:
case DesktopGlobalApiUnlock:
desktop_unlock(desktop);
consumed = true;
break;

View file

@ -50,4 +50,5 @@ typedef enum {
DesktopGlobalBeforeAppStarted,
DesktopGlobalAfterAppFinished,
DesktopGlobalAutoLock,
DesktopGlobalApiUnlock,
} DesktopEvent;