refactor Account.number

This commit is contained in:
nworbnhoj 2023-11-06 09:40:47 +13:00
parent 1cbe0c7488
commit 3a5f2e9fc0
2 changed files with 29 additions and 24 deletions

View file

@ -10,7 +10,7 @@ pub struct Account {
pddb: Pddb, pddb: Pddb,
pddb_dict: String, pddb_dict: String,
service_environment: ServiceEnvironment, service_environment: ServiceEnvironment,
number: String, number: Option<String>,
registered: bool, registered: bool,
} }
@ -19,7 +19,7 @@ const NUMBER_KEY: &str = "number";
const REGISTERED_KEY: &str = "registered"; const REGISTERED_KEY: &str = "registered";
impl Account { impl Account {
pub fn new(pddb_dict: &str, number: &str) -> Result<Account, Error> { pub fn new(pddb_dict: &str) -> Result<Account, Error> {
let pddb = pddb::Pddb::new(); let pddb = pddb::Pddb::new();
pddb.try_mount(); pddb.try_mount();
set( set(
@ -28,7 +28,6 @@ impl Account {
SERVICE_ENVIRONMENT_KEY, SERVICE_ENVIRONMENT_KEY,
Some(&ServiceEnvironment::Staging.to_string()), Some(&ServiceEnvironment::Staging.to_string()),
)?; )?;
set(&pddb, pddb_dict, NUMBER_KEY, Some(&number))?;
set(&pddb, pddb_dict, REGISTERED_KEY, Some(&false.to_string()))?; set(&pddb, pddb_dict, REGISTERED_KEY, Some(&false.to_string()))?;
Account::read(pddb_dict) Account::read(pddb_dict)
} }
@ -38,34 +37,33 @@ impl Account {
pddb.try_mount(); pddb.try_mount();
match ( match (
get(&pddb, pddb_dict, SERVICE_ENVIRONMENT_KEY), get(&pddb, pddb_dict, SERVICE_ENVIRONMENT_KEY),
get(&pddb, pddb_dict, NUMBER_KEY),
get(&pddb, pddb_dict, REGISTERED_KEY), get(&pddb, pddb_dict, REGISTERED_KEY),
) { ) {
(Ok(Some(service_environment)), Ok(Some(number)), Ok(Some(registered))) => { (Ok(Some(service_environment)), Ok(Some(registered))) => Ok(Account {
Ok(Account {
pddb: pddb, pddb: pddb,
pddb_dict: pddb_dict.to_string(), pddb_dict: pddb_dict.to_string(),
service_environment: ServiceEnvironment::from_str(&service_environment) service_environment: ServiceEnvironment::from_str(&service_environment).unwrap(),
.unwrap(), number: None,
number: number,
registered: registered.parse().unwrap(), registered: registered.parse().unwrap(),
}) }),
} (Err(e), _) => Err(e),
(Err(e), _, _) => Err(e), (_, Err(e)) => Err(e),
(_, Err(e), _) => Err(e), (_, _) => Err(Error::from(ErrorKind::InvalidData)),
(_, _, Err(e)) => Err(e),
(_, _, _) => Err(Error::from(ErrorKind::InvalidData)),
} }
} }
pub fn number(&self) -> &str { #[allow(dead_code)]
&self.number pub fn number(&self) -> Option<&str> {
match &self.number {
Some(num) => Some(&num),
None => None,
}
} }
#[allow(dead_code)] #[allow(dead_code)]
pub fn set_number(&mut self, value: &str) -> Result<(), Error> { pub fn set_number(&mut self, value: &str) -> Result<(), Error> {
match self.set(NUMBER_KEY, Some(value)) { 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}"), Err(e) => log::warn!("failed to set signal account number: {e}"),
} }
Ok(()) Ok(())

View file

@ -53,7 +53,7 @@ impl<'a> SigChat<'a> {
if self.manager.is_none() { if self.manager.is_none() {
self.account_setup(); self.account_setup();
} }
if let Some(manager) = &self.manager { if let Some(_manager) = &self.manager {
log::info!("Signal manager OK" ); log::info!("Signal manager OK" );
} else { } else {
self.modals self.modals
@ -115,8 +115,15 @@ impl<'a> SigChat<'a> {
match self.number_modal() { match self.number_modal() {
Ok(number) => { Ok(number) => {
log::info!("registration phone number = {:?}", number); log::info!("registration phone number = {:?}", number);
match Account::new(SIGCHAT_ACCOUNT, &number.to_string()) { match Account::new(SIGCHAT_ACCOUNT) {
Ok(account) => self.account = Some(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}"), Err(e) => log::warn!("failed to create new Account: {e}"),
} }
} }