getting closer to a finalized flow.

This commit is contained in:
bunnie 2021-08-10 03:04:03 +08:00
parent 352b725f7a
commit 184bb8405f
5 changed files with 9 additions and 16 deletions

View file

@ -70,8 +70,8 @@
"en-audio": "Committing signatures. This may take a while, don't reset or sleep the device."
},
"rootkeys.init.finished": {
"en": "Preparing to reboot...",
"zh": "准备重启...",
"en": "Preparing to reboot...\n\n",
"zh": "准备重启...\n\n",
"en-audio": "Preparing to reboot."
},
"rootkeys.init.fail_verify": {

View file

@ -938,7 +938,7 @@ impl<'a> RootKeys {
pb.update_text(t!("rootkeys.init.finished", xous::LANG));
pb.set_percentage(100);
self.ticktimer.sleep_ms(1000).expect("couldn't show final message");
self.ticktimer.sleep_ms(2000).expect("couldn't show final message");
Ok(())
}

View file

@ -198,7 +198,7 @@ fn xmain() -> ! {
} else {
// overall flow:
// - setup the init
// -------> TODO: add an abort option here, in case someone clicked on this item out of curiosity
// - check that the user is ready to proceed
// - prompt for root password
// - prompt for boot password
// - create the keys
@ -316,15 +316,8 @@ fn xmain() -> ! {
// we also need to include a command that does the reboot.
match result {
Ok(_) => {
dismiss_modal_action.set_action_opcode(Opcode::UxGutter.to_u32().unwrap());
rootkeys_modal.modify(
Some(ActionType::Notification(dismiss_modal_action)),
Some(t!("rootkeys.init.finished", xous::LANG)), false,
None, false, None);
rootkeys_modal.activate();
xous::yield_slice();
// TODO: insert the reboot code here
keys.finish_key_init();
}
Err(RootkeyResult::AlignmentError) => {
dismiss_modal_action.set_action_opcode(Opcode::UxGutter.to_u32().unwrap());

View file

@ -15,9 +15,9 @@
"en-audio": "Invalid key state"
},
"secnote.no_keys": {
"en": " Keystore uninitialized",
"en": " Root keys uninitialized",
"zh": "密钥未初始化",
"en-audio": "Keystore unitialized"
"en-audio": "Root keys unitialized"
},
"secnote.allclear": {
"en": " No security warnings",

View file

@ -225,7 +225,7 @@ fn xmain() -> ! {
} else {
stats_interval = 4;
batt_interval = 4;
secnotes_interval = 2;
secnotes_interval = 4;
}
let mut battstats_phase = true;
let mut needs_redraw = false;