From d0ee90dbbcf04d91b1683646eb13b0e7c4794642 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 11 Apr 2026 12:29:16 +0200 Subject: [PATCH] Reformat files --- .../asamk/signal/manager/api/CallOffer.java | 4 +- .../signal/manager/api/MessageEnvelope.java | 22 +++++----- .../signal/manager/api/ReceiveConfig.java | 8 +++- .../asamk/signal/manager/api/TurnServer.java | 7 +-- .../signal/manager/helper/ContactHelper.java | 2 +- .../signal/manager/helper/ProfileHelper.java | 8 ++-- .../signal/manager/helper/SendHelper.java | 20 ++++----- .../signal/manager/storage/SignalAccount.java | 2 +- .../manager/storage/groups/GroupStore.java | 6 +-- .../protocol/LegacyJsonIdentityKeyStore.java | 2 +- .../storage/recipients/RecipientStore.java | 6 +-- .../storage/sendLog/MessageSendLogStore.java | 6 +-- .../signal/manager/util/StickerUtils.java | 6 ++- src/main/java/org/asamk/signal/App.java | 6 +-- .../asamk/signal/ReceiveMessageHandler.java | 4 +- .../signal/commands/AcceptCallCommand.java | 5 +-- .../signal/commands/HangupCallCommand.java | 5 +-- .../signal/commands/ListCallsCommand.java | 3 -- .../signal/commands/ListContactsCommand.java | 20 ++++----- .../signal/commands/RejectCallCommand.java | 5 +-- .../commands/SendPollCreateCommand.java | 6 ++- .../org/asamk/signal/json/JsonCallEvent.java | 6 +-- .../asamk/signal/json/JsonDataMessage.java | 32 +++++++------- .../java/org/asamk/signal/json/JsonQuote.java | 12 ++--- .../signal/json/JsonSendMessageResult.java | 8 ++-- .../asamk/signal/json/JsonSharedContact.java | 6 +-- .../asamk/signal/json/JsonSyncMessage.java | 6 +-- .../asamk/signal/json/JsonCallEventTest.java | 44 +++++++++++++++---- 28 files changed, 144 insertions(+), 123 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/api/CallOffer.java b/lib/src/main/java/org/asamk/signal/manager/api/CallOffer.java index 2c4aa251..ebd97826 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/CallOffer.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/CallOffer.java @@ -1,9 +1,7 @@ package org.asamk.signal.manager.api; public record CallOffer( - long callId, - Type type, - byte[] opaque + long callId, Type type, byte[] opaque ) { public enum Type { diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java index 91f75033..c8de254b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java @@ -268,19 +268,19 @@ public record MessageEnvelope( quote.getMentions() == null ? List.of() : quote.getMentions() - .stream() - .map(m -> Mention.from(m, recipientResolver, addressResolver)) - .toList(), + .stream() + .map(m -> Mention.from(m, recipientResolver, addressResolver)) + .toList(), quote.getAttachments() == null ? List.of() : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(), quote.getBodyRanges() == null ? List.of() : quote.getBodyRanges() - .stream() - .filter(r -> r.style != null) - .map(TextStyle::from) - .toList()); + .stream() + .filter(r -> r.style != null) + .map(TextStyle::from) + .toList()); } } @@ -599,7 +599,7 @@ public record MessageEnvelope( Boolean.TRUE.equals(pinnedMessage.getForever()) ? -1 : pinnedMessage.getPinDurationInSeconds() == null - ? 0 + ? 0 : pinnedMessage.getPinDurationInSeconds()); } } @@ -1032,14 +1032,14 @@ public record MessageEnvelope( final var source = !envelope.isUnidentifiedSender() && serviceId != null ? recipientResolver.resolveRecipient(serviceId) : envelope.isUnidentifiedSender() && content != null - ? recipientResolver.resolveRecipient(content.getSender()) + ? recipientResolver.resolveRecipient(content.getSender()) : exception instanceof ProtocolException e - ? recipientResolver.resolveRecipient(e.getSender()) + ? recipientResolver.resolveRecipient(e.getSender()) : null; final var sourceDevice = envelope.hasSourceDevice() ? envelope.getSourceDevice() : content != null - ? content.getSenderDevice() + ? content.getSenderDevice() : exception instanceof ProtocolException e ? e.getSenderDevice() : 0; Optional receipt; diff --git a/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java index f7b64e43..6fab5757 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java @@ -1,3 +1,9 @@ package org.asamk.signal.manager.api; -public record ReceiveConfig(boolean ignoreAttachments, boolean ignoreStories, boolean ignoreAvatars, boolean ignoreStickers, boolean sendReadReceipts) {} +public record ReceiveConfig( + boolean ignoreAttachments, + boolean ignoreStories, + boolean ignoreAvatars, + boolean ignoreStickers, + boolean sendReadReceipts +) {} diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TurnServer.java b/lib/src/main/java/org/asamk/signal/manager/api/TurnServer.java index 8ffd03bf..fe6c3e7b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/TurnServer.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/TurnServer.java @@ -3,8 +3,5 @@ package org.asamk.signal.manager.api; import java.util.List; public record TurnServer( - String username, - String password, - List urls -) { -} + String username, String password, List urls +) {} diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java index 8461fbe0..e1944d6a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java @@ -55,7 +55,7 @@ public class ContactHelper { final var version = contact == null ? 1 : contact.messageExpirationTimeVersion() == Integer.MAX_VALUE - ? Integer.MAX_VALUE + ? Integer.MAX_VALUE : contact.messageExpirationTimeVersion() + 1; account.getContactStore() .storeContact(recipientId, diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java index 72e3926a..0cc786c6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java @@ -191,9 +191,11 @@ public final class ProfileHelper { if (uploadProfile) { final var streamDetails = avatar != null && avatar.isPresent() ? Utils.createStreamDetails(avatar.get()) - .first() - : forceUploadAvatar && avatar == null ? context.getAvatarStore() - .retrieveProfileAvatar(account.getSelfRecipientAddress()) : null; + .first() + : forceUploadAvatar && avatar == null + ? context.getAvatarStore() + .retrieveProfileAvatar(account.getSelfRecipientAddress()) + : null; try (streamDetails) { final var avatarUploadParams = streamDetails != null ? AvatarUploadParams.forAvatar(streamDetails) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java index 2c85bd59..d4f54945 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java @@ -524,11 +524,11 @@ public class SendHelper { Set senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null ? Set.of() : recipientIds.stream() - .filter(s -> this.isSenderKeyCapable(s, - addressesMap.get(s), - unidentifiedAccessesMap.get(s), - groupSendEndorsements)) - .collect(Collectors.toSet()); + .filter(s -> this.isSenderKeyCapable(s, + addressesMap.get(s), + unidentifiedAccessesMap.get(s), + groupSendEndorsements)) + .collect(Collectors.toSet()); if (senderKeyTargets.size() < 2) { logger.debug("Too few sender-key-capable users ({}). Doing all legacy sends.", senderKeyTargets.size()); senderKeyTargets = Set.of(); @@ -590,11 +590,11 @@ public class SendHelper { final var expirationMs = Instant.ofEpochMilli(groupSendEndorsementsExpirationMs); final var groupSendTokens = groupSendEndorsements != null && groupSecretParams != null ? legacyTargets.stream() - .map(groupSendEndorsements::get) - .map(endorsement -> Optional.ofNullable(endorsement) - .map(e -> e.toFullToken(groupSecretParams, expirationMs)) - .orElse(null)) - .toList() + .map(groupSendEndorsements::get) + .map(endorsement -> Optional.ofNullable(endorsement) + .map(e -> e.toFullToken(groupSecretParams, expirationMs)) + .orElse(null)) + .toList() : null; final var sealedSenderAccesses = SealedSenderAccess.forFanOutGroupSend(groupSendTokens, senderCertificate, diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java index 3e02aed0..35f600b6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java @@ -941,7 +941,7 @@ public class SignalAccount implements Closeable { profile.isUnrestrictedUnidentifiedAccess() ? Profile.UnidentifiedAccessMode.UNRESTRICTED : profile.getUnidentifiedAccess() != null - ? Profile.UnidentifiedAccessMode.ENABLED + ? Profile.UnidentifiedAccessMode.ENABLED : Profile.UnidentifiedAccessMode.DISABLED, capabilities, null); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java index 89fbcc6d..512a92cf 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java @@ -877,9 +877,9 @@ public class GroupStore { final var members = membersString == null ? Set.of() : Arrays.stream(membersString.split(",")) - .map(Integer::valueOf) - .map(recipientIdCreator::create) - .collect(Collectors.toSet()); + .map(Integer::valueOf) + .map(recipientIdCreator::create) + .collect(Collectors.toSet()); final var expirationTime = resultSet.getInt("expiration_time"); final var blocked = resultSet.getBoolean("blocked"); final var archived = resultSet.getBoolean("archived"); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java index 677e5e08..0edf292a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java @@ -115,7 +115,7 @@ public class LegacyJsonIdentityKeyStore { var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get( "trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED; var added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp") - .asLong()) : new Date(); + .asLong()) : new Date(); identities.add(new LegacyIdentityInfo(address, id, trustLevel, added)); } catch (InvalidKeyException e) { logger.warn("Error while decoding key for {}: {}", trustedKeyName, e.getMessage()); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java index 82738aa7..8836a1d3 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java @@ -1606,9 +1606,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re profileCapabilities == null ? Set.of() : Arrays.stream(profileCapabilities.split(",")) - .map(Profile.Capability::valueOfOrNull) - .filter(Objects::nonNull) - .collect(Collectors.toSet()), + .map(Profile.Capability::valueOfOrNull) + .filter(Objects::nonNull) + .collect(Collectors.toSet()), PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing"))); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java index 5876354b..9b3377b5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java @@ -321,10 +321,10 @@ public class MessageSendLogStore implements AutoCloseable { return content.dataMessage == null ? null : content.dataMessage.group != null && content.dataMessage.group.id != null - ? content.dataMessage.group.id.toByteArray() + ? content.dataMessage.group.id.toByteArray() : content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null - ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray())) - .serialize() + ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray())) + .serialize() : null; } catch (InvalidInputException e) { logger.warn("Failed to parse groupId id from content"); diff --git a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java index d017f0a5..e1696da5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java @@ -78,8 +78,10 @@ public class StickerUtils { throw new StickerPackInvalidException("Could not find find " + pack.cover().file()); } - var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty() ? pack.cover() - .contentType() : getContentType(rootPath, zip, pack.cover().file()); + var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty() + ? pack.cover() + .contentType() + : getContentType(rootPath, zip, pack.cover().file()); cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(), data.second(), Optional.ofNullable(pack.cover().emoji()).orElse(""), diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index e494d201..bcf3c605 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -204,9 +204,9 @@ public class App { private OutputWriter getOutputWriter(final Command command) throws UserErrorException { final var outputTypeInput = ns.get("output"); final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes() - .stream() - .findFirst() - .orElse(null) : outputTypeInput; + .stream() + .findFirst() + .orElse(null) : outputTypeInput; final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset())); final var outputWriter = outputType == null ? null diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index b0361551..dcaf06f3 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -612,8 +612,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { writer.println("Size: {}{}", attachment.size().isPresent() ? attachment.size().get() + " bytes" : "", attachment.preview().isPresent() ? " (Preview is available: " - + attachment.preview().get().length - + " bytes)" : ""); + + attachment.preview().get().length + + " bytes)" : ""); } if (attachment.thumbnail().isPresent()) { writer.println("Thumbnail:"); diff --git a/src/main/java/org/asamk/signal/commands/AcceptCallCommand.java b/src/main/java/org/asamk/signal/commands/AcceptCallCommand.java index 66d16140..bfba0df7 100644 --- a/src/main/java/org/asamk/signal/commands/AcceptCallCommand.java +++ b/src/main/java/org/asamk/signal/commands/AcceptCallCommand.java @@ -23,10 +23,7 @@ public class AcceptCallCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Accept an incoming voice call."); - subparser.addArgument("--call-id") - .type(long.class) - .required(true) - .help("The call ID to accept."); + subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to accept."); } @Override diff --git a/src/main/java/org/asamk/signal/commands/HangupCallCommand.java b/src/main/java/org/asamk/signal/commands/HangupCallCommand.java index 35149b4d..11da2a64 100644 --- a/src/main/java/org/asamk/signal/commands/HangupCallCommand.java +++ b/src/main/java/org/asamk/signal/commands/HangupCallCommand.java @@ -21,10 +21,7 @@ public class HangupCallCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Hang up an active voice call."); - subparser.addArgument("--call-id") - .type(long.class) - .required(true) - .help("The call ID to hang up."); + subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to hang up."); } @Override diff --git a/src/main/java/org/asamk/signal/commands/ListCallsCommand.java b/src/main/java/org/asamk/signal/commands/ListCallsCommand.java index 8f443d90..7404f516 100644 --- a/src/main/java/org/asamk/signal/commands/ListCallsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListCallsCommand.java @@ -5,13 +5,10 @@ import net.sourceforge.argparse4j.inf.Subparser; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.api.CallInfo; import org.asamk.signal.output.JsonWriter; import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.PlainTextWriter; -import java.util.List; - public class ListCallsCommand implements JsonRpcLocalCommand { @Override diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java index b382e7ac..101ec382 100644 --- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java @@ -109,7 +109,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand { r.getProfile().getPhoneNumberSharingMode() == null ? "" : String.valueOf(r.getProfile().getPhoneNumberSharingMode() - == PhoneNumberSharingMode.EVERYBODY), + == PhoneNumberSharingMode.EVERYBODY), r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable())); } } @@ -121,17 +121,17 @@ public class ListContactsCommand implements JsonRpcLocalCommand { final var jsonInternal = !internal ? null : new JsonContact.JsonInternal(r.getProfile() - .getCapabilities() - .stream() - .map(Enum::name) - .toList(), + .getCapabilities() + .stream() + .map(Enum::name) + .toList(), r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN - ? null + ? null : r.getProfile().getUnidentifiedAccessMode().name(), r.getProfile().getPhoneNumberSharingMode() == null - ? null + ? null : r.getProfile().getPhoneNumberSharingMode() - == PhoneNumberSharingMode.EVERYBODY, + == PhoneNumberSharingMode.EVERYBODY, r.getDiscoverable()); return new JsonContact(address.number().orElse(null), address.uuid().map(UUID::toString).orElse(null), @@ -159,9 +159,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand { r.getProfile().getAboutEmoji(), r.getProfile().getAvatarUrlPath() != null, r.getProfile().getMobileCoinAddress() == null - ? null + ? null : Base64.getEncoder() - .encodeToString(r.getProfile().getMobileCoinAddress())), + .encodeToString(r.getProfile().getMobileCoinAddress())), jsonInternal); }).toList(); writer.write(jsonContacts); diff --git a/src/main/java/org/asamk/signal/commands/RejectCallCommand.java b/src/main/java/org/asamk/signal/commands/RejectCallCommand.java index 24cedcd4..82c70c72 100644 --- a/src/main/java/org/asamk/signal/commands/RejectCallCommand.java +++ b/src/main/java/org/asamk/signal/commands/RejectCallCommand.java @@ -21,10 +21,7 @@ public class RejectCallCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Reject an incoming voice call."); - subparser.addArgument("--call-id") - .type(long.class) - .required(true) - .help("The call ID to reject."); + subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to reject."); } @Override diff --git a/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java b/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java index 08b24560..9845af17 100644 --- a/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java @@ -82,7 +82,11 @@ public class SendPollCreateCommand implements JsonRpcLocalCommand { throw new UserErrorException("Poll options must not be empty"); } if (option.length() > MAX_POLL_OPTION_LENGTH) { - throw new UserErrorException("Poll option \"" + option + "\" exceeds the maximum length of " + MAX_POLL_OPTION_LENGTH + " characters"); + throw new UserErrorException("Poll option \"" + + option + + "\" exceeds the maximum length of " + + MAX_POLL_OPTION_LENGTH + + " characters"); } } diff --git a/src/main/java/org/asamk/signal/json/JsonCallEvent.java b/src/main/java/org/asamk/signal/json/JsonCallEvent.java index dba6b77a..e05512ae 100644 --- a/src/main/java/org/asamk/signal/json/JsonCallEvent.java +++ b/src/main/java/org/asamk/signal/json/JsonCallEvent.java @@ -18,15 +18,13 @@ public record JsonCallEvent( ) { public static JsonCallEvent from(CallInfo callInfo, String reason) { - return new JsonCallEvent( - callInfo.callId(), + return new JsonCallEvent(callInfo.callId(), callInfo.state().name(), callInfo.recipient().number().orElse(null), callInfo.recipient().aci().orElse(null), callInfo.isOutgoing(), callInfo.inputDeviceName(), callInfo.outputDeviceName(), - reason - ); + reason); } } diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java index 44f7f936..5f667932 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -36,7 +36,7 @@ record JsonDataMessage( static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) { final var timestamp = dataMessage.timestamp(); final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext() - .get(), m) : null; + .get(), m) : null; final var storyContext = dataMessage.storyContext().isPresent() ? JsonStoryContext.from(dataMessage.storyContext().get()) : null; @@ -48,32 +48,32 @@ record JsonDataMessage( final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null; final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null; final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions() - .stream() - .map(JsonMention::from) - .toList() : null; + .stream() + .map(JsonMention::from) + .toList() : null; final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews() - .stream() - .map(JsonPreview::from) - .toList() : null; + .stream() + .map(JsonPreview::from) + .toList() : null; final var remoteDelete = dataMessage.remoteDeleteId().isPresent() ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get()) : null; final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments() - .stream() - .map(JsonAttachment::from) - .toList() : null; + .stream() + .map(JsonAttachment::from) + .toList() : null; final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null; final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts() - .stream() - .map(JsonSharedContact::from) - .toList() : null; + .stream() + .map(JsonSharedContact::from) + .toList() : null; final var pollCreate = dataMessage.pollCreate().map(JsonPollCreate::from).orElse(null); final var pollVote = dataMessage.pollVote().map(JsonPollVote::from).orElse(null); final var pollTerminate = dataMessage.pollTerminate().map(JsonPollTerminate::from).orElse(null); final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles() - .stream() - .map(JsonTextStyle::from) - .toList() : null; + .stream() + .map(JsonTextStyle::from) + .toList() : null; final var pinMessage = dataMessage.pinMessage().map(JsonPinMessage::from).orElse(null); final var unpinMessage = dataMessage.unpinMessage().map(JsonUnpinMessage::from).orElse(null); final var adminDelete = dataMessage.adminDelete().map(JsonAdminDelete::from).orElse(null); diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java index 514f3db9..0f951941 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuote.java +++ b/src/main/java/org/asamk/signal/json/JsonQuote.java @@ -31,14 +31,14 @@ public record JsonQuote( : null; final var attachments = !quote.attachments().isEmpty() ? quote.attachments() - .stream() - .map(JsonQuotedAttachment::from) - .toList() : List.of(); + .stream() + .map(JsonQuotedAttachment::from) + .toList() : List.of(); final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles() - .stream() - .map(JsonTextStyle::from) - .toList() : null; + .stream() + .map(JsonTextStyle::from) + .toList() : null; return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles); } diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java index f9ca8f86..1be6cb9e 100644 --- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java +++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java @@ -23,13 +23,13 @@ public record JsonSendMessageResult( result.isSuccess() ? Type.SUCCESS : result.isRateLimitFailure() - ? Type.RATE_LIMIT_FAILURE + ? Type.RATE_LIMIT_FAILURE : result.isNetworkFailure() - ? Type.NETWORK_FAILURE + ? Type.NETWORK_FAILURE : result.isUnregisteredFailure() - ? Type.UNREGISTERED_FAILURE + ? Type.UNREGISTERED_FAILURE : result.isInvalidPreKeyFailure() - ? Type.INVALID_PRE_KEY_FAILURE + ? Type.INVALID_PRE_KEY_FAILURE : Type.IDENTITY_FAILURE, result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null, result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null); diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java index d898c63f..fa4ca779 100644 --- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java +++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java @@ -28,9 +28,9 @@ public record JsonSharedContact( : null; final var address = !contact.address().isEmpty() ? contact.address() - .stream() - .map(JsonContactAddress::from) - .toList() : null; + .stream() + .map(JsonContactAddress::from) + .toList() : null; final var organization = contact.organization().orElse(null); diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java index 072b2e3b..899a48fb 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java @@ -47,9 +47,9 @@ record JsonSyncMessage( } final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read() - .stream() - .map(JsonSyncReadMessage::from) - .toList() : null; + .stream() + .map(JsonSyncReadMessage::from) + .toList() : null; final JsonSyncMessageType type; if (syncMessage.contacts().isPresent()) { diff --git a/src/test/java/org/asamk/signal/json/JsonCallEventTest.java b/src/test/java/org/asamk/signal/json/JsonCallEventTest.java index 4ae84a4c..a7922166 100644 --- a/src/test/java/org/asamk/signal/json/JsonCallEventTest.java +++ b/src/test/java/org/asamk/signal/json/JsonCallEventTest.java @@ -2,11 +2,8 @@ package org.asamk.signal.json; import org.asamk.signal.manager.api.CallInfo; import org.asamk.signal.manager.api.RecipientAddress; - import org.junit.jupiter.api.Test; -import java.util.Optional; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -17,7 +14,12 @@ class JsonCallEventTest { @Test void fromWithNumberAndUuid() { var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, "+15551234567", null); - var callInfo = new CallInfo(123L, CallInfo.State.CONNECTED, recipient, "signal_input_123", "signal_output_123", true); + var callInfo = new CallInfo(123L, + CallInfo.State.CONNECTED, + recipient, + "signal_input_123", + "signal_output_123", + true); var event = JsonCallEvent.from(callInfo, null); @@ -34,7 +36,12 @@ class JsonCallEventTest { @Test void fromWithUuidOnly() { var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, null, null); - var callInfo = new CallInfo(456L, CallInfo.State.RINGING_INCOMING, recipient, "signal_input_456", "signal_output_456", false); + var callInfo = new CallInfo(456L, + CallInfo.State.RINGING_INCOMING, + recipient, + "signal_input_456", + "signal_output_456", + false); var event = JsonCallEvent.from(callInfo, null); @@ -48,7 +55,12 @@ class JsonCallEventTest { @Test void fromWithNumberOnly() { var recipient = new RecipientAddress(null, null, "+15559876543", null); - var callInfo = new CallInfo(789L, CallInfo.State.RINGING_OUTGOING, recipient, "signal_input_789", "signal_output_789", true); + var callInfo = new CallInfo(789L, + CallInfo.State.RINGING_OUTGOING, + recipient, + "signal_input_789", + "signal_output_789", + true); var event = JsonCallEvent.from(callInfo, null); @@ -81,7 +93,12 @@ class JsonCallEventTest { @Test void fromConnectingState() { var recipient = new RecipientAddress("uuid-5678", null, "+15552222222", null); - var callInfo = new CallInfo(200L, CallInfo.State.CONNECTING, recipient, "signal_input_200", "signal_output_200", true); + var callInfo = new CallInfo(200L, + CallInfo.State.CONNECTING, + recipient, + "signal_input_200", + "signal_output_200", + true); var event = JsonCallEvent.from(callInfo, null); @@ -97,8 +114,17 @@ class JsonCallEventTest { void fromWithVariousEndReasons() { var recipient = new RecipientAddress("uuid-1234", null, "+15551111111", null); - var reasons = new String[]{"local_hangup", "remote_hangup", "rejected", "remote_busy", - "ring_timeout", "ice_failed", "tunnel_exit", "tunnel_error", "shutdown"}; + var reasons = new String[]{ + "local_hangup", + "remote_hangup", + "rejected", + "remote_busy", + "ring_timeout", + "ice_failed", + "tunnel_exit", + "tunnel_error", + "shutdown" + }; for (var reason : reasons) { var callInfo = new CallInfo(1L, CallInfo.State.ENDED, recipient, null, null, false);