From 0dde3d859699d00824bcca7c048a4961f48d1198 Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 6 Oct 2026 17:50:56 +0200 Subject: [PATCH] Reformat files --- .../manager/internal/RegistrationManagerImpl.java | 2 +- .../org/asamk/signal/commands/DaemonCommand.java | 15 +++------------ .../asamk/signal/commands/RegisterCommand.java | 6 +----- .../org/asamk/signal/jsonrpc/JsonRpcReader.java | 10 +++++----- .../jsonrpc/SignalJsonRpcDispatcherHandler.java | 8 ++++---- 5 files changed, 14 insertions(+), 27 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 075653bb..4a6edbb6 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 @@ -288,7 +288,7 @@ public class RegistrationManagerImpl implements RegistrationManager { throw new RecoveryRequestFailedException("Account key or recovery key is incorrect", e); case RegisterAccountError.RateLimited ignored -> throw new RateLimitException(null); case RegisterAccountError.PostQuantumRatchetRequired ignored -> - throw new IOException("signal-cli is too old to register this account", e); + throw new IOException("signal-cli is too old to register this account", e); default -> throw new IOException("Signal rejected recovery-key registration", e); } } diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index fd64a9f6..3469c4e8 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -244,10 +244,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { public abstract void runDbus(boolean isDbusSystem, final String busname) throws CommandException; - public abstract void runHttp( - InetSocketAddress address, - Duration keepAliveInterval - ) throws CommandException; + public abstract void runHttp(InetSocketAddress address, Duration keepAliveInterval) throws CommandException; protected final void runSocket(final SocketHandler socketHandler) { socketHandler.init(); @@ -303,10 +300,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { } @Override - public void runHttp( - final InetSocketAddress address, - final Duration keepAliveInterval - ) throws CommandException { + public void runHttp(final InetSocketAddress address, final Duration keepAliveInterval) throws CommandException { runHttp(new HttpServerHandler(address, keepAliveInterval, m)); } } @@ -331,10 +325,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { } @Override - public void runHttp( - final InetSocketAddress address, - final Duration keepAliveInterval - ) throws CommandException { + public void runHttp(final InetSocketAddress address, final Duration keepAliveInterval) throws CommandException { runHttp(new HttpServerHandler(address, keepAliveInterval, c)); } } diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java index ff458f77..50543963 100644 --- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java @@ -146,10 +146,6 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration } public record RegistrationParams( - Boolean voice, - String captcha, - Boolean reregister, - String recoveryKey, - String totp + Boolean voice, String captcha, Boolean reregister, String recoveryKey, String totp ) {} } diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java index cb40f327..468637ca 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java @@ -26,8 +26,7 @@ import java.util.stream.StreamSupport; public class JsonRpcReader { private static final Logger logger = LoggerFactory.getLogger(JsonRpcReader.class); - private static final int MAX_JSON_STRING_LENGTH = - ((ServiceConfig.MAX_ATTACHMENT_SIZE + 2) / 3) * 4 + 1024; + private static final int MAX_JSON_STRING_LENGTH = ((ServiceConfig.MAX_ATTACHMENT_SIZE + 2) / 3) * 4 + 1024; private final JsonRpcSender jsonRpcSender; private final ObjectMapper objectMapper; @@ -50,9 +49,10 @@ public class JsonRpcReader { private static ObjectMapper createObjectMapper() { final var objectMapper = Util.createJsonObjectMapper(); - objectMapper.getFactory().setStreamReadConstraints(StreamReadConstraints.builder() - .maxStringLength(MAX_JSON_STRING_LENGTH) - .build()); + objectMapper.getFactory() + .setStreamReadConstraints(StreamReadConstraints.builder() + .maxStringLength(MAX_JSON_STRING_LENGTH) + .build()); return objectMapper; } diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java index 65be9899..b959452b 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java @@ -64,10 +64,10 @@ public class SignalJsonRpcDispatcherHandler { final Consumer onManagerAddedReceiveHandler = m -> subscribeReceive(m, true); final Consumer onManagerRemovedReceiveHandler = this::unsubscribeReceive; - final Consumer onManagerAddedReceiveSubscriptionsHandler = m -> receiveHandlers - .forEach((subscriptionId, handlers) -> handlers.add(createReceiveHandler(m, subscriptionId, false))); - final Consumer onManagerAddedCallEventSubscriptionsHandler = m -> callEventHandlers - .forEach((subscriptionId, handlers) -> handlers.add(createCallEventHandler(m, subscriptionId))); + final Consumer onManagerAddedReceiveSubscriptionsHandler = m -> receiveHandlers.forEach((subscriptionId, handlers) -> handlers.add( + createReceiveHandler(m, subscriptionId, false))); + final Consumer onManagerAddedCallEventSubscriptionsHandler = m -> callEventHandlers.forEach((subscriptionId, handlers) -> handlers.add( + createCallEventHandler(m, subscriptionId))); if (!noReceiveOnStart) { this.subscribeReceive(c.getManagers(), true);