Skip to content

Commit

Permalink
Prevent groupV2Operations from being null
Browse files Browse the repository at this point in the history
AsamK committed Nov 21, 2023
1 parent fddf982 commit 81d2e31
Showing 2 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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);
Original file line number Diff line number Diff line change
@@ -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() {

0 comments on commit 81d2e31

Please sign in to comment.