X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2935b96070ee687c7a17382c64e3f85730b9f706..6eb486e85869995263c543db94e6b07ac2691db7:/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
index e53f1b99..d27d911e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java
@@ -21,12 +21,9 @@ import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 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;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
@@ -38,6 +35,7 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.concurrent.TimeoutException;
 
 public class ProvisioningManager {
@@ -86,45 +84,40 @@ public class ProvisioningManager {
         return new ProvisioningManager(pathConfig, serviceConfiguration, userAgent);
     }
 
-    public String getDeviceLinkUri() throws TimeoutException, IOException {
+    public URI getDeviceLinkUri() throws TimeoutException, IOException {
         var deviceUuid = accountManager.getNewDeviceUuid();
 
         return new DeviceLinkInfo(deviceUuid, identityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
-    public Manager finishDeviceLink(String deviceName) throws IOException, InvalidKeyException, TimeoutException, UserAlreadyExists {
-        var ret = accountManager.finishNewDeviceRegistration(identityKey, false, true, registrationId, deviceName);
+    public Manager finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExists {
+        var ret = accountManager.getNewDeviceRegistration(identityKey);
+        var number = ret.getNumber();
 
-        var username = ret.getNumber();
-        // TODO do this check before actually registering
-        if (SignalAccount.userExists(pathConfig.getDataPath(), username)) {
-            throw new UserAlreadyExists(username, SignalAccount.getFileName(pathConfig.getDataPath(), username));
+        if (SignalAccount.userExists(pathConfig.getDataPath(), number)) {
+            throw new UserAlreadyExists(number, SignalAccount.getFileName(pathConfig.getDataPath(), number));
         }
 
+        var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
+                false,
+                true,
+                registrationId,
+                deviceName);
+
         // Create new account with the synced identity
-        var profileKeyBytes = ret.getProfileKey();
-        ProfileKey profileKey;
-        if (profileKeyBytes == null) {
-            profileKey = KeyUtils.createProfileKey();
-        } else {
-            try {
-                profileKey = new ProfileKey(profileKeyBytes);
-            } catch (InvalidInputException e) {
-                throw new IOException("Received invalid profileKey", e);
-            }
-        }
+        var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
 
         SignalAccount account = null;
         try {
             account = SignalAccount.createLinkedAccount(pathConfig.getDataPath(),
-                    username,
+                    number,
                     ret.getUuid(),
                     password,
-                    ret.getDeviceId(),
+                    deviceName,
+                    deviceId,
                     ret.getIdentity(),
                     registrationId,
                     profileKey);
-            account.save();
 
             Manager m = null;
             try {
@@ -138,18 +131,12 @@ public class ProvisioningManager {
                 }
 
                 try {
-                    m.requestSyncGroups();
-                    m.requestSyncContacts();
-                    m.requestSyncBlocked();
-                    m.requestSyncConfiguration();
-                    m.requestSyncKeys();
+                    m.requestAllSyncData();
                 } catch (Exception e) {
                     logger.error("Failed to request sync messages from linked device.");
                     throw e;
                 }
 
-                account.save();
-
                 final var result = m;
                 account = null;
                 m = null;