arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-18 10:32:02 +00:00
Code Issues Releases Wiki Activity

core/recovery: properly replace homescreens

Browse Source
This commit is contained in:
matejcik 2019-11-04 15:33:38 +01:00 committed by matejcik
parent 1c59ba9423
commit 7cb125d1cb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/apps/management/recovery_device/__init__.py
View File

@ -1,4 +1,4 @@
from trezor import config, ui, wire from trezor import config, ui, wire, workflow
from trezor.messages import ButtonRequestType from trezor.messages import ButtonRequestType
from trezor.messages.Success import Success from trezor.messages.Success import Success
from trezor.pin import pin_to_int from trezor.pin import pin_to_int
@ -12,7 +12,10 @@ from apps.common.request_pin import (
show_pin_invalid, show_pin_invalid,
) )
from apps.common.storage import device as storage_device, recovery as storage_recovery from apps.common.storage import device as storage_device, recovery as storage_recovery
from apps.management.recovery_device.homescreen import recovery_process from apps.management.recovery_device.homescreen import (
recovery_homescreen,
recovery_process,
)
if False: if False:
from trezor.messages.RecoveryDevice import RecoveryDevice from trezor.messages.RecoveryDevice import RecoveryDevice
@ -55,6 +58,7 @@ async def recovery_device(ctx: wire.Context, msg: RecoveryDevice) -> Success:
if msg.dry_run: if msg.dry_run:
storage_recovery.set_dry_run(msg.dry_run) storage_recovery.set_dry_run(msg.dry_run)
workflow.replace_default(recovery_homescreen)
return await recovery_process(ctx) return await recovery_process(ctx)

8
core/src/apps/management/recovery_device/homescreen.py
View File

@ -24,6 +24,10 @@ if False:
async def recovery_homescreen() -> None: async def recovery_homescreen() -> None:
if not storage.recovery.is_in_progress():
workflow.replace_default(homescreen)
return
# recovery process does not communicate on the wire # recovery process does not communicate on the wire
ctx = wire.DummyContext() ctx = wire.DummyContext()
await recovery_process(ctx) await recovery_process(ctx)
@ -31,16 +35,14 @@ async def recovery_homescreen() -> None:
async def recovery_process(ctx: wire.GenericContext) -> Success: async def recovery_process(ctx: wire.GenericContext) -> Success:
try: try:
result = await _continue_recovery_process(ctx) return await _continue_recovery_process(ctx)
except recover.RecoveryAborted: except recover.RecoveryAborted:
dry_run = storage_recovery.is_dry_run() dry_run = storage_recovery.is_dry_run()
if dry_run: if dry_run:
storage_recovery.end_progress() storage_recovery.end_progress()
else: else:
storage.wipe() storage.wipe()
workflow.replace_default(homescreen)
raise wire.ActionCancelled("Cancelled") raise wire.ActionCancelled("Cancelled")
return result
async def _continue_recovery_process(ctx: wire.GenericContext) -> Success: async def _continue_recovery_process(ctx: wire.GenericContext) -> Success: