Update libsignal

[signal-cli] / src / main / java / org / asamk / signal / manager / ProvisioningManager.java

diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index 95e92c7aef106ad1aeba3c74a820c22f4d1bdf43..0c26cf77964ffe4ebed3a1994ed402d62ff846a8 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2015-2020 AsamK and contributors
+  Copyright (C) 2015-2021 AsamK and contributors
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,8 +17,11 @@
 package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.zkgroup.InvalidInputException;
 import org.signal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.libsignal.util.KeyHelper;
@@ -37,6 +40,8 @@ import java.util.concurrent.TimeoutException;
 
 public class ProvisioningManager {
 
+    private final static Logger logger = LoggerFactory.getLogger(ProvisioningManager.class);
+
     private final PathConfig pathConfig;
     private final SignalServiceConfiguration serviceConfiguration;
     private final String userAgent;
@@ -51,7 +56,7 @@ public class ProvisioningManager {
         this.serviceConfiguration = serviceConfiguration;
         this.userAgent = userAgent;
 
-        identityKey = KeyHelper.generateIdentityKeyPair();
+        identityKey = KeyUtils.generateIdentityKeyPair();
         registrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
         final SleepTimer timer = new UptimeSleepTimer();
@@ -65,14 +70,14 @@ public class ProvisioningManager {
                 new DynamicCredentialsProvider(null, null, password, null, SignalServiceAddress.DEFAULT_DEVICE_ID),
                 userAgent,
                 groupsV2Operations,
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
                 timer);
     }
 
     public String getDeviceLinkUri() throws TimeoutException, IOException {
         String deviceUuid = accountManager.getNewDeviceUuid();
 
-        return Utils.createDeviceLinkUri(new Utils.DeviceLinkInfo(deviceUuid,
-                identityKey.getPublicKey().getPublicKey()));
+        return new DeviceLinkInfo(deviceUuid, identityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
     public String finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
@@ -117,15 +122,28 @@ public class ProvisioningManager {
 
             try (Manager m = new Manager(account, pathConfig, serviceConfiguration, userAgent)) {
 
-                m.refreshPreKeys();
-
-                m.requestSyncGroups();
-                m.requestSyncContacts();
-                m.requestSyncBlocked();
-                m.requestSyncConfiguration();
-
-                m.saveAccount();
+                try {
+                    m.refreshPreKeys();
+                } catch (Exception e) {
+                    logger.error("Failed to refresh prekeys.");
+                    throw e;
+                }
+
+                try {
+                    m.requestSyncGroups();
+                    m.requestSyncContacts();
+                    m.requestSyncBlocked();
+                    m.requestSyncConfiguration();
+                    m.requestSyncKeys();
+                } catch (Exception e) {
+                    logger.error("Failed to request sync messages from linked device.");
+                    throw e;
+                }
+
+                m.close(false);
             }
+
+            account.save();
         }
 
         return username;