arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-25 09:22:33 +00:00
Code Issues Releases Wiki Activity

fix(core): do not autolock when already locked

Browse Source 
Gets rid of unnecessary screen redraw.
This commit is contained in:
Martin Milata 2021-01-26 17:57:53 +01:00
parent 192d0dcf87
commit 06b9d1314d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/apps/base.py
View File

@ -216,6 +216,11 @@ def lock_device() -> None:
workflow.close_others() workflow.close_others()
def lock_device_if_unlocked() -> None:
if config.is_unlocked():
lock_device()
async def unlock_device(ctx: wire.GenericContext = wire.DUMMY_CONTEXT) -> None: async def unlock_device(ctx: wire.GenericContext = wire.DUMMY_CONTEXT) -> None:
"""Ensure the device is in unlocked state. """Ensure the device is in unlocked state.
@ -267,4 +272,6 @@ def boot() -> None:
wire.experimental_enabled = storage.device.get_experimental_features() wire.experimental_enabled = storage.device.get_experimental_features()
workflow.idle_timer.set(storage.device.get_autolock_delay_ms(), lock_device) workflow.idle_timer.set(
storage.device.get_autolock_delay_ms(), lock_device_if_unlocked
)

6
core/src/apps/management/apply_settings.py
View File

@ -5,7 +5,7 @@ from trezor.messages.Success import Success
from trezor.strings import format_duration_ms from trezor.strings import format_duration_ms
from trezor.ui.components.tt.text import Text from trezor.ui.components.tt.text import Text
from apps.base import lock_device from apps.base import lock_device_if_unlocked
from apps.common import safety_checks from apps.common import safety_checks
from apps.common.confirm import require_confirm, require_hold_to_confirm from apps.common.confirm import require_confirm, require_hold_to_confirm
@ -101,7 +101,9 @@ async def apply_settings(ctx: wire.Context, msg: ApplySettings):
def reload_settings_from_storage() -> None: def reload_settings_from_storage() -> None:
workflow.idle_timer.set(storage.device.get_autolock_delay_ms(), lock_device) workflow.idle_timer.set(
storage.device.get_autolock_delay_ms(), lock_device_if_unlocked
)
ui.display.orientation(storage.device.get_rotation()) ui.display.orientation(storage.device.get_rotation())
wire.experimental_enabled = storage.device.get_experimental_features() wire.experimental_enabled = storage.device.get_experimental_features()