X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ff6b733cd0448c05f4be5aad32895cc8c748ee79..0309c85c6a0307d7bb2db63c40f99c7c44a61468:/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 e0f1084b..7519950e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -23,10 +23,10 @@ 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;
@@ -37,6 +37,7 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.channels.OverlappingFileLockException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
@@ -73,12 +74,13 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         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;
         }
         accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
-                new DynamicCredentialsProvider(null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
+                new DynamicCredentialsProvider(null, null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
                 userAgent,
                 groupsV2Operations,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
@@ -96,6 +98,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         var ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
         var number = ret.getNumber();
         var aci = ret.getAci();
+        var pni = ret.getPni();
 
         logger.info("Received link information from {}, linking in progress ...", number);
 
@@ -116,7 +119,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
         var encryptedDeviceName = deviceName == null
                 ? null
-                : DeviceNameUtil.encryptDeviceName(deviceName, ret.getIdentity().getPrivateKey());
+                : DeviceNameUtil.encryptDeviceName(deviceName, ret.getAciIdentity().getPrivateKey());
 
         logger.debug("Finishing new device registration");
         var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
@@ -134,10 +137,12 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     accountPath,
                     number,
                     aci,
+                    pni,
                     password,
                     encryptedDeviceName,
                     deviceId,
-                    ret.getIdentity(),
+                    ret.getAciIdentity(),
+                    ret.getPniIdentity(),
                     registrationId,
                     profileKey,
                     TrustNewIdentity.ON_FIRST_USE);
@@ -194,6 +199,9 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         } catch (IOException e) {
             logger.debug("Account in use or failed to load.", e);
             return false;
+        } catch (OverlappingFileLockException e) {
+            logger.debug("Account in use.", e);
+            return false;
         }
 
         try (signalAccount) {