Add missing check if client zk operations are null

[signal-cli] / 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 2be3f7193113b8612e59fca96ebfda7c93506cdd..1b00e562a0af3a9a6929d04d88e8a3ac02c8155e 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -174,7 +174,6 @@ public class RegistrationManager implements Closeable {
             masterKey = registrationLockData.getMasterKey();
         }
 
-        // TODO response.isStorageCapable()
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         account.finishRegistration(UuidUtil.parseOrNull(response.getUuid()), masterKey, pin);
 
@@ -185,7 +184,14 @@ public class RegistrationManager implements Closeable {
 
             m.refreshPreKeys();
             // Set an initial empty profile so user can be added to groups
-            m.setProfile(null, null, null, null, null);
+            try {
+                m.setProfile(null, null, null, null, null);
+            } catch (NoClassDefFoundError e) {
+                logger.warn("Failed to set default profile: {}", e.getMessage());
+            }
+            if (response.isStorageCapable()) {
+                m.retrieveRemoteStorage();
+            }
 
             final var result = m;
             m = null;