X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2e01a05e7110b4f94abb10489a28b73d9f4be9c0..ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed:/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 7cc0a7bc..8a96dad0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -58,7 +58,7 @@ public class RegistrationManager implements Closeable {
     private final SignalServiceAccountManager accountManager;
     private final PinHelper pinHelper;
 
-    public RegistrationManager(
+    private RegistrationManager(
             SignalAccount account,
             PathConfig pathConfig,
             ServiceEnvironmentConfig serviceEnvironmentConfig,
@@ -91,18 +91,18 @@ public class RegistrationManager implements Closeable {
     }
 
     public static RegistrationManager init(
-            String username, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
+            String number, File settingsPath, ServiceEnvironment serviceEnvironment, String userAgent
     ) throws IOException {
         var pathConfig = PathConfig.createDefault(settingsPath);
 
         final var serviceConfiguration = ServiceConfig.getServiceEnvironmentConfig(serviceEnvironment, userAgent);
-        if (!SignalAccount.userExists(pathConfig.getDataPath(), username)) {
+        if (!SignalAccount.userExists(pathConfig.dataPath(), number)) {
             var identityKey = KeyUtils.generateIdentityKeyPair();
             var registrationId = KeyHelper.generateRegistrationId(false);
 
             var profileKey = KeyUtils.createProfileKey();
-            var account = SignalAccount.create(pathConfig.getDataPath(),
-                    username,
+            var account = SignalAccount.create(pathConfig.dataPath(),
+                    number,
                     identityKey,
                     registrationId,
                     profileKey,
@@ -111,7 +111,7 @@ public class RegistrationManager implements Closeable {
             return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
         }
 
-        var account = SignalAccount.load(pathConfig.getDataPath(), username, true, TrustNewIdentity.ON_FIRST_USE);
+        var account = SignalAccount.load(pathConfig.dataPath(), number, true, TrustNewIdentity.ON_FIRST_USE);
 
         return new RegistrationManager(account, pathConfig, serviceConfiguration, userAgent);
     }
@@ -177,17 +177,21 @@ public class RegistrationManager implements Closeable {
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         account.finishRegistration(UuidUtil.parseOrNull(response.getUuid()), masterKey, pin);
 
-        Manager m = null;
+        ManagerImpl m = null;
         try {
-            m = new Manager(account, pathConfig, serviceEnvironmentConfig, userAgent);
+            m = new ManagerImpl(account, pathConfig, serviceEnvironmentConfig, userAgent);
             account = null;
 
             m.refreshPreKeys();
-            // Set an initial empty profile so user can be added to groups
-            m.setProfile(null, null, null, null, null);
             if (response.isStorageCapable()) {
                 m.retrieveRemoteStorage();
             }
+            // Set an initial empty profile so user can be added to groups
+            try {
+                m.setProfile(null, null, null, null, null);
+            } catch (NoClassDefFoundError e) {
+                logger.warn("Failed to set default profile: {}", e.getMessage());
+            }
 
             final var result = m;
             m = null;