clean up connect to networks on boot flow

This commit is contained in:
bunnie 2022-11-23 05:43:11 +08:00
parent c48e29fb2c
commit 816b3683c5
3 changed files with 24 additions and 6 deletions

View file

@ -522,6 +522,13 @@
"ja": "自動でWiFiに接続",
"zh": "自动连接WiFi"
},
"prefs.current_setting": {
"en": "Current setting:",
"en-tts": "Current setting:",
"fr": "Paramètre actuel *MT*",
"ja": "現在の設定",
"zh": "当前设置"
},
"prefs.yes": {
"en": "Yes",
"en-tts": "Yes",

View file

@ -395,7 +395,7 @@ fn wrapped_main() -> ! {
log::error!("cannot set radio status: {:?}", error)
});
match all_prefs.connect_known_networks_on_boot {
match prefs.connect_known_networks_on_boot_or_value(true).unwrap() {
true => netmgr.connection_manager_run(),
false => netmgr.connection_manager_stop(),
}.unwrap_or_else(|error| {

View file

@ -99,6 +99,7 @@ struct DevicePrefs {
menu_manager_sid: xous::SID,
menu_global_conn: xous::CID,
status_cid: xous::CID,
netmgr: net::NetManager,
}
impl PrefHandler for DevicePrefs {
@ -172,6 +173,7 @@ impl DevicePrefs {
menu_manager_sid,
menu_global_conn: menu_conn,
status_cid: status_conn,
netmgr: net::NetManager::new(),
}
}
@ -245,7 +247,8 @@ impl DevicePrefs {
let new_result = yes_no_to_bool( // inversion of storage sense: false = on
self.modals
.get_radiobutton(&format!("Current status: {}", bool_to_yes_no(cv)))
.get_radiobutton(&format!("{} {}", t!("prefs.current_setting", xous::LANG),
bool_to_yes_no(cv)))
.unwrap()
.as_str(),
);
@ -307,22 +310,29 @@ impl DevicePrefs {
let new_result = yes_no_to_bool(
self.modals
.get_radiobutton(&format!("Current status: {}", bool_to_yes_no(cv)))
.get_radiobutton(&format!("{} {}", t!("prefs.current_setting", xous::LANG),
bool_to_yes_no(cv)))
.unwrap()
.as_str(),
);
if cv {
self.netmgr.connection_manager_run().ok();
} else {
self.netmgr.connection_manager_stop().ok();
}
Ok(self.up.set_radio_on_on_boot(new_result)?)
}
fn connect_known_networks_on_boot(&mut self) -> Result<(), DevicePrefsError> {
let cv = self.up.connect_known_networks_on_boot_or_default()?;
let cv = self.up.connect_known_networks_on_boot_or_value(true)?;
self.modals.add_list(vec![t!("prefs.yes", xous::LANG), t!("prefs.no", xous::LANG)]).unwrap();
let new_result = yes_no_to_bool(
self.modals
.get_radiobutton(&format!("Current status: {}", bool_to_yes_no(cv)))
.get_radiobutton(&format!("{} {}", t!("prefs.current_setting", xous::LANG),
bool_to_yes_no(cv)))
.unwrap()
.as_str(),
);
@ -382,7 +392,8 @@ impl DevicePrefs {
let new_result = self
.modals
.get_radiobutton(&format!("Current layout: {}", keyboard::KeyMap::from(kl)))
.get_radiobutton(&format!("{} {}", t!("prefs.current_setting", xous::LANG),
keyboard::KeyMap::from(kl)))
.unwrap();
let new_result = match mappings