From 2be426131c648757c66724724dea77f2cbc90a82 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Mon, 11 Dec 2023 06:21:07 +1100 Subject: [PATCH] add sigchat busy status text --- apps/sigchat/locales/i18n.json | 4 ++++ apps/sigchat/src/lib.rs | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/sigchat/locales/i18n.json b/apps/sigchat/locales/i18n.json index 4e12facc8..3d9df3197 100644 --- a/apps/sigchat/locales/i18n.json +++ b/apps/sigchat/locales/i18n.json @@ -74,6 +74,10 @@ "en": "Signal online", "en-tts": "Signal online" }, + "sigchat.status.probing": { + "en": "probing host for trusted tls", + "en-tts": "probing host for trusted tls" + }, "sigchat.wifi.connected": { "en": "WiFi connected", "en-tts": "WiFi connected", diff --git a/apps/sigchat/src/lib.rs b/apps/sigchat/src/lib.rs index fe0f95466..46793d67b 100644 --- a/apps/sigchat/src/lib.rs +++ b/apps/sigchat/src/lib.rs @@ -172,16 +172,24 @@ impl<'a> SigChat<'a> { /// true if at least 1 Certificate Authority is trusted /// fn probe_host(&self, host: &str) -> bool { + self.chat + .set_status_text(t!("sigchat.status.probing", locales::LANG)); + self.chat.set_busy_state(true); let tls = Tls::new(); match tls.probe(host) { Ok(0) => { self.modals .show_notification(t!("sigchat.account.abort", locales::LANG), None) .expect("abort failed"); + self.chat.set_busy_state(false); false } - Ok(_count) => true, + Ok(_count) => { + self.chat.set_busy_state(false); + true + } Err(e) => { + self.chat.set_busy_state(false); self.modals .show_notification(&format!("{}", e), None) .expect("qrcode failed"); @@ -213,18 +221,24 @@ impl<'a> SigChat<'a> { DEFAULT_DEVICE_NAME, t!("sigchat.account.link.name", locales::LANG), ); + self.chat + .set_status_text(t!("sigchat.status.connecting", locales::LANG)); + self.chat.set_busy_state(true); match manager.link(Some(&name), Some(&host)) { Ok(true) => { log::info!("Linked Signal Account"); + self.chat.set_busy_state(false); } Ok(false) => { log::info!("failed to link Signal Account"); + self.chat.set_busy_state(false); } Err(e) => { log::warn!("error while linking Signal Account: {e}"); Account::delete(SIGCHAT_ACCOUNT).unwrap_or_else(|e| { log::warn!("failed to delete unregistered account from pddb: {e}") }); + self.chat.set_busy_state(false); self.modals .show_notification(&format!("{}", e), None) .expect("notification failed");