mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
add more wait states around long-run ops
This commit is contained in:
parent
cdada99705
commit
29fe24728c
2 changed files with 30 additions and 9 deletions
|
|
@ -11,6 +11,18 @@
|
||||||
"en": "Sending...",
|
"en": "Sending...",
|
||||||
"en-tts": "Sending..."
|
"en-tts": "Sending..."
|
||||||
},
|
},
|
||||||
|
"mtxchat.busy.room_id": {
|
||||||
|
"en": "Getting room ID...",
|
||||||
|
"en-tts": "Getting room ID..."
|
||||||
|
},
|
||||||
|
"mtxchat.busy.login": {
|
||||||
|
"en": "Logging in...",
|
||||||
|
"en-tts": "Logging in..."
|
||||||
|
},
|
||||||
|
"mtxchat.busy.new_listen": {
|
||||||
|
"en": "Syncing all events from server...",
|
||||||
|
"en-tts": "Syncing all events from server..."
|
||||||
|
},
|
||||||
"mtxchat.clock.warning": {
|
"mtxchat.clock.warning": {
|
||||||
"en": "WARNING: clock not set",
|
"en": "WARNING: clock not set",
|
||||||
"en-tts": "WARNING: clock not set",
|
"en-tts": "WARNING: clock not set",
|
||||||
|
|
@ -245,10 +257,6 @@
|
||||||
"en": "No connection! Read-only.",
|
"en": "No connection! Read-only.",
|
||||||
"en-tts": "No connection! Read-only."
|
"en-tts": "No connection! Read-only."
|
||||||
},
|
},
|
||||||
"mtxchat.listen.patience": {
|
|
||||||
"en": "It takes a while to get new events from the [matrix] server.\nPlease be patient :-)",
|
|
||||||
"en-tts": "It takes a while to get new events from the [matrix] server.\nPlease be patient."
|
|
||||||
},
|
|
||||||
"mtxchat.close.item": {
|
"mtxchat.close.item": {
|
||||||
"en": "Close menu",
|
"en": "Close menu",
|
||||||
"en-tts": "Close menu"
|
"en-tts": "Close menu"
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ const DOMAIN_MATRIX: &str = "matrix.org";
|
||||||
|
|
||||||
const MTX_LONG_TIMEOUT_MS: i32 = 60000; // ms
|
const MTX_LONG_TIMEOUT_MS: i32 = 60000; // ms
|
||||||
const WIFI_TIMEOUT_MS: u32 = 30_000; // ms
|
const WIFI_TIMEOUT_MS: u32 = 30_000; // ms
|
||||||
|
const SEND_RETRIES: usize = 3;
|
||||||
|
|
||||||
pub const CLOCK_NOT_SET_ID: usize = 1;
|
pub const CLOCK_NOT_SET_ID: usize = 1;
|
||||||
pub const PDDB_NOT_MOUNTED_ID: usize = 2;
|
pub const PDDB_NOT_MOUNTED_ID: usize = 2;
|
||||||
|
|
@ -255,9 +256,8 @@ impl<'a> MtxChat<'a> {
|
||||||
self.listen();
|
self.listen();
|
||||||
if self.new_room {
|
if self.new_room {
|
||||||
self.new_room = false;
|
self.new_room = false;
|
||||||
self.modals
|
self.chat.set_status_text(t!("mtxchat.busy.new_listen", locales::LANG));
|
||||||
.show_notification(t!("mtxchat.listen.patience", locales::LANG), None)
|
self.chat.set_busy_state(true);
|
||||||
.expect("notification failed");
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -284,7 +284,7 @@ impl<'a> MtxChat<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn login(&mut self) -> bool {
|
pub fn login(&mut self) -> bool {
|
||||||
self.chat.set_status_text(t!("mtxchat.busy.connecting", locales::LANG));
|
self.chat.set_status_text(t!("mtxchat.busy.login", locales::LANG));
|
||||||
self.chat.set_busy_state(true);
|
self.chat.set_busy_state(true);
|
||||||
self.token = self.get(TOKEN_KEY).unwrap_or(None);
|
self.token = self.get(TOKEN_KEY).unwrap_or(None);
|
||||||
self.logged_in = false;
|
self.logged_in = false;
|
||||||
|
|
@ -444,12 +444,18 @@ impl<'a> MtxChat<'a> {
|
||||||
(true, Some(token), Some(user_domain), Some(room_alias)) => {
|
(true, Some(token), Some(user_domain), Some(room_alias)) => {
|
||||||
let mut url = Url::parse("https://matrix.org").unwrap();
|
let mut url = Url::parse("https://matrix.org").unwrap();
|
||||||
url.set_host(Some(user_domain)).expect("failed to set host");
|
url.set_host(Some(user_domain)).expect("failed to set host");
|
||||||
|
self.chat.set_status_text(t!("mtxchat.busy.room_id", locales::LANG));
|
||||||
|
self.chat.set_busy_state(true);
|
||||||
if let Some(room_id) =
|
if let Some(room_id) =
|
||||||
web::get_room_id(&mut url, &room_alias, &token, &mut self.agent)
|
web::get_room_id(&mut url, &room_alias, &token, &mut self.agent)
|
||||||
{
|
{
|
||||||
self.set_debug(ROOM_ID_KEY, &room_id);
|
self.set_debug(ROOM_ID_KEY, &room_id);
|
||||||
|
self.chat.set_status_text(&self.status);
|
||||||
|
self.chat.set_busy_state(false);
|
||||||
return Some(room_id);
|
return Some(room_id);
|
||||||
} else {
|
} else {
|
||||||
|
self.chat.set_status_text(&self.status);
|
||||||
|
self.chat.set_busy_state(false);
|
||||||
"failed to get room_id"
|
"failed to get room_id"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -642,7 +648,14 @@ impl<'a> MtxChat<'a> {
|
||||||
log::info!("txn_id = {}", txn_id);
|
log::info!("txn_id = {}", txn_id);
|
||||||
let mut url = Url::parse("https://matrix.org").unwrap();
|
let mut url = Url::parse("https://matrix.org").unwrap();
|
||||||
url.set_host(Some(user_domain)).expect("failed to set host");
|
url.set_host(Some(user_domain)).expect("failed to set host");
|
||||||
let r = if web::send_message(&mut url, &room_id, &text, &txn_id, token, &mut self.agent) {
|
let mut success = false;
|
||||||
|
for _ in 0..SEND_RETRIES {
|
||||||
|
if web::send_message(&mut url, &room_id, &text, &txn_id, token, &mut self.agent) {
|
||||||
|
success = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let r = if success {
|
||||||
"SENT"
|
"SENT"
|
||||||
} else {
|
} else {
|
||||||
"FAILED TO SEND"
|
"FAILED TO SEND"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue