From 404dc29fecf5d443144fb47d8b0cfbc05e09340f Mon Sep 17 00:00:00 2001
From: nworbnhoj <john@nhoj.info>
Date: Thu, 7 Dec 2023 18:13:47 +1100
Subject: [PATCH] include Signal registered Number in Account::read()

---
 apps/sigchat/src/account.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/sigchat/src/account.rs b/apps/sigchat/src/account.rs
index eacabb8f0..b8fc5f16b 100644
--- a/apps/sigchat/src/account.rs
+++ b/apps/sigchat/src/account.rs
@@ -38,17 +38,19 @@ impl Account {
         match (
             get(&pddb, pddb_dict, SERVICE_ENVIRONMENT_KEY),
             get(&pddb, pddb_dict, REGISTERED_KEY),
+            get(&pddb, pddb_dict, NUMBER_KEY),
         ) {
-            (Ok(Some(service_environment)), Ok(Some(registered))) => Ok(Account {
+            (Ok(Some(service_environment)), Ok(Some(registered)), Ok(number)) => Ok(Account {
                 pddb: pddb,
                 pddb_dict: pddb_dict.to_string(),
                 service_environment: ServiceEnvironment::from_str(&service_environment).unwrap(),
-                number: None,
+                number: number,
                 registered: registered.parse().unwrap(),
             }),
-            (Err(e), _) => Err(e),
-            (_, Err(e)) => Err(e),
-            (_, _) => Err(Error::from(ErrorKind::InvalidData)),
+            (Err(e), _, _) => Err(e),
+            (_, Err(e), _) => Err(e),
+            (_, _, Err(e)) => Err(e),
+            (_, _, _) => Err(Error::from(ErrorKind::InvalidData)),
         }
     }