From 3a5f2e9fc05a178bed52be3e1b3fe0ccf936de9c Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Mon, 6 Nov 2023 09:40:47 +1300 Subject: [PATCH] refactor Account.number --- apps/sigchat/src/account.rs | 40 ++++++++++++++++++------------------- apps/sigchat/src/lib.rs | 13 +++++++++--- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/apps/sigchat/src/account.rs b/apps/sigchat/src/account.rs index 05b58aa89..eacabb8f0 100644 --- a/apps/sigchat/src/account.rs +++ b/apps/sigchat/src/account.rs @@ -10,7 +10,7 @@ pub struct Account { pddb: Pddb, pddb_dict: String, service_environment: ServiceEnvironment, - number: String, + number: Option, registered: bool, } @@ -19,7 +19,7 @@ const NUMBER_KEY: &str = "number"; const REGISTERED_KEY: &str = "registered"; impl Account { - pub fn new(pddb_dict: &str, number: &str) -> Result { + pub fn new(pddb_dict: &str) -> Result { let pddb = pddb::Pddb::new(); pddb.try_mount(); set( @@ -28,7 +28,6 @@ impl Account { SERVICE_ENVIRONMENT_KEY, Some(&ServiceEnvironment::Staging.to_string()), )?; - set(&pddb, pddb_dict, NUMBER_KEY, Some(&number))?; set(&pddb, pddb_dict, REGISTERED_KEY, Some(&false.to_string()))?; Account::read(pddb_dict) } @@ -38,34 +37,33 @@ impl Account { pddb.try_mount(); match ( get(&pddb, pddb_dict, SERVICE_ENVIRONMENT_KEY), - get(&pddb, pddb_dict, NUMBER_KEY), get(&pddb, pddb_dict, REGISTERED_KEY), ) { - (Ok(Some(service_environment)), Ok(Some(number)), Ok(Some(registered))) => { - Ok(Account { - pddb: pddb, - pddb_dict: pddb_dict.to_string(), - service_environment: ServiceEnvironment::from_str(&service_environment) - .unwrap(), - number: number, - registered: registered.parse().unwrap(), - }) - } - (Err(e), _, _) => Err(e), - (_, Err(e), _) => Err(e), - (_, _, Err(e)) => Err(e), - (_, _, _) => Err(Error::from(ErrorKind::InvalidData)), + (Ok(Some(service_environment)), Ok(Some(registered))) => Ok(Account { + pddb: pddb, + pddb_dict: pddb_dict.to_string(), + service_environment: ServiceEnvironment::from_str(&service_environment).unwrap(), + number: None, + registered: registered.parse().unwrap(), + }), + (Err(e), _) => Err(e), + (_, Err(e)) => Err(e), + (_, _) => Err(Error::from(ErrorKind::InvalidData)), } } - pub fn number(&self) -> &str { - &self.number + #[allow(dead_code)] + pub fn number(&self) -> Option<&str> { + match &self.number { + Some(num) => Some(&num), + None => None, + } } #[allow(dead_code)] pub fn set_number(&mut self, value: &str) -> Result<(), Error> { match self.set(NUMBER_KEY, Some(value)) { - Ok(_) => self.number = value.to_string(), + Ok(_) => self.number = Some(value.to_string()), Err(e) => log::warn!("failed to set signal account number: {e}"), } Ok(()) diff --git a/apps/sigchat/src/lib.rs b/apps/sigchat/src/lib.rs index b95a089a0..4b2414c6f 100644 --- a/apps/sigchat/src/lib.rs +++ b/apps/sigchat/src/lib.rs @@ -53,7 +53,7 @@ impl<'a> SigChat<'a> { if self.manager.is_none() { self.account_setup(); } - if let Some(manager) = &self.manager { + if let Some(_manager) = &self.manager { log::info!("Signal manager OK" ); } else { self.modals @@ -115,8 +115,15 @@ impl<'a> SigChat<'a> { match self.number_modal() { Ok(number) => { log::info!("registration phone number = {:?}", number); - match Account::new(SIGCHAT_ACCOUNT, &number.to_string()) { - Ok(account) => self.account = Some(account), + match Account::new(SIGCHAT_ACCOUNT) { + Ok(mut account) => { + match account.set_number(&number.to_string()) { + Ok(_number) => { + self.manager = Some(Manager::new(account, TrustMode::OnFirstUse)); + } + Err(e) => log::warn!("failed to set Account number: {e}"), + } + } Err(e) => log::warn!("failed to create new Account: {e}"), } }