From 81d2e315e3ceebddf33fd5e0c62f04cf7851aa29 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 17:17:26 +0100
Subject: [PATCH] Prevent groupV2Operations from being null

---
 .../manager/internal/RegistrationManagerImpl.java    | 12 ++++--------
 .../signal/manager/internal/SignalDependencies.java  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

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 13412d25e6..d66ab214c8 100644
--- 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 GroupsV2Operations groupsV2Operations;
 
     private final SignalServiceAccountManager accountManager;
     private final PinHelper pinHelper;
@@ -80,13 +81,8 @@ public RegistrationManagerImpl(
         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
@@ -210,7 +206,7 @@ private boolean attemptReactivateAccount() {
             final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                     account.getCredentialsProvider(),
                     userAgent,
-                    null,
+                    groupsV2Operations,
                     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 3b047c88f6..8b5f3e269d 100644
--- 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 @@ private ClientZkOperations getClientZkOperations() {
 
     private ClientZkProfileOperations getClientZkProfileOperations() {
         final var clientZkOperations = getClientZkOperations();
-        return clientZkOperations == null ? null : clientZkOperations.getProfileOperations();
+        return clientZkOperations.getProfileOperations();
     }
 
     public SignalWebSocket getSignalWebSocket() {