From d7e8333aed58285c901574b7dae8845f26060365 Mon Sep 17 00:00:00 2001 From: "Peter D. Gray" Date: Mon, 18 Dec 2023 10:42:48 -0500 Subject: [PATCH] cleanup of ftux (cherry picked from commit f6f977503e81e7c2baceed8f3fc2618a1e9bf305) --- shared/ftux.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/shared/ftux.py b/shared/ftux.py index 860148cf..57ffa53e 100644 --- a/shared/ftux.py +++ b/shared/ftux.py @@ -9,10 +9,18 @@ from actions import change_usb_disable class FirstTimeUX: async def interact(self): - # Help them enable the good stuff. - # - they might have already enabled things + # Force USB to be disabled by default, but also warn/tell user + # how to enable it, plus NFC and VirtDisk (already disabled by default) + if settings.get('du', None) is None: - await ux_show_story(''' + if not ckcc.is_simulator(): + settings.set('du', 1) # disable USB + await change_usb_disable(1) + + #settings.set('nfc', 0) # default already + #settings.set('vidsk', 0) # same as default + + await ux_show_story(''' Your COLDCARD has been configured for \ best security practises: @@ -22,14 +30,7 @@ best security practises: You can change these under Settings > Hardware On/Off.''', title="Welcome!") - if not ckcc.is_simulator(): - settings.set('du', 1) # disable USB - await change_usb_disable(1) - - #settings.set('nfc', 0) # default already - #settings.set('vidsk', 0) # same as default - - # done + # done, clear UX the_ux.pop() # EOF