From 1cbe0c74889f5aeda11cf68c52134911238f3215 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Mon, 6 Nov 2023 09:28:13 +1300 Subject: [PATCH] refactor Manager.account --- apps/sigchat/src/lib.rs | 18 ++++++++---------- apps/sigchat/src/manager.rs | 8 ++++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/apps/sigchat/src/lib.rs b/apps/sigchat/src/lib.rs index 37e4c8981..b95a089a0 100644 --- a/apps/sigchat/src/lib.rs +++ b/apps/sigchat/src/lib.rs @@ -23,8 +23,8 @@ pub const HOSTED_MODE: bool = false; //#[derive(Debug)] pub struct SigChat<'a> { - account: Option, chat: &'a Chat, + manager: Option, netmgr: net::NetManager, modals: Modals, } @@ -35,8 +35,11 @@ impl<'a> SigChat<'a> { let pddb = pddb::Pddb::new(); pddb.try_mount(); SigChat { - account: Account::read(SIGCHAT_ACCOUNT).ok(), chat: chat, + manager: match Account::read(SIGCHAT_ACCOUNT) { + Ok(account) => Some(Manager::new(account, TrustMode::OnFirstUse)), + Err(_) => None, + }, netmgr: net::NetManager::new(), modals: modals, } @@ -47,16 +50,11 @@ impl<'a> SigChat<'a> { pub fn connect(&mut self) -> bool { log::info!("Attempting connect to Signal server"); if self.wifi() { - if self.account.is_none() { + if self.manager.is_none() { self.account_setup(); } - if let Some(account) = &self.account { - log::info!( - "Signal account OK: {}: {}", - self.account.is_some(), - self.account.as_ref().unwrap().number() - ); - let _manager = Manager::new(&account, TrustMode::OnFirstUse); + if let Some(manager) = &self.manager { + log::info!("Signal manager OK" ); } else { self.modals .show_notification(t!("sigchat.account.failed", locales::LANG), None) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index cd597963c..04c723b97 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -13,22 +13,22 @@ pub use trust_mode::TrustMode; // see signal-cli Manual Page - https://github.com/AsamK/signal-cli/blob/master/man/signal-cli.1.adoc #[allow(dead_code)] -pub struct Manager<'a> { - account: &'a Account, +pub struct Manager { + account:Account, trust_mode: TrustMode, log_verbose: bool, log_scrub: bool, log_send: bool, } -impl <'a> Manager<'a> { +impl Manager { /// Create a new Signal account /// /// # Arguments /// * `live` - Specify the server environment /// * `account` - Specify your phone number, that will be your identifier. The phone number must include the country calling code, i.e. the number must start with a "+" sign. /// - pub fn new(account: &Account, trust_mode: TrustMode) -> Manager { + pub fn new(account: Account, trust_mode: TrustMode) -> Manager { Manager { account, trust_mode,