mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add status text to Sigchat::connect()
This commit is contained in:
parent
90aec71d33
commit
046873cec5
2 changed files with 31 additions and 5 deletions
|
|
@ -54,6 +54,18 @@
|
||||||
"ja": "WARNING: pddb not mounted *EN*",
|
"ja": "WARNING: pddb not mounted *EN*",
|
||||||
"zh": "WARNING: pddb not mounted *EN*"
|
"zh": "WARNING: pddb not mounted *EN*"
|
||||||
},
|
},
|
||||||
|
"sigchat.status.connecting": {
|
||||||
|
"en": "connecting",
|
||||||
|
"en-tts": "connecting"
|
||||||
|
},
|
||||||
|
"sigchat.status.offline": {
|
||||||
|
"en": "Signal offline",
|
||||||
|
"en-tts": "Signal offline"
|
||||||
|
},
|
||||||
|
"sigchat.status.online": {
|
||||||
|
"en": "Signal online",
|
||||||
|
"en-tts": "Signal online"
|
||||||
|
},
|
||||||
"sigchat.wifi.connected": {
|
"sigchat.wifi.connected": {
|
||||||
"en": "WiFi connected",
|
"en": "WiFi connected",
|
||||||
"en-tts": "WiFi connected",
|
"en-tts": "WiFi connected",
|
||||||
|
|
|
||||||
|
|
@ -54,20 +54,31 @@ impl<'a> SigChat<'a> {
|
||||||
log::info!("Setting up Signal Account Manager");
|
log::info!("Setting up Signal Account Manager");
|
||||||
let account = match Account::read(SIGCHAT_ACCOUNT) {
|
let account = match Account::read(SIGCHAT_ACCOUNT) {
|
||||||
Ok(account) => account,
|
Ok(account) => account,
|
||||||
Err(e) => self.account_setup()?,
|
Err(_) => self.account_setup()?,
|
||||||
};
|
};
|
||||||
|
self.chat
|
||||||
|
.set_status_text(t!("sigchat.status.connecting", locales::LANG));
|
||||||
|
self.chat.set_busy_state(true);
|
||||||
self.manager = Some(Manager::new(account, TrustMode::OnFirstUse));
|
self.manager = Some(Manager::new(account, TrustMode::OnFirstUse));
|
||||||
|
self.chat.set_busy_state(false);
|
||||||
}
|
}
|
||||||
if let Some(manager) = &self.manager {
|
if self.manager.is_some() {
|
||||||
log::info!("Signal Account Manager OK");
|
log::info!("Signal Account Manager OK");
|
||||||
|
self.chat
|
||||||
|
.set_status_text(t!("sigchat.status.online", locales::LANG));
|
||||||
|
Ok(true)
|
||||||
|
} else {
|
||||||
|
log::info!("failed to setup Signal Account Manager");
|
||||||
|
self.chat
|
||||||
|
.set_status_text(t!("sigchat.status.offline", locales::LANG));
|
||||||
|
Ok(false)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
self.modals
|
self.modals
|
||||||
.show_notification(t!("sigchat.wifi.warning", locales::LANG), None)
|
.show_notification(t!("sigchat.wifi.warning", locales::LANG), None)
|
||||||
.expect("notification failed");
|
.expect("notification failed");
|
||||||
|
Ok(false)
|
||||||
}
|
}
|
||||||
self.dialogue_set(None);
|
|
||||||
Ok(false)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Setup a Signal Account via Registration or Linking,
|
/// Setup a Signal Account via Registration or Linking,
|
||||||
|
|
@ -102,7 +113,10 @@ impl<'a> SigChat<'a> {
|
||||||
},
|
},
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("failed to present account setup radio buttons: {:?}", e);
|
log::warn!("failed to present account setup radio buttons: {:?}", e);
|
||||||
Err(Error::new(ErrorKind::Other, "failed to present account setup radio buttons"))
|
Err(Error::new(
|
||||||
|
ErrorKind::Other,
|
||||||
|
"failed to present account setup radio buttons",
|
||||||
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue