nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-16 13:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into schemas-on-release

Browse Source
This commit is contained in:
Gara Dorta 2026-05-05 11:34:21 +01:00 committed by GitHub
commit 5c5a918763
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
View File

@ -25,12 +25,14 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors;
public class SignalJsonRpcDispatcherHandler { public class SignalJsonRpcDispatcherHandler {
@ -41,8 +43,8 @@ public class SignalJsonRpcDispatcherHandler {
private final JsonRpcReader jsonRpcReader; private final JsonRpcReader jsonRpcReader;
private final boolean noReceiveOnStart; private final boolean noReceiveOnStart;
private final Map<Integer, List<Pair<Manager, Manager.ReceiveMessageHandler>>> receiveHandlers = new HashMap<>(); private final Map<Integer, ArrayList<Pair<Manager, Manager.ReceiveMessageHandler>>> receiveHandlers = new HashMap<>();
private final Map<Integer, List<Pair<Manager, Manager.CallEventListener>>> callEventHandlers = new HashMap<>(); private final Map<Integer, ArrayList<Pair<Manager, Manager.CallEventListener>>> callEventHandlers = new HashMap<>();
private SignalJsonRpcCommandHandler commandHandler; private SignalJsonRpcCommandHandler commandHandler;
public SignalJsonRpcDispatcherHandler( public SignalJsonRpcDispatcherHandler(
@ -91,7 +93,9 @@ public class SignalJsonRpcDispatcherHandler {
private int subscribeCallEvents(final Collection<Manager> managers) { private int subscribeCallEvents(final Collection<Manager> managers) {
final var subscriptionId = nextSubscriptionId.getAndIncrement(); final var subscriptionId = nextSubscriptionId.getAndIncrement();
final var listeners = managers.stream().map(m -> createCallEventHandler(m, subscriptionId)).toList(); final var listeners = managers.stream()
.map(m -> createCallEventHandler(m, subscriptionId))
.collect(Collectors.toCollection(ArrayList::new));
callEventHandlers.put(subscriptionId, listeners); callEventHandlers.put(subscriptionId, listeners);
return subscriptionId; return subscriptionId;
} }
@ -146,7 +150,7 @@ public class SignalJsonRpcDispatcherHandler {
final var subscriptionId = nextSubscriptionId.getAndIncrement(); final var subscriptionId = nextSubscriptionId.getAndIncrement();
final var handlers = managers.stream() final var handlers = managers.stream()
.map(m -> createReceiveHandler(m, subscriptionId, internalSubscription)) .map(m -> createReceiveHandler(m, subscriptionId, internalSubscription))
.toList(); .collect(Collectors.toCollection(ArrayList::new));
receiveHandlers.put(subscriptionId, handlers); receiveHandlers.put(subscriptionId, handlers);
return subscriptionId; return subscriptionId;