Adapt log level when using system locale

[signal-cli] / 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 0c61764649197206063b6da9481c607afe3ded26..17569401ba1c0933bf42b9e3fcf31bf96f8ad52e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -33,6 +33,7 @@ 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,6 +73,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         registrationId = KeyHelper.generateRegistrationId(false);
+        pniRegistrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
         GroupsV2Operations groupsV2Operations;
         try {
@@ -123,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();
@@ -145,6 +145,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
                     registrationId,
+                    pniRegistrationId,
                     profileKey,
                     TrustNewIdentity.ON_FIRST_USE);
 
@@ -161,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");
@@ -169,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) {