mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
make sure the basis list is displayed at least once
need to cover the case that no enumeration was done, and just show a "null" list confirming basically nothing other than the system basis is disclosed.
This commit is contained in:
parent
3992a45763
commit
e8140f257c
1 changed files with 11 additions and 0 deletions
|
|
@ -1809,6 +1809,7 @@ impl PddbOs {
|
||||||
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
||||||
|
|
||||||
// 1. prompt user to enter any name/password combos for other basis we want to keep
|
// 1. prompt user to enter any name/password combos for other basis we want to keep
|
||||||
|
let mut summary_displayed = false;
|
||||||
let mut request_str = t!("pddb.freespace.enumerate", xous::LANG);
|
let mut request_str = t!("pddb.freespace.enumerate", xous::LANG);
|
||||||
while self.yes_no_approval(&modals, request_str) {
|
while self.yes_no_approval(&modals, request_str) {
|
||||||
request_str = t!("pddb.freespace.enumerate_another", xous::LANG); // use a plural for the next request to clarify UX flow
|
request_str = t!("pddb.freespace.enumerate_another", xous::LANG); // use a plural for the next request to clarify UX flow
|
||||||
|
|
@ -1862,6 +1863,7 @@ impl PddbOs {
|
||||||
};
|
};
|
||||||
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
||||||
// 4. repeat summary print-out
|
// 4. repeat summary print-out
|
||||||
|
summary_displayed = true;
|
||||||
let mut blist = String::from(t!("pddb.freespace.currentlist", xous::LANG));
|
let mut blist = String::from(t!("pddb.freespace.currentlist", xous::LANG));
|
||||||
for (_key, name) in ret.iter() {
|
for (_key, name) in ret.iter() {
|
||||||
blist.push_str("\n");
|
blist.push_str("\n");
|
||||||
|
|
@ -1871,6 +1873,15 @@ impl PddbOs {
|
||||||
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
||||||
}
|
}
|
||||||
// done!
|
// done!
|
||||||
|
if !summary_displayed { // no summary is displayed yet when the mount process is entirely skipped
|
||||||
|
let mut blist = String::from(t!("pddb.freespace.currentlist", xous::LANG));
|
||||||
|
for (_key, name) in ret.iter() {
|
||||||
|
blist.push_str("\n");
|
||||||
|
blist.push_str(name);
|
||||||
|
}
|
||||||
|
modals.show_notification(&blist, None).ok();
|
||||||
|
self.tt.sleep_ms(SWAP_DELAY_MS).unwrap();
|
||||||
|
}
|
||||||
if self.yes_no_approval(&modals, t!("pddb.freespace.finished", xous::LANG)) {
|
if self.yes_no_approval(&modals, t!("pddb.freespace.finished", xous::LANG)) {
|
||||||
Some(ret)
|
Some(ret)
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue