diff --git a/apps/sigchat/src/account.rs b/apps/sigchat/src/account.rs index 6449f3845..9988767d6 100644 --- a/apps/sigchat/src/account.rs +++ b/apps/sigchat/src/account.rs @@ -1,6 +1,6 @@ mod service_environment; -use crate::manager::libsignal::{DeviceNameUtil, ProvisionMessage}; +use crate::manager::libsignal::{DeviceNameUtil, ProvisionMessage, SignalServiceAddress}; use pddb::Pddb; pub use service_environment::ServiceEnvironment; use std::io::{Error, ErrorKind, Read, Write}; @@ -231,16 +231,36 @@ impl Account { Ok(()) } + /// link to an existing Signal Account as a secondary device + /// + /// Confirm that the state of the Signal Account is OK before linking + /// https://github.com/AsamK/signal-cli/blob/375bdb79485ec90beb9a154112821a4657740b7a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java#L200-L239 + /// + /// # Arguments + /// + /// * `device_name` - name to describe this new device + /// * `provisioning_msg` - obtained from the Signal server + /// + /// # Returns + /// + /// true on success + /// pub fn link( &mut self, device_name: &str, provisioning_msg: ProvisionMessage, ) -> Result { - // TODO complete link pre-checks // Check if this device can be relinked - // check not primary - // check not registered in another environment - // check account state with server + if self.is_primary_device() { + log::warn!("failed to link device as already registered as primary"); + return Ok(false); + } + // TODO complete link pre-checks + // } else if self.is_registered() + // && self.service_environment() != provisioning_msg.service_environment{ + // log::warn!("failed to link device as already registered in different Service Environment"); + // return Ok(false); + // } let aci = provisioning_msg.aci; self.set(ACI_IDENTITY_PRIVATE_KEY, Some(&aci.djb_private_key.key))?; @@ -277,6 +297,7 @@ impl Account { self.set(STORE_MANIFEST_KEY, None)?; // TODO complete registration setup + // https://github.com/AsamK/signal-cli/blob/375bdb79485ec90beb9a154112821a4657740b7a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java#L270-L306 // getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress()); // getSenderKeyStore().deleteAll(); // trustSelfIdentity(ServiceIdType.ACI); @@ -286,13 +307,21 @@ impl Account { // clearAllPreKeys(); // getKeyValueStore().storeEntry(lastRecipientsRefresh, null); - Ok(false) + Ok(true) } pub fn host(&self) -> &Host { &self.host } + pub fn is_primary_device(&self) -> bool { + self.device_id == SignalServiceAddress::DEFAULT_DEVICE_ID + } + + pub fn is_registered(&self) -> bool { + self.registered + } + #[allow(dead_code)] pub fn number(&self) -> Option<&str> { match &self.number { diff --git a/apps/sigchat/src/manager/libsignal.rs b/apps/sigchat/src/manager/libsignal.rs index 5b29e753d..1df181e8f 100644 --- a/apps/sigchat/src/manager/libsignal.rs +++ b/apps/sigchat/src/manager/libsignal.rs @@ -1,6 +1,15 @@ // this is a stub for a wrapped libsignal -// org.whispersystems.signalservice.api.util.DeviceNameUtil; + +// use org.whispersystems.signalservice.api.push.SignalServiceAddress; +pub struct SignalServiceAddress {} +impl SignalServiceAddress { + pub const DEFAULT_DEVICE_ID: u32 = 0; +} + +//////////////////////////////////////////////////////// + +// use org.whispersystems.signalservice.api.util.DeviceNameUtil; pub struct DeviceNameUtil {} impl DeviceNameUtil { pub fn encrypt_device_name(_device_name: &str, _aci_private_key: IdentityKey) -> String {