X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f3b2df62dae51496c8c5c9c85ac5a3951ea27978..e655f62704b31a9d18c7df0d966a8e32069990b0:/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index 75163555..17569401 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -23,16 +23,17 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.ConfirmCodeMessage;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
@@ -54,6 +55,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
     private final SignalServiceAccountManager accountManager;
     private final IdentityKeyPair tempIdentityKey;
     private final int registrationId;
+    private final int pniRegistrationId;
     private final String password;
 
     ProvisioningManagerImpl(
@@ -71,10 +73,12 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         registrationId = KeyHelper.generateRegistrationId(false);
+        pniRegistrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
         GroupsV2Operations groupsV2Operations;
         try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                    ServiceConfig.GROUP_MAX_SIZE);
         } catch (Throwable ignored) {
             groupsV2Operations = null;
         }
@@ -122,10 +126,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
         logger.debug("Finishing new device registration");
         var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
-                false,
-                true,
-                registrationId,
-                encryptedDeviceName);
+                new ConfirmCodeMessage(false, true, registrationId, pniRegistrationId, encryptedDeviceName, null));
 
         // Create new account with the synced identity
         var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
@@ -135,6 +136,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
             account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
                     accountPath,
                     number,
+                    serviceEnvironmentConfig.getType(),
                     aci,
                     pni,
                     password,
@@ -143,15 +145,15 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
                     registrationId,
+                    pniRegistrationId,
                     profileKey,
                     TrustNewIdentity.ON_FIRST_USE);
 
             ManagerImpl m = null;
             try {
-                final var accountPathFinal = accountPath;
                 m = new ManagerImpl(account,
                         pathConfig,
-                        (newNumber, newAci) -> accountsStore.updateAccount(accountPathFinal, newNumber, newAci),
+                        new AccountFileUpdaterImpl(accountsStore, accountPath),
                         serviceEnvironmentConfig,
                         userAgent);
                 account = null;
@@ -160,7 +162,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                 try {
                     m.refreshPreKeys();
                 } catch (Exception e) {
-                    logger.error("Failed to refresh pre keys.");
+                    logger.error("Failed to refresh pre keys.", e);
                 }
 
                 logger.debug("Requesting sync data");
@@ -168,7 +170,8 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     m.requestAllSyncData();
                 } catch (Exception e) {
                     logger.error(
-                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.");
+                            "Failed to request sync messages from linked device, data can be requested again with `sendSyncRequest`.",
+                            e);
                 }
 
                 if (newManagerListener != null) {
@@ -204,14 +207,21 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         }
 
         try (signalAccount) {
-            if (signalAccount.isMasterDevice()) {
-                logger.debug("Account is a master device.");
+            if (signalAccount.isPrimaryDevice()) {
+                logger.debug("Account is a primary device.");
+                return false;
+            }
+            if (signalAccount.isRegistered()
+                    && signalAccount.getServiceEnvironment() != null
+                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
+                logger.debug("Account is registered in another environment: {}.",
+                        signalAccount.getServiceEnvironment());
                 return false;
             }
 
             final var m = new ManagerImpl(signalAccount,
                     pathConfig,
-                    (newNumber, newAci) -> accountsStore.updateAccount(accountPath, newNumber, newAci),
+                    new AccountFileUpdaterImpl(accountsStore, accountPath),
                     serviceEnvironmentConfig,
                     userAgent);
             try (m) {