Prevent groupV2Operations from being null

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 13412d25e665aca7fc12c3fee1f5144a7630a831..d66ab214c8b1544164df41e5a8c655dce8ce4ebb 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -60,6 +60,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
     private final Consumer<Manager> newManagerListener;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
     private final Consumer<Manager> newManagerListener;

+    private final GroupsV2Operations groupsV2Operations;

 
     private final SignalServiceAccountManager accountManager;
     private final PinHelper pinHelper;
 
     private final SignalServiceAccountManager accountManager;
     private final PinHelper pinHelper;


@@ -80,13 +81,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
         this.userAgent = userAgent;
         this.newManagerListener = newManagerListener;
 
         this.userAgent = userAgent;
         this.newManagerListener = newManagerListener;
 

-        GroupsV2Operations groupsV2Operations;
-        try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
-                    ServiceConfig.GROUP_MAX_SIZE);
-        } catch (Throwable ignored) {
-            groupsV2Operations = null;
-        }
+        groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
+                ServiceConfig.GROUP_MAX_SIZE);

         this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(
                         // Using empty UUID, because registering doesn't work otherwise
         this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(
                         // Using empty UUID, because registering doesn't work otherwise


@@ -210,7 +206,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
             final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                     account.getCredentialsProvider(),
                     userAgent,
             final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                     account.getCredentialsProvider(),
                     userAgent,

-                    null,
+                    groupsV2Operations,

                     ServiceConfig.AUTOMATIC_NETWORK_RETRY);
             accountManager.setAccountAttributes(account.getAccountAttributes(null));
             account.setRegistered(true);
                     ServiceConfig.AUTOMATIC_NETWORK_RETRY);
             accountManager.setAccountAttributes(account.getAccountAttributes(null));
             account.setRegistered(true);

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 3b047c88f6e426ead86410c05f9235e54591bac9..8b5f3e269d0dff0440a3bf49150302494ff6a02c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -142,7 +142,7 @@ public class SignalDependencies {
 
     private ClientZkProfileOperations getClientZkProfileOperations() {
         final var clientZkOperations = getClientZkOperations();
 
     private ClientZkProfileOperations getClientZkProfileOperations() {
         final var clientZkOperations = getClientZkOperations();

-        return clientZkOperations == null ? null : clientZkOperations.getProfileOperations();
+        return clientZkOperations.getProfileOperations();

     }
 
     public SignalWebSocket getSignalWebSocket() {
     }
 
     public SignalWebSocket getSignalWebSocket() {