From: AsamK Date: Sun, 16 Apr 2023 19:09:24 +0000 (+0200) Subject: Remove old libzkgroup fallback code X-Git-Tag: v0.11.9~4 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/d2251ccd14081b80a1c7bcc906ad866502ff921b?hp=6a3ebfd4c8af35a5174ef325be83fa341bddc42d Remove old libzkgroup fallback code --- diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java index f4489ea7..7a8ecc4b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java +++ b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java @@ -27,8 +27,6 @@ import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; -import static org.asamk.signal.manager.config.ServiceConfig.capabilities; - public class SignalDependencies { private final Object LOCK = new Object(); @@ -119,17 +117,13 @@ public class SignalDependencies { public GroupsV2Operations getGroupsV2Operations() { return getOrCreate(() -> groupsV2Operations, - () -> groupsV2Operations = capabilities.getGv2() - ? new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()), - ServiceConfig.GROUP_MAX_SIZE) - : null); + () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()), + ServiceConfig.GROUP_MAX_SIZE)); } private ClientZkOperations getClientZkOperations() { return getOrCreate(() -> clientZkOperations, - () -> clientZkOperations = capabilities.getGv2() - ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()) - : null); + () -> clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())); } private ClientZkProfileOperations getClientZkProfileOperations() {