diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java index 66832c0c..9f2f1683 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java @@ -336,8 +336,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable { try (signalAccount) { if (signalAccount.getDeviceId() <= 0) { - logger.debug("Account has invalid deviceId {}, allowing relink.", - signalAccount.getDeviceId()); + logger.debug("Account has invalid deviceId {}, allowing relink.", signalAccount.getDeviceId()); return true; } if (signalAccount.isPrimaryDevice()) { diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java index a71f4adf..54e540cd 100644 --- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java +++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java @@ -357,7 +357,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor MAX_DIMENSION_PROBE_SIZE) { + if (contentType == null + || !contentType.startsWith("image/") + || length <= 0 + || length > MAX_DIMENSION_PROBE_SIZE) { return new ProbedStream(streamDetails.getStream(), 0, 0); } diff --git a/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java b/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java index b9b94525..dfc393cb 100644 --- a/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java +++ b/lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java @@ -3,12 +3,13 @@ package org.asamk.signal.manager.util; import org.junit.jupiter.api.Test; import org.whispersystems.signalservice.api.util.StreamDetails; -import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Optional; +import javax.imageio.ImageIO; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,7 +18,9 @@ class AttachmentUtilsTest { @Test public void createAttachmentStream_setsWidthAndHeightForImage() throws Exception { final var imageBytes = pngBytes(37, 21); - final var streamDetails = new StreamDetails(new ByteArrayInputStream(imageBytes), "image/png", imageBytes.length); + final var streamDetails = new StreamDetails(new ByteArrayInputStream(imageBytes), + "image/png", + imageBytes.length); final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("meme.png"), null); @@ -29,7 +32,9 @@ class AttachmentUtilsTest { @Test public void createAttachmentStream_leavesWidthAndHeightZeroForNonImage() throws Exception { final var bytes = "not an image".getBytes(); - final var streamDetails = new StreamDetails(new ByteArrayInputStream(bytes), "application/octet-stream", bytes.length); + final var streamDetails = new StreamDetails(new ByteArrayInputStream(bytes), + "application/octet-stream", + bytes.length); final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("file.bin"), null); diff --git a/src/main/java/org/asamk/signal/commands/SendStoryCommand.java b/src/main/java/org/asamk/signal/commands/SendStoryCommand.java index f52ff707..d7cfc95d 100644 --- a/src/main/java/org/asamk/signal/commands/SendStoryCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendStoryCommand.java @@ -33,9 +33,7 @@ public class SendStoryCommand implements JsonRpcLocalCommand { subparser.addArgument("-a", "--attachment") .required(true) .help("Specify the file path to the image or video to post as a story."); - subparser.addArgument("--no-replies") - .action(Arguments.storeTrue()) - .help("Disable replies on this story."); + subparser.addArgument("--no-replies").action(Arguments.storeTrue()).help("Disable replies on this story."); subparser.addArgument("-g", "--group-id") .help("Specify a group to post the story to. Without this, posts to My Story."); } diff --git a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java index d84b7bc5..8ea86638 100644 --- a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java +++ b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java @@ -42,7 +42,8 @@ public class SubmitRateLimitChallengeCommand implements JsonRpcLocalCommand { throw new IOErrorException("Submit challenge error: " + e.getMessage(), e); } catch (CaptchaRejectedException e) { throw new CaptchaRejectedErrorException( - "Captcha rejected, it may be outdated, already used or solved from a different IP address.", e); + "Captcha rejected, it may be outdated, already used or solved from a different IP address.", + e); } } } diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java index 9c1cdab8..c67ee297 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java @@ -548,11 +548,7 @@ public class DbusManagerImpl implements Manager { } @Override - public SendMessageResults sendStory( - String attachment, - boolean allowsReplies, - Optional groupId - ) { + public SendMessageResults sendStory(String attachment, boolean allowsReplies, Optional groupId) { throw new UnsupportedOperationException(); } diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java index c797e22a..11dd447f 100644 --- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java +++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java @@ -76,7 +76,8 @@ public class HttpServerHandler implements AutoCloseable { // If we're listening on any local address (0.0.0.0 or ::), skip Host header validation final var addr = address == null ? null : address.getAddress(); if (addr != null && addr.isAnyLocalAddress()) { - logger.warn("HTTP server has no authentication; Host header validation DISABLED because listening on {}", address); + logger.warn("HTTP server has no authentication; Host header validation DISABLED because listening on {}", + address); } else { logger.warn("HTTP server has no authentication; Host header is pinned to {}", allowedHosts); } @@ -114,7 +115,8 @@ public class HttpServerHandler implements AutoCloseable { private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException { if (!isHostAllowed(httpExchange)) { logger.warn("Rejected RPC request with invalid Host header: {} from {}", - httpExchange.getRequestHeaders().getFirst("Host"), httpExchange.getRemoteAddress()); + httpExchange.getRequestHeaders().getFirst("Host"), + httpExchange.getRemoteAddress()); sendResponse(421, null, httpExchange); return; } @@ -167,7 +169,8 @@ public class HttpServerHandler implements AutoCloseable { private void handleEventsEndpoint(HttpExchange httpExchange) throws IOException { if (!isHostAllowed(httpExchange)) { logger.warn("Rejected Events request with invalid Host header: {} from {}", - httpExchange.getRequestHeaders().getFirst("Host"), httpExchange.getRemoteAddress()); + httpExchange.getRequestHeaders().getFirst("Host"), + httpExchange.getRemoteAddress()); sendResponse(421, null, httpExchange); return; } diff --git a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java index db7a9915..c8586c9e 100644 --- a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java +++ b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java @@ -1,10 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "AdminDelete") public record JsonAdminDelete( @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java index eb320ba2..0dea76da 100644 --- a/src/main/java/org/asamk/signal/json/JsonAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Attachment") record JsonAttachment( String contentType, diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java index b568c18a..69726c9c 100644 --- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java @@ -1,7 +1,6 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; @@ -9,6 +8,8 @@ import java.math.BigInteger; import java.util.Base64; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + import static org.asamk.signal.manager.util.Utils.callIdUnsigned; @JsonSchema(title = "CallMessage") diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java index 4d49bdbb..c46e6b80 100644 --- a/src/main/java/org/asamk/signal/json/JsonContact.java +++ b/src/main/java/org/asamk/signal/json/JsonContact.java @@ -1,10 +1,11 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Contact") public record JsonContact( String number, diff --git a/src/main/java/org/asamk/signal/json/JsonContactAddress.java b/src/main/java/org/asamk/signal/json/JsonContactAddress.java index 763d6bd7..902e5cb4 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactAddress.java +++ b/src/main/java/org/asamk/signal/json/JsonContactAddress.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ContactAddress") public record JsonContactAddress( String type, diff --git a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java index ff686f1a..bfb748b3 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java +++ b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ContactAvatar") public record JsonContactAvatar(JsonAttachment attachment, boolean isProfile) { diff --git a/src/main/java/org/asamk/signal/json/JsonContactEmail.java b/src/main/java/org/asamk/signal/json/JsonContactEmail.java index 4967f29f..88c3922e 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactEmail.java +++ b/src/main/java/org/asamk/signal/json/JsonContactEmail.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ContactEmail") public record JsonContactEmail(String value, String type, String label) { diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java index b9d85a99..4973b58e 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactName.java +++ b/src/main/java/org/asamk/signal/json/JsonContactName.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ContactName") public record JsonContactName( String nickname, String given, String family, String prefix, String suffix, String middle diff --git a/src/main/java/org/asamk/signal/json/JsonContactPhone.java b/src/main/java/org/asamk/signal/json/JsonContactPhone.java index 186e4e51..dec44945 100644 --- a/src/main/java/org/asamk/signal/json/JsonContactPhone.java +++ b/src/main/java/org/asamk/signal/json/JsonContactPhone.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Util; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ContactPhone") public record JsonContactPhone(String value, String type, String label) { diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java index c1f7e49e..3c7f2998 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -1,13 +1,14 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "DataMessage") record JsonDataMessage( long timestamp, diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java index 922c4716..f4461727 100644 --- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "EditMessage") record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) { diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java index 69297d0c..7b57e89d 100644 --- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java +++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "GroupInfo") record JsonGroupInfo(String groupId, String groupName, int revision, String type) { diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java index 0d88e736..de06e42e 100644 --- a/src/main/java/org/asamk/signal/json/JsonMention.java +++ b/src/main/java/org/asamk/signal/json/JsonMention.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Mention") public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) { diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java index f2df7e0a..c39805cc 100644 --- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java +++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java @@ -1,7 +1,6 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; @@ -11,6 +10,8 @@ import org.asamk.signal.manager.api.UntrustedIdentityException; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "MessageEnvelope") public record JsonMessageEnvelope( @Deprecated String source, diff --git a/src/main/java/org/asamk/signal/json/JsonPayment.java b/src/main/java/org/asamk/signal/json/JsonPayment.java index 7d7addd4..6ccdceb4 100644 --- a/src/main/java/org/asamk/signal/json/JsonPayment.java +++ b/src/main/java/org/asamk/signal/json/JsonPayment.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Payment") public record JsonPayment(String note, byte[] receipt) { diff --git a/src/main/java/org/asamk/signal/json/JsonPinMessage.java b/src/main/java/org/asamk/signal/json/JsonPinMessage.java index eebd23d5..09b21ca9 100644 --- a/src/main/java/org/asamk/signal/json/JsonPinMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonPinMessage.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "PinMessage") public record JsonPinMessage( @Deprecated String targetAuthor, diff --git a/src/main/java/org/asamk/signal/json/JsonPollCreate.java b/src/main/java/org/asamk/signal/json/JsonPollCreate.java index 25b8d884..89047a6a 100644 --- a/src/main/java/org/asamk/signal/json/JsonPollCreate.java +++ b/src/main/java/org/asamk/signal/json/JsonPollCreate.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "PollCreate") public record JsonPollCreate( String question, boolean allowMultiple, List options diff --git a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java index 8e2c3e8a..3dc07942 100644 --- a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java +++ b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "PollTerminate") public record JsonPollTerminate(long targetSentTimestamp) { diff --git a/src/main/java/org/asamk/signal/json/JsonPollVote.java b/src/main/java/org/asamk/signal/json/JsonPollVote.java index 8a911f4c..0c50ad26 100644 --- a/src/main/java/org/asamk/signal/json/JsonPollVote.java +++ b/src/main/java/org/asamk/signal/json/JsonPollVote.java @@ -1,12 +1,12 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "PollVote") public record JsonPollVote( @Deprecated String author, diff --git a/src/main/java/org/asamk/signal/json/JsonPreview.java b/src/main/java/org/asamk/signal/json/JsonPreview.java index 9fd0a37a..203aa62f 100644 --- a/src/main/java/org/asamk/signal/json/JsonPreview.java +++ b/src/main/java/org/asamk/signal/json/JsonPreview.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Preview") public record JsonPreview(String url, String title, String description, JsonAttachment image) { diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java index 839ab077..146e7562 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuote.java +++ b/src/main/java/org/asamk/signal/json/JsonQuote.java @@ -1,13 +1,14 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Quote") public record JsonQuote( long id, diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java index 9d98bf86..942d90f1 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java @@ -1,10 +1,11 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "QuotedAttachment") public record JsonQuotedAttachment( String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java index db7f4086..a8ed8f13 100644 --- a/src/main/java/org/asamk/signal/json/JsonReaction.java +++ b/src/main/java/org/asamk/signal/json/JsonReaction.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Reaction") public record JsonReaction( String emoji, diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java index 26a4aca5..b13054b1 100644 --- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "ReceiptMessage") record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List timestamps) { diff --git a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java index 5236461f..8eaac296 100644 --- a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java +++ b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.RecipientAddress; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "RecipientAddress") public record JsonRecipientAddress(String uuid, String number, String username) { diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java index b05b74cd..79ecd329 100644 --- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java +++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java @@ -1,11 +1,12 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.GroupId; import org.asamk.signal.manager.api.SendMessageResult; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "SendMessageResult") public record JsonSendMessageResult( JsonRecipientAddress recipientAddress, diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java index 37e6bd67..eebb44da 100644 --- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java +++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java @@ -1,12 +1,13 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "SharedContact") public record JsonSharedContact( JsonContactName name, diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java index 5723a1c4..35c0e981 100644 --- a/src/main/java/org/asamk/signal/json/JsonSticker.java +++ b/src/main/java/org/asamk/signal/json/JsonSticker.java @@ -1,10 +1,10 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.util.Hex; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "Sticker") public record JsonSticker(String packId, int stickerId) { diff --git a/src/main/java/org/asamk/signal/json/JsonStoryContext.java b/src/main/java/org/asamk/signal/json/JsonStoryContext.java index 31e1dfff..84078125 100644 --- a/src/main/java/org/asamk/signal/json/JsonStoryContext.java +++ b/src/main/java/org/asamk/signal/json/JsonStoryContext.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "StoryContext") record JsonStoryContext( String authorNumber, String authorUuid, long sentTimestamp diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java index 5b7495c3..69025d87 100644 --- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java @@ -1,7 +1,6 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.Color; import org.asamk.signal.manager.api.GroupId; @@ -9,6 +8,8 @@ import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "StoryMessage") record JsonStoryMessage( boolean allowsReplies, diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java index 5563056f..a3c1bf89 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java @@ -2,7 +2,6 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.api.MessageEnvelope; @@ -10,6 +9,8 @@ import org.asamk.signal.manager.api.RecipientAddress; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "SyncDataMessage") record JsonSyncDataMessage( @Deprecated String destination, diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java index e2c4a6e9..e6cb5d0a 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "SyncReadMessage") record JsonSyncReadMessage( @Deprecated String sender, String senderNumber, String senderUuid, long timestamp diff --git a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java index b8254a8f..04791060 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java @@ -1,12 +1,13 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "SyncStoryMessage") record JsonSyncStoryMessage( String destinationNumber, String destinationUuid, @JsonUnwrapped JsonStoryMessage dataMessage diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java index 87591c2b..1274be1f 100644 --- a/src/main/java/org/asamk/signal/json/JsonTextStyle.java +++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java @@ -1,9 +1,9 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.TextStyle; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "TextStyle") public record JsonTextStyle(String style, int start, int length) { diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java index dae86d74..4195f961 100644 --- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java @@ -1,11 +1,12 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import io.micronaut.jsonschema.JsonSchema; import org.asamk.signal.manager.api.GroupId; import org.asamk.signal.manager.api.MessageEnvelope; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "TypingMessage") record JsonTypingMessage( String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId diff --git a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java index 6b5ffa5c..9108f8e9 100644 --- a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java @@ -1,11 +1,11 @@ package org.asamk.signal.json; -import io.micronaut.jsonschema.JsonSchema; - import org.asamk.signal.manager.api.MessageEnvelope; import java.util.UUID; +import io.micronaut.jsonschema.JsonSchema; + @JsonSchema(title = "UnpinMessage") public record JsonUnpinMessage( @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java index 76e41fa7..24522132 100644 --- a/src/main/java/org/asamk/signal/util/Util.java +++ b/src/main/java/org/asamk/signal/util/Util.java @@ -79,7 +79,9 @@ public class Util { for (var param : params) { final var paramParts = param.split("=", 2); var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8); - var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1].replace("+", "%2B"), StandardCharsets.UTF_8); + var value = paramParts.length == 1 + ? null + : URLDecoder.decode(paramParts[1].replace("+", "%2B"), StandardCharsets.UTF_8); map.put(name, value); } return map; diff --git a/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java b/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java index d285ca1e..472a8fef 100644 --- a/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java +++ b/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java @@ -30,7 +30,9 @@ class SseInitialFlushTest { private HttpServerHandler handler; private int port; - /** Finds a free local port. */ + /** + * Finds a free local port. + */ private static int freePort() throws Exception { try (var ss = new ServerSocket(0)) { ss.setReuseAddress(true); diff --git a/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java b/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java index df496707..80fc63e2 100644 --- a/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java +++ b/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java @@ -53,8 +53,7 @@ class SubscribeCallEventsTest { } } - private record ManagedManager(Manager manager, ManagerMock.State state) { - } + private record ManagedManager(Manager manager, ManagerMock.State state) {} private static ManagedManager createManager(final String selfNumber) { final var state = new ManagerMock.State(); @@ -172,7 +171,9 @@ class SubscribeCallEventsTest { handler.handleConnection(manager.manager()); // The implementation allows multiple subscriptions, so two calls add two listeners - assertEquals(2, manager.state().addCallEventListenerCount.get(), "multiple subscribeCallEvents should add multiple listeners"); + assertEquals(2, + manager.state().addCallEventListenerCount.get(), + "multiple subscribeCallEvents should add multiple listeners"); } @Test @@ -263,6 +264,8 @@ class SubscribeCallEventsTest { var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true); handler.handleConnection(multi); - assertEquals(0, manager1.state().addCallEventListenerCount.get(), "call events should not be auto-subscribed in multi mode"); + assertEquals(0, + manager1.state().addCallEventListenerCount.get(), + "call events should not be auto-subscribed in multi mode"); } } diff --git a/src/test/java/org/asamk/signal/testutil/ManagerMock.java b/src/test/java/org/asamk/signal/testutil/ManagerMock.java index 48901fc9..d10bdd60 100644 --- a/src/test/java/org/asamk/signal/testutil/ManagerMock.java +++ b/src/test/java/org/asamk/signal/testutil/ManagerMock.java @@ -34,8 +34,7 @@ public final class ManagerMock { } public static Manager create(final String selfNumber, final State state) { - return (Manager) Proxy.newProxyInstance( - Manager.class.getClassLoader(), + return (Manager) Proxy.newProxyInstance(Manager.class.getClassLoader(), new Class[]{Manager.class}, (proxy, method, args) -> { final var methodName = method.getName(); @@ -69,8 +68,7 @@ public final class ManagerMock { default: return defaultValue(method.getReturnType()); } - } - ); + }); } private static Object defaultValue(final Class returnType) {