From 2c03e5fd8dc390e2437dd48cffeb60409c890cf7 Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 10 Sep 2026 16:26:57 +0200 Subject: [PATCH] Reformat files --- .../signal/manager/api/MessageEnvelope.java | 22 +++++++++---------- .../signal/manager/helper/ContactHelper.java | 2 +- .../signal/manager/helper/ProfileHelper.java | 8 +++---- .../signal/manager/helper/SendHelper.java | 20 ++++++++--------- .../signal/manager/internal/ManagerImpl.java | 11 ++++------ .../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 ++--- 11 files changed, 42 insertions(+), 49 deletions(-) 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 a868fb36..d7da6217 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 @@ -267,19 +267,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()); } } @@ -598,7 +598,7 @@ public record MessageEnvelope( Boolean.TRUE.equals(pinnedMessage.getForever()) ? -1 : pinnedMessage.getPinDurationInSeconds() == null - ? 0 + ? 0 : pinnedMessage.getPinDurationInSeconds()); } } @@ -1034,14 +1034,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/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java index 3f8f2600..97b83e67 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 c0425b5f..6abe6677 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 @@ -201,11 +201,9 @@ 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 86e73c85..dd057c23 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 @@ -637,11 +637,11 @@ public class SendHelper { Set senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null ? Set.of() : targetRecipientIds.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(); @@ -705,11 +705,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/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java index 34ba3586..173faf36 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java @@ -300,7 +300,7 @@ public class ManagerImpl implements Manager { final var profile = serviceId == null ? null : context.getProfileHelper() - .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); + .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); return new UserStatus(number.isEmpty() ? null : number, serviceId == null ? null : serviceId.getRawUuid(), profile != null @@ -327,7 +327,7 @@ public class ManagerImpl implements Manager { final var profile = serviceId == null ? null : context.getProfileHelper() - .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); + .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId)); return new UsernameStatus(username, serviceId == null ? null : serviceId.getRawUuid(), profile != null @@ -715,10 +715,7 @@ public class ManagerImpl implements Manager { )) { final var result = notifySelf ? context.getSendHelper() - .sendMessage(messageBuilder, - account.getSelfRecipientId(), - editTargetTimestamp, - urgent) + .sendMessage(messageBuilder, account.getSelfRecipientId(), editTargetTimestamp, urgent) : context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp); results.put(recipient, List.of(toSendMessageResult(result))); } else if (recipient instanceof RecipientIdentifier.Single single) { @@ -1041,7 +1038,7 @@ public class ManagerImpl implements Manager { final var previews = new ArrayList(message.previews().size()); for (final var p : message.previews()) { final var image = p.image().isPresent() ? context.getAttachmentHelper() - .uploadAttachment(p.image().get()) : null; + .uploadAttachment(p.image().get()) : null; previews.add(new SignalServicePreview(p.url(), p.title(), p.description(), 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 3e07c5e6..77511d6e 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 @@ -959,7 +959,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 aadb199d..ceaaef0e 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 @@ -884,9 +884,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 blockedAt = resultSet.getLong("blocked_at"); 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 0edf292a..677e5e08 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 97410474..195b5735 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 @@ -1791,9 +1791,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 9b3377b5..5876354b 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 e1696da5..d017f0a5 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,10 +78,8 @@ 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(""),