implement sigchat host_modal() with validation

This commit is contained in:
nworbnhoj 2023-12-29 07:41:41 +11:00
parent 7346f03c1a
commit fa66cdfc01
2 changed files with 44 additions and 8 deletions

View file

@ -35,6 +35,10 @@
"en": "Setup Signal on this device.", "en": "Setup Signal on this device.",
"en-tts": "Setup Signal on this device." "en-tts": "Setup Signal on this device."
}, },
"sigchat.host.invalid": {
"en": "Invalid host format",
"en-tts": "Invalid host format"
},
"sigchat.menu.close": { "sigchat.menu.close": {
"en": "Close menu", "en": "Close menu",
"en-tts": "Close menu" "en-tts": "Close menu"

View file

@ -120,10 +120,7 @@ impl<'a> SigChat<'a> {
match self.modals.get_radio_index() { match self.modals.get_radio_index() {
Ok(index) => match index { Ok(index) => match index {
0 => { 0 => {
let host = self.name_modal( let host = self.host_modal();
DEFAULT_HOST_NAME,
t!("sigchat.account.host.name", locales::LANG),
);
match self.probe_host(&host) { match self.probe_host(&host) {
true => Ok(self.account_link(&host)?), true => Ok(self.account_link(&host)?),
false => Err(Error::new( false => Err(Error::new(
@ -133,10 +130,7 @@ impl<'a> SigChat<'a> {
} }
} }
1 => { 1 => {
let host = self.name_modal( let host = self.host_modal();
DEFAULT_HOST_NAME,
t!("sigchat.account.host.name", locales::LANG),
);
match self.probe_host(&host) { match self.probe_host(&host) {
true => Ok(self.account_register(&host)?), true => Ok(self.account_register(&host)?),
false => Err(Error::new( false => Err(Error::new(
@ -164,6 +158,44 @@ impl<'a> SigChat<'a> {
} }
} }
/// Prompt for a host name from the user
///
/// # Returns
///
/// the host provided by the user
///
fn host_modal(&self) -> Host {
let mut host = None;
while host.is_none() {
host = match self
.modals
.alert_builder(t!("sigchat.account.host.name", locales::LANG))
.field(Some(DEFAULT_HOST_NAME.to_string()), None)
.build()
{
Ok(text) => match Host::parse(&text.content()[0].content.to_string()) {
Ok(host) => match host {
Host::Domain(..) => Some(host),
_ => {
self.modals
.show_notification(t!("sigchat.host.invalid", locales::LANG), None)
.expect("notification failed");
None
}
},
Err(_) => {
self.modals
.show_notification(t!("sigchat.host.invalid", locales::LANG), None)
.expect("notification failed");
None
}
},
_ => Host::parse(DEFAULT_HOST_NAME).ok(),
}
}
host.unwrap()
}
/// Probe host for tls Certificate Authority chain of trust /// Probe host for tls Certificate Authority chain of trust
/// ///
/// # Arguments /// # Arguments