From f2005593ecefd37c7e1666c2dc0c71b259271af0 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 23 Nov 2024 21:28:00 +0100 Subject: [PATCH] Reformat files --- .../org/asamk/signal/manager/Manager.java | 70 ++++++++---- .../signal/manager/RegistrationManager.java | 7 +- .../signal/manager/SignalAccountFiles.java | 6 +- .../manager/actions/ResendMessageAction.java | 4 +- .../manager/actions/SendReceiptAction.java | 4 +- .../org/asamk/signal/manager/api/Group.java | 4 +- .../signal/manager/api/MessageEnvelope.java | 14 +-- .../signal/manager/config/ServiceConfig.java | 3 +- .../signal/manager/groups/GroupUtils.java | 3 +- .../signal/manager/helper/AccountHelper.java | 16 ++- .../manager/helper/AttachmentHelper.java | 7 +- .../signal/manager/helper/ContactHelper.java | 4 +- .../signal/manager/helper/GroupHelper.java | 48 +++++--- .../signal/manager/helper/GroupV2Helper.java | 81 +++++++++----- .../signal/manager/helper/IdentityHelper.java | 8 +- .../helper/IncomingMessageHandler.java | 15 ++- .../signal/manager/helper/PinHelper.java | 11 +- .../signal/manager/helper/PreKeyHelper.java | 14 ++- .../signal/manager/helper/ProfileHelper.java | 19 ++-- .../signal/manager/helper/ReceiveHelper.java | 8 +- .../manager/helper/RecipientHelper.java | 9 +- .../signal/manager/helper/SendHelper.java | 29 +++-- .../signal/manager/helper/StickerHelper.java | 7 +- .../signal/manager/helper/StorageHelper.java | 19 +++- .../signal/manager/helper/SyncHelper.java | 21 ++-- .../helper/UnidentifiedAccessHelper.java | 3 +- .../signal/manager/internal/ManagerImpl.java | 88 ++++++++++----- .../internal/RegistrationManagerImpl.java | 7 +- .../manager/storage/AccountDatabase.java | 3 +- .../manager/storage/AttachmentStore.java | 18 +-- .../signal/manager/storage/Database.java | 3 +- .../signal/manager/storage/SignalAccount.java | 20 ++-- .../storage/UnknownStorageIdStore.java | 4 +- .../asamk/signal/manager/storage/Utils.java | 9 +- .../storage/accounts/AccountsStore.java | 8 +- .../configuration/ConfigurationStore.java | 6 +- .../manager/storage/groups/GroupInfoV2.java | 4 +- .../manager/storage/groups/GroupStore.java | 32 ++++-- .../storage/groups/LegacyGroupStore.java | 6 +- .../storage/identities/IdentityInfo.java | 4 +- .../storage/identities/IdentityKeyStore.java | 16 ++- .../identities/LegacyIdentityKeyStore.java | 8 +- .../storage/keyValue/KeyValueStore.java | 12 +- .../storage/profiles/LegacyProfileStore.java | 3 +- .../storage/profiles/ProfileStore.java | 3 +- .../protocol/LegacyJsonIdentityKeyStore.java | 7 +- .../protocol/LegacyJsonPreKeyStore.java | 3 +- .../protocol/LegacyJsonSessionStore.java | 3 +- .../protocol/LegacyJsonSignedPreKeyStore.java | 3 +- .../storage/protocol/SignalProtocolStore.java | 7 +- .../manager/storage/recipients/CdsiStore.java | 12 +- .../recipients/LegacyRecipientStore.java | 3 +- .../recipients/MergeRecipientHelper.java | 3 +- .../storage/recipients/RecipientStore.java | 105 ++++++++++++------ .../recipients/RecipientTrustedResolver.java | 4 +- .../storage/sendLog/MessageSendLogStore.java | 25 ++++- .../senderKeys/SenderKeyRecordStore.java | 8 +- .../senderKeys/SenderKeySharedStore.java | 11 +- .../storage/senderKeys/SenderKeyStore.java | 7 +- .../storage/sessions/SessionStore.java | 4 +- .../threads/LegacyJsonThreadStore.java | 7 +- .../syncStorage/AccountRecordProcessor.java | 4 +- .../syncStorage/ContactRecordProcessor.java | 4 +- .../syncStorage/StorageSyncModels.java | 12 +- .../syncStorage/StorageSyncValidations.java | 8 +- .../signal/manager/util/AttachmentUtils.java | 7 +- .../asamk/signal/manager/util/KeyUtils.java | 7 +- .../manager/util/NumberVerificationUtils.java | 24 +++- .../signal/manager/util/PaymentUtils.java | 8 +- .../signal/manager/util/ProfileUtils.java | 17 +-- .../signal/manager/util/StickerUtils.java | 8 +- .../org/asamk/signal/manager/util/Utils.java | 10 +- .../recipients/MergeRecipientHelperTest.java | 4 +- src/main/java/org/asamk/Signal.java | 74 +++++++----- src/main/java/org/asamk/SignalControl.java | 7 +- src/main/java/org/asamk/signal/App.java | 6 +- .../asamk/signal/ReceiveMessageHandler.java | 60 +++------- .../signal/commands/AddDeviceCommand.java | 4 +- .../commands/AddStickerPackCommand.java | 4 +- .../asamk/signal/commands/BlockCommand.java | 4 +- .../asamk/signal/commands/CommandHandler.java | 9 +- .../asamk/signal/commands/DaemonCommand.java | 8 +- .../DeleteLocalAccountDataCommand.java | 4 +- .../commands/FinishChangeNumberCommand.java | 4 +- .../signal/commands/FinishLinkCommand.java | 4 +- .../signal/commands/GetAttachmentCommand.java | 4 +- .../signal/commands/GetAvatarCommand.java | 4 +- .../signal/commands/GetStickerCommand.java | 4 +- .../signal/commands/GetUserStatusCommand.java | 4 +- .../signal/commands/JoinGroupCommand.java | 4 +- .../commands/JsonRpcDispatcherCommand.java | 8 +- .../signal/commands/JsonRpcLocalCommand.java | 4 +- .../commands/JsonRpcMultiLocalCommand.java | 4 +- .../asamk/signal/commands/LinkCommand.java | 4 +- .../signal/commands/ListAccountsCommand.java | 4 +- .../signal/commands/ListContactsCommand.java | 4 +- .../signal/commands/ListDevicesCommand.java | 4 +- .../signal/commands/ListGroupsCommand.java | 8 +- .../commands/ListIdentitiesCommand.java | 4 +- .../commands/ListStickerPacksCommand.java | 4 +- .../signal/commands/QuitGroupCommand.java | 4 +- .../asamk/signal/commands/ReceiveCommand.java | 8 +- .../signal/commands/RegisterCommand.java | 9 +- .../signal/commands/RemoteDeleteCommand.java | 4 +- .../signal/commands/RemoveContactCommand.java | 4 +- .../signal/commands/RemoveDeviceCommand.java | 4 +- .../signal/commands/RemovePinCommand.java | 4 +- .../asamk/signal/commands/SendCommand.java | 7 +- .../signal/commands/SendContactsCommand.java | 4 +- .../SendMessageRequestResponseCommand.java | 4 +- .../SendPaymentNotificationCommand.java | 4 +- .../signal/commands/SendReactionCommand.java | 4 +- .../signal/commands/SendReceiptCommand.java | 4 +- .../commands/SendSyncRequestCommand.java | 4 +- .../signal/commands/SendTypingCommand.java | 4 +- .../asamk/signal/commands/SetPinCommand.java | 4 +- .../commands/StartChangeNumberCommand.java | 4 +- .../signal/commands/StartLinkCommand.java | 4 +- .../asamk/signal/commands/TrustCommand.java | 4 +- .../asamk/signal/commands/UnblockCommand.java | 4 +- .../signal/commands/UnregisterCommand.java | 4 +- .../signal/commands/UpdateAccountCommand.java | 4 +- .../commands/UpdateConfigurationCommand.java | 4 +- .../signal/commands/UpdateContactCommand.java | 4 +- .../signal/commands/UpdateGroupCommand.java | 8 +- .../signal/commands/UpdateProfileCommand.java | 4 +- .../commands/UploadStickerPackCommand.java | 4 +- .../asamk/signal/commands/VerifyCommand.java | 8 +- .../asamk/signal/commands/VersionCommand.java | 8 +- .../asamk/signal/dbus/DbusCommandHandler.java | 3 +- .../org/asamk/signal/dbus/DbusHandler.java | 5 +- .../dbus/DbusInterfacePropertiesHandler.java | 4 +- .../asamk/signal/dbus/DbusManagerImpl.java | 68 +++++++----- .../dbus/DbusMultiAccountManagerImpl.java | 4 +- .../dbus/DbusProvisioningManagerImpl.java | 4 +- .../dbus/DbusRegistrationManagerImpl.java | 7 +- .../signal/dbus/DbusSignalControlImpl.java | 11 +- .../org/asamk/signal/dbus/DbusSignalImpl.java | 49 ++++---- .../asamk/signal/http/HttpServerHandler.java | 4 +- .../signal/json/JsonMessageEnvelope.java | 4 +- .../asamk/signal/jsonrpc/JsonRpcRequest.java | 9 +- .../jsonrpc/SignalJsonRpcCommandHandler.java | 8 +- .../SignalJsonRpcDispatcherHandler.java | 20 +++- .../asamk/signal/jsonrpc/SocketHandler.java | 4 +- .../asamk/signal/logging/LogConfigurator.java | 6 +- .../org/asamk/signal/logging/Scrubber.java | 4 +- .../org/asamk/signal/util/CommandUtil.java | 6 +- .../signal/util/SendMessageResultUtils.java | 3 +- 148 files changed, 1055 insertions(+), 577 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java index 4b086994..85644f61 100644 --- a/lib/src/main/java/org/asamk/signal/manager/Manager.java +++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java @@ -130,11 +130,15 @@ public interface Manager extends Closeable { void deleteUsername() throws IOException; void startChangeNumber( - String newNumber, boolean voiceVerification, String captcha + String newNumber, + boolean voiceVerification, + String captcha ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException; void finishChangeNumber( - String newNumber, String verificationCode, String pin + String newNumber, + String verificationCode, + String pin ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException; void unregister() throws IOException; @@ -142,7 +146,8 @@ public interface Manager extends Closeable { void deleteAccount() throws IOException; void submitRateLimitRecaptchaChallenge( - String challenge, String captcha + String challenge, + String captcha ) throws IOException, CaptchaRejectedException; List getLinkedDevices() throws IOException; @@ -156,17 +161,21 @@ public interface Manager extends Closeable { List getGroups(); SendGroupMessageResults quitGroup( - GroupId groupId, Set groupAdmins + GroupId groupId, + Set groupAdmins ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException; void deleteGroup(GroupId groupId) throws IOException; Pair createGroup( - String name, Set members, String avatarFile + String name, + Set members, + String avatarFile ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException; SendGroupMessageResults updateGroup( - final GroupId groupId, final UpdateGroup updateGroup + final GroupId groupId, + final UpdateGroup updateGroup ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException; Pair joinGroup( @@ -174,27 +183,29 @@ public interface Manager extends Closeable { ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException; SendMessageResults sendTypingMessage( - TypingAction action, Set recipients + TypingAction action, + Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException; - SendMessageResults sendReadReceipt( - RecipientIdentifier.Single sender, List messageIds - ); + SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List messageIds); - SendMessageResults sendViewedReceipt( - RecipientIdentifier.Single sender, List messageIds - ); + SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List messageIds); SendMessageResults sendMessage( - Message message, Set recipients, boolean notifySelf + Message message, + Set recipients, + boolean notifySelf ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException; SendMessageResults sendEditMessage( - Message message, Set recipients, long editTargetTimestamp + Message message, + Set recipients, + long editTargetTimestamp ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException; SendMessageResults sendRemoteDeleteMessage( - long targetSentTimestamp, Set recipients + long targetSentTimestamp, + Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException; SendMessageResults sendMessageReaction( @@ -207,13 +218,16 @@ public interface Manager extends Closeable { ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException; SendMessageResults sendPaymentNotificationMessage( - byte[] receipt, String note, RecipientIdentifier.Single recipient + byte[] receipt, + String note, + RecipientIdentifier.Single recipient ) throws IOException; SendMessageResults sendEndSessionMessage(Set recipients) throws IOException; SendMessageResults sendMessageRequestResponse( - MessageEnvelope.Sync.MessageRequestResponse.Type type, Set recipientIdentifiers + MessageEnvelope.Sync.MessageRequestResponse.Type type, + Set recipientIdentifiers ); void hideRecipient(RecipientIdentifier.Single recipient); @@ -223,22 +237,27 @@ public interface Manager extends Closeable { void deleteContact(RecipientIdentifier.Single recipient); void setContactName( - RecipientIdentifier.Single recipient, String givenName, final String familyName + RecipientIdentifier.Single recipient, + String givenName, + final String familyName ) throws NotPrimaryDeviceException, UnregisteredRecipientException; void setContactsBlocked( - Collection recipient, boolean blocked + Collection recipient, + boolean blocked ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException; void setGroupsBlocked( - Collection groupId, boolean blocked + Collection groupId, + boolean blocked ) throws GroupNotFoundException, IOException, NotPrimaryDeviceException; /** * Change the expiration timer for a contact */ void setExpirationTimer( - RecipientIdentifier.Single recipient, int messageExpirationTimer + RecipientIdentifier.Single recipient, + int messageExpirationTimer ) throws IOException, UnregisteredRecipientException; /** @@ -277,7 +296,9 @@ public interface Manager extends Closeable { * Receive new messages from server, returns if no new message arrive in a timespan of timeout. */ void receiveMessages( - Optional timeout, Optional maxMessages, ReceiveMessageHandler handler + Optional timeout, + Optional maxMessages, + ReceiveMessageHandler handler ) throws IOException, AlreadyReceivingException; void stopReceiveMessages(); @@ -309,7 +330,8 @@ public interface Manager extends Closeable { * @param recipient account of the identity */ boolean trustIdentityVerified( - RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode + RecipientIdentifier.Single recipient, + IdentityVerificationCode verificationCode ) throws UnregisteredRecipientException; /** diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java index 5660bb13..7d358df6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java +++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java @@ -13,11 +13,14 @@ import java.io.IOException; public interface RegistrationManager extends Closeable { void register( - boolean voiceVerification, String captcha, final boolean forceRegister + boolean voiceVerification, + String captcha, + final boolean forceRegister ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException; void verifyAccount( - String verificationCode, String pin + String verificationCode, + String pin ) throws IOException, PinLockedException, IncorrectPinException; void deleteLocalAccountData() throws IOException; diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java index 03c44013..4072a9df 100644 --- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java +++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java @@ -85,7 +85,8 @@ public class SignalAccountFiles { } private Manager initManager( - String number, String accountPath + String number, + String accountPath ) throws IOException, NotRegisteredException, AccountCheckException { if (accountPath == null) { throw new NotRegisteredException(); @@ -152,7 +153,8 @@ public class SignalAccountFiles { } public RegistrationManager initRegistrationManager( - String number, Consumer newManagerListener + String number, + Consumer newManagerListener ) throws IOException { final var accountPath = accountsStore.getPathByNumber(number); if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) { diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java index 9f399dd8..a8f67fd6 100644 --- a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java +++ b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java @@ -13,7 +13,9 @@ public class ResendMessageAction implements HandleAction { private final MessageSendLogEntry messageSendLogEntry; public ResendMessageAction( - final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry + final RecipientId recipientId, + final long timestamp, + final MessageSendLogEntry messageSendLogEntry ) { this.recipientId = recipientId; this.timestamp = timestamp; diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java index c08438b5..6a5cfd59 100644 --- a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java +++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java @@ -15,7 +15,9 @@ public class SendReceiptAction implements HandleAction { private final List timestamps = new ArrayList<>(); public SendReceiptAction( - final RecipientId recipientId, final SignalServiceReceiptMessage.Type type, final long timestamp + final RecipientId recipientId, + final SignalServiceReceiptMessage.Type type, + final long timestamp ) { this.recipientId = recipientId; this.type = type; diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Group.java b/lib/src/main/java/org/asamk/signal/manager/api/Group.java index 5e7e36f8..4d1fdaa1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java @@ -27,7 +27,9 @@ public record Group( ) { public static Group from( - final GroupInfo groupInfo, final RecipientAddressResolver recipientStore, final RecipientId selfRecipientId + final GroupInfo groupInfo, + final RecipientAddressResolver recipientStore, + final RecipientId selfRecipientId ) { return new Group(groupInfo.getGroupId(), groupInfo.getTitle(), 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 aefaa800..5598d438 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 @@ -338,7 +338,8 @@ public record MessageEnvelope( } static Attachment from( - SignalServiceDataMessage.Quote.QuotedAttachment a, final AttachmentFileProvider fileProvider + SignalServiceDataMessage.Quote.QuotedAttachment a, + final AttachmentFileProvider fileProvider ) { return new Attachment(Optional.empty(), Optional.empty(), @@ -510,9 +511,7 @@ public record MessageEnvelope( public record Preview(String title, String description, long date, String url, Optional image) { - static Preview from( - SignalServicePreview preview, final AttachmentFileProvider fileProvider - ) { + static Preview from(SignalServicePreview preview, final AttachmentFileProvider fileProvider) { return new Preview(preview.getTitle(), preview.getDescription(), preview.getDate(), @@ -832,9 +831,7 @@ public record MessageEnvelope( Optional textAttachment ) { - public static Story from( - SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider - ) { + public static Story from(SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider) { return new Story(storyMessage.getAllowsReplies().orElse(false), storyMessage.getGroupContext().map(c -> GroupUtils.getGroupIdV2(c.getMasterKey())), storyMessage.getFileAttachment().map(f -> Data.Attachment.from(f, fileProvider)), @@ -852,7 +849,8 @@ public record MessageEnvelope( ) { static TextAttachment from( - SignalServiceTextAttachment textAttachment, final AttachmentFileProvider fileProvider + SignalServiceTextAttachment textAttachment, + final AttachmentFileProvider fileProvider ) { return new TextAttachment(textAttachment.getText(), textAttachment.getStyle().map(Style::from), diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java index 7ee80815..482e0f60 100644 --- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java +++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java @@ -33,7 +33,8 @@ public class ServiceConfig { } public static ServiceEnvironmentConfig getServiceEnvironmentConfig( - ServiceEnvironment serviceEnvironment, String userAgent + ServiceEnvironment serviceEnvironment, + String userAgent ) { final Interceptor userAgentInterceptor = chain -> chain.proceed(chain.request() .newBuilder() diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java index 76352d1a..ae686c36 100644 --- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java @@ -18,7 +18,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2; public class GroupUtils { public static void setGroupContext( - final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo groupInfo + final SignalServiceDataMessage.Builder messageBuilder, + final GroupInfo groupInfo ) { if (groupInfo instanceof GroupInfoV1) { var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java index 474a2822..d5e8581e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java @@ -165,7 +165,9 @@ public class AccountHelper { } public void startChangeNumber( - String newNumber, boolean voiceVerification, String captcha + String newNumber, + boolean voiceVerification, + String captcha ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException { final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword()); final var registrationApi = accountManager.getRegistrationApi(); @@ -178,7 +180,9 @@ public class AccountHelper { } public void finishChangeNumber( - String newNumber, String verificationCode, String pin + String newNumber, + String verificationCode, + String pin ) throws IncorrectPinException, PinLockedException, IOException { for (var attempts = 0; attempts < 5; attempts++) { try { @@ -196,7 +200,9 @@ public class AccountHelper { } private void finishChangeNumberInternal( - String newNumber, String verificationCode, String pin + String newNumber, + String verificationCode, + String pin ) throws IncorrectPinException, PinLockedException, IOException { final var pniIdentity = KeyUtils.generateIdentityKeyPair(); final var encryptedDeviceMessages = new ArrayList(); @@ -308,9 +314,7 @@ public class AccountHelper { handlePniChangeNumberMessage(selfChangeNumber, updatePni); } - public void handlePniChangeNumberMessage( - final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni - ) { + public void handlePniChangeNumberMessage(final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni) { if (pniChangeNumber.identityKeyPair != null && pniChangeNumber.registrationId != null && pniChangeNumber.signedPreKey != null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java index 3005325a..0ffa62ed 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java @@ -104,9 +104,7 @@ public class AttachmentHelper { retrieveAttachment(attachment, input -> IOUtils.copyStream(input, outputStream)); } - public void retrieveAttachment( - SignalServiceAttachment attachment, AttachmentHandler consumer - ) throws IOException { + public void retrieveAttachment(SignalServiceAttachment attachment, AttachmentHandler consumer) throws IOException { if (attachment.isStream()) { var input = attachment.asStream().getInputStream(); // don't close input stream here, it might be reused later (e.g. with contact sync messages ...) @@ -131,7 +129,8 @@ public class AttachmentHelper { } private InputStream retrieveAttachmentAsStream( - SignalServiceAttachmentPointer pointer, File tmpFile + SignalServiceAttachmentPointer pointer, + File tmpFile ) throws IOException { try { return dependencies.getMessageReceiver() 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 56ef89ed..fafb9ffe 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 @@ -49,7 +49,9 @@ public class ContactHelper { } public void setExpirationTimer( - RecipientId recipientId, int messageExpirationTimer, int messageExpirationTimerVersion + RecipientId recipientId, + int messageExpirationTimer, + int messageExpirationTimerVersion ) { var contact = account.getContactStore().getContact(recipientId); if (contact != null && ( diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java index ad31f35b..0d838204 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java @@ -118,7 +118,9 @@ public class GroupHelper { } public GroupInfoV2 getOrMigrateGroup( - final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange + final GroupMasterKey groupMasterKey, + final int revision, + final byte[] signedGroupChange ) { final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey); @@ -166,7 +168,8 @@ public class GroupHelper { } private DecryptedGroup handleDecryptedGroupResponse( - GroupInfoV2 groupInfoV2, final DecryptedGroupResponse decryptedGroupResponse + GroupInfoV2 groupInfoV2, + final DecryptedGroupResponse decryptedGroupResponse ) { final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()); ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations() @@ -181,7 +184,8 @@ public class GroupHelper { } private GroupChange handleGroupChangeResponse( - final GroupInfoV2 groupInfoV2, final GroupChangeResponse groupChangeResponse + final GroupInfoV2 groupInfoV2, + final GroupChangeResponse groupChangeResponse ) { ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations() .forGroup(GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey())) @@ -195,7 +199,9 @@ public class GroupHelper { } public Pair createGroup( - String name, Set members, String avatarFile + String name, + Set members, + String avatarFile ) throws IOException, AttachmentInvalidException { final var selfRecipientId = account.getSelfRecipientId(); if (members != null && members.contains(selfRecipientId)) { @@ -363,7 +369,8 @@ public class GroupHelper { } public SendGroupMessageResults quitGroup( - final GroupId groupId, final Set newAdmins + final GroupId groupId, + final Set newAdmins ) throws IOException, LastGroupAdminException, NotAGroupMemberException, GroupNotFoundException { var group = getGroupForUpdating(groupId); if (group instanceof GroupInfoV1) { @@ -396,9 +403,7 @@ public class GroupHelper { context.getJobExecutor().enqueueJob(new SyncStorageJob()); } - public SendGroupMessageResults sendGroupInfoRequest( - GroupIdV1 groupId, RecipientId recipientId - ) throws IOException { + public SendGroupMessageResults sendGroupInfoRequest(GroupIdV1 groupId, RecipientId recipientId) throws IOException { var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize()); var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build()); @@ -408,7 +413,8 @@ public class GroupHelper { } public SendGroupMessageResults sendGroupInfoMessage( - GroupIdV1 groupId, RecipientId recipientId + GroupIdV1 groupId, + RecipientId recipientId ) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException { GroupInfoV1 g; var group = getGroupForUpdating(groupId); @@ -480,7 +486,9 @@ public class GroupHelper { } private void retrieveGroupV2Avatar( - GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream + GroupSecretParams groupSecretParams, + String cdnKey, + OutputStream outputStream ) throws IOException { var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams); @@ -583,7 +591,10 @@ public class GroupHelper { } private SendGroupMessageResults updateGroupV1( - final GroupInfoV1 gv1, final String name, final Set members, final byte[] avatarFile + final GroupInfoV1 gv1, + final String name, + final Set members, + final byte[] avatarFile ) throws IOException, AttachmentInvalidException { updateGroupV1Details(gv1, name, members, avatarFile); @@ -596,7 +607,10 @@ public class GroupHelper { } private void updateGroupV1Details( - final GroupInfoV1 g, final String name, final Collection members, final byte[] avatarFile + final GroupInfoV1 g, + final String name, + final Collection members, + final byte[] avatarFile ) throws IOException { if (name != null) { g.name = name; @@ -615,7 +629,8 @@ public class GroupHelper { * Change the expiration timer for a group */ private void setExpirationTimer( - GroupInfoV1 groupInfoV1, int messageExpirationTimer + GroupInfoV1 groupInfoV1, + int messageExpirationTimer ) throws NotAGroupMemberException, GroupNotFoundException, IOException, GroupSendingNotAllowedException { groupInfoV1.messageExpirationTime = messageExpirationTimer; account.getGroupStore().updateGroup(groupInfoV1); @@ -828,7 +843,8 @@ public class GroupHelper { } private SendGroupMessageResults quitGroupV2( - final GroupInfoV2 groupInfoV2, final Set newAdmins + final GroupInfoV2 groupInfoV2, + final Set newAdmins ) throws LastGroupAdminException, IOException { final var currentAdmins = groupInfoV2.getAdminMembers(); newAdmins.removeAll(currentAdmins); @@ -882,7 +898,9 @@ public class GroupHelper { } private SendGroupMessageResults sendUpdateGroupV2Message( - GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange + GroupInfoV2 group, + DecryptedGroup newDecryptedGroup, + GroupChange groupChange ) throws IOException { final var selfRecipientId = account.getSelfRecipientId(); final var members = group.getMembersIncludingPendingWithout(selfRecipientId); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java index 6c6acd65..05bc876a 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java @@ -94,7 +94,8 @@ class GroupV2Helper { } DecryptedGroupJoinInfo getDecryptedGroupJoinInfo( - GroupMasterKey groupMasterKey, GroupLinkPassword password + GroupMasterKey groupMasterKey, + GroupLinkPassword password ) throws IOException, GroupLinkNotActiveException { var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey); @@ -105,7 +106,9 @@ class GroupV2Helper { } GroupHistoryPage getDecryptedGroupHistoryPage( - final GroupSecretParams groupSecretParams, int fromRevision, long sendEndorsementsExpirationMs + final GroupSecretParams groupSecretParams, + int fromRevision, + long sendEndorsementsExpirationMs ) throws NotAGroupMemberException { try { final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams); @@ -138,9 +141,7 @@ class GroupV2Helper { return partialDecryptedGroup.revision; } - Pair createGroup( - String name, Set members, byte[] avatarFile - ) { + Pair createGroup(String name, Set members, byte[] avatarFile) { final var newGroup = buildNewGroup(name, members, avatarFile); if (newGroup == null) { return null; @@ -170,9 +171,7 @@ class GroupV2Helper { return new Pair<>(g, response); } - private GroupsV2Operations.NewGroup buildNewGroup( - String name, Set members, byte[] avatar - ) { + private GroupsV2Operations.NewGroup buildNewGroup(String name, Set members, byte[] avatar) { final var profileKeyCredential = context.getProfileHelper() .getExpiringProfileKeyCredential(context.getAccount().getSelfRecipientId()); if (profileKeyCredential == null) { @@ -202,7 +201,10 @@ class GroupV2Helper { } Pair updateGroup( - GroupInfoV2 groupInfoV2, String name, String description, byte[] avatarFile + GroupInfoV2 groupInfoV2, + String name, + String description, + byte[] avatarFile ) throws IOException { final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()); var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams); @@ -225,7 +227,8 @@ class GroupV2Helper { } Pair addMembers( - GroupInfoV2 groupInfoV2, Set newMembers + GroupInfoV2 groupInfoV2, + Set newMembers ) throws IOException { GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -251,7 +254,8 @@ class GroupV2Helper { } Pair leaveGroup( - GroupInfoV2 groupInfoV2, Set membersToMakeAdmin + GroupInfoV2 groupInfoV2, + Set membersToMakeAdmin ) throws IOException { var pendingMembersList = groupInfoV2.getGroup().pendingMembers; final var selfAci = getSelfAci(); @@ -271,7 +275,8 @@ class GroupV2Helper { } Pair removeMembers( - GroupInfoV2 groupInfoV2, Set members + GroupInfoV2 groupInfoV2, + Set members ) throws IOException { final var memberUuids = members.stream() .map(context.getRecipientHelper()::resolveSignalServiceAddress) @@ -283,7 +288,8 @@ class GroupV2Helper { } Pair approveJoinRequestMembers( - GroupInfoV2 groupInfoV2, Set members + GroupInfoV2 groupInfoV2, + Set members ) throws IOException { final var memberUuids = members.stream() .map(context.getRecipientHelper()::resolveSignalServiceAddress) @@ -294,7 +300,8 @@ class GroupV2Helper { } Pair refuseJoinRequestMembers( - GroupInfoV2 groupInfoV2, Set members + GroupInfoV2 groupInfoV2, + Set members ) throws IOException { final var memberUuids = members.stream() .map(context.getRecipientHelper()::resolveSignalServiceAddress) @@ -304,7 +311,8 @@ class GroupV2Helper { } Pair revokeInvitedMembers( - GroupInfoV2 groupInfoV2, Set members + GroupInfoV2 groupInfoV2, + Set members ) throws IOException { var pendingMembersList = groupInfoV2.getGroup().pendingMembers; final var memberUuids = members.stream() @@ -318,7 +326,8 @@ class GroupV2Helper { } Pair banMembers( - GroupInfoV2 groupInfoV2, Set block + GroupInfoV2 groupInfoV2, + Set block ) throws IOException { GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -336,7 +345,8 @@ class GroupV2Helper { } Pair unbanMembers( - GroupInfoV2 groupInfoV2, Set block + GroupInfoV2 groupInfoV2, + Set block ) throws IOException { GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -359,7 +369,8 @@ class GroupV2Helper { } Pair setGroupLinkState( - GroupInfoV2 groupInfoV2, GroupLinkState state + GroupInfoV2 groupInfoV2, + GroupLinkState state ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -374,7 +385,8 @@ class GroupV2Helper { } Pair setEditDetailsPermission( - GroupInfoV2 groupInfoV2, GroupPermission permission + GroupInfoV2 groupInfoV2, + GroupPermission permission ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -384,7 +396,8 @@ class GroupV2Helper { } Pair setAddMemberPermission( - GroupInfoV2 groupInfoV2, GroupPermission permission + GroupInfoV2 groupInfoV2, + GroupPermission permission ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); @@ -468,7 +481,9 @@ class GroupV2Helper { } Pair setMemberAdmin( - GroupInfoV2 groupInfoV2, RecipientId recipientId, boolean admin + GroupInfoV2 groupInfoV2, + RecipientId recipientId, + boolean admin ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId); @@ -482,7 +497,8 @@ class GroupV2Helper { } Pair setMessageExpirationTimer( - GroupInfoV2 groupInfoV2, int messageExpirationTimer + GroupInfoV2 groupInfoV2, + int messageExpirationTimer ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var change = groupOperations.createModifyGroupTimerChange(messageExpirationTimer); @@ -490,7 +506,8 @@ class GroupV2Helper { } Pair setIsAnnouncementGroup( - GroupInfoV2 groupInfoV2, boolean isAnnouncementGroup + GroupInfoV2 groupInfoV2, + boolean isAnnouncementGroup ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var change = groupOperations.createAnnouncementGroupChange(isAnnouncementGroup); @@ -518,7 +535,8 @@ class GroupV2Helper { } private Pair revokeInvites( - GroupInfoV2 groupInfoV2, Set pendingMembers + GroupInfoV2 groupInfoV2, + Set pendingMembers ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); final var uuidCipherTexts = pendingMembers.stream().map(member -> { @@ -532,28 +550,32 @@ class GroupV2Helper { } private Pair approveJoinRequest( - GroupInfoV2 groupInfoV2, Set uuids + GroupInfoV2 groupInfoV2, + Set uuids ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); return commitChange(groupInfoV2, groupOperations.createApproveGroupJoinRequest(uuids)); } private Pair refuseJoinRequest( - GroupInfoV2 groupInfoV2, Set serviceIds + GroupInfoV2 groupInfoV2, + Set serviceIds ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(serviceIds, false, List.of())); } private Pair ejectMembers( - GroupInfoV2 groupInfoV2, Set members + GroupInfoV2 groupInfoV2, + Set members ) throws IOException { final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2); return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(members, false, List.of())); } private Pair commitChange( - GroupInfoV2 groupInfoV2, GroupChange.Actions.Builder change + GroupInfoV2 groupInfoV2, + GroupChange.Actions.Builder change ) throws IOException { final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()); final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams); @@ -676,7 +698,8 @@ class GroupV2Helper { } private GroupsV2AuthorizationString getAuthorizationString( - final GroupSecretParams groupSecretParams, final long todaySeconds + final GroupSecretParams groupSecretParams, + final long todaySeconds ) throws VerificationFailedException { var authCredentialResponse = groupApiCredentials.get(todaySeconds); final var aci = getSelfAci(); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java index cc71e15c..82d44fde 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java @@ -66,9 +66,7 @@ public class IdentityHelper { return fingerprint == null ? null : fingerprint.getScannableFingerprint(); } - private Fingerprint computeSafetyNumberFingerprint( - final ServiceId serviceId, final IdentityKey theirIdentityKey - ) { + private Fingerprint computeSafetyNumberFingerprint(final ServiceId serviceId, final IdentityKey theirIdentityKey) { if (!serviceId.isUnknown()) { return Utils.computeSafetyNumberForUuid(account.getAci(), account.getAciIdentityKeyPair().getPublicKey(), @@ -89,7 +87,9 @@ public class IdentityHelper { } private boolean trustIdentity( - RecipientId recipientId, BiFunction verifier, TrustLevel trustLevel + RecipientId recipientId, + BiFunction verifier, + TrustLevel trustLevel ) { final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId); final var serviceId = address.serviceId().orElse(null); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java index 294b17f6..376a671b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java @@ -190,7 +190,9 @@ public final class IncomingMessageHandler { } private SignalServiceContent validate( - Envelope envelope, SignalServiceCipherResult cipherResult, long serverDeliveredTimestamp + Envelope envelope, + SignalServiceCipherResult cipherResult, + long serverDeliveredTimestamp ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException { final var content = cipherResult.getContent(); final var envelopeMetadata = cipherResult.getMetadata(); @@ -280,7 +282,9 @@ public final class IncomingMessageHandler { } public List handleMessage( - SignalServiceEnvelope envelope, SignalServiceContent content, ReceiveConfig receiveConfig + SignalServiceEnvelope envelope, + SignalServiceContent content, + ReceiveConfig receiveConfig ) { var actions = new ArrayList(); final var senderDeviceAddress = getSender(envelope, content); @@ -381,7 +385,8 @@ public final class IncomingMessageHandler { } private boolean handlePniSignatureMessage( - final SignalServicePniSignatureMessage message, final SignalServiceAddress senderAddress + final SignalServicePniSignatureMessage message, + final SignalServiceAddress senderAddress ) { final var aci = senderAddress.getServiceId(); final var aciIdentity = account.getIdentityKeyStore().getIdentityInfo(aci); @@ -865,7 +870,9 @@ public final class IncomingMessageHandler { } private List handleSignalServiceStoryMessage( - SignalServiceStoryMessage message, RecipientId source, boolean ignoreAttachments + SignalServiceStoryMessage message, + RecipientId source, + boolean ignoreAttachments ) { var actions = new ArrayList(); if (message.getGroupContext().isPresent()) { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java index 7669b383..a95635cf 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java @@ -21,9 +21,7 @@ public class PinHelper { this.secureValueRecoveries = secureValueRecoveries; } - public void setRegistrationLockPin( - String pin, MasterKey masterKey - ) throws IOException { + public void setRegistrationLockPin(String pin, MasterKey masterKey) throws IOException { IOException exception = null; for (final var secureValueRecovery : secureValueRecoveries) { try { @@ -82,7 +80,8 @@ public class PinHelper { } public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData( - String pin, LockedException lockedException + String pin, + LockedException lockedException ) throws IOException, IncorrectPinException { var svr2Credentials = lockedException.getSvr2Credentials(); if (svr2Credentials != null) { @@ -103,7 +102,9 @@ public class PinHelper { } public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData( - SecureValueRecovery secureValueRecovery, AuthCredentials authCredentials, String pin + SecureValueRecovery secureValueRecovery, + AuthCredentials authCredentials, + String pin ) throws IOException, IncorrectPinException { final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, null, pin); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java index 864ef656..339425c1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java @@ -30,9 +30,7 @@ public class PreKeyHelper { private final SignalAccount account; private final SignalDependencies dependencies; - public PreKeyHelper( - final SignalAccount account, final SignalDependencies dependencies - ) { + public PreKeyHelper(final SignalAccount account, final SignalDependencies dependencies) { this.account = account; this.dependencies = dependencies; } @@ -79,7 +77,8 @@ public class PreKeyHelper { } private boolean refreshPreKeysIfNecessary( - final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair + final ServiceIdType serviceIdType, + final IdentityKeyPair identityKeyPair ) throws IOException { OneTimePreKeyCounts preKeyCounts; try { @@ -221,7 +220,8 @@ public class PreKeyHelper { } private List generateKyberPreKeys( - ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair + ServiceIdType serviceIdType, + final IdentityKeyPair identityKeyPair ) { final var accountData = account.getAccountData(serviceIdType); final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId(); @@ -246,7 +246,9 @@ public class PreKeyHelper { } private KyberPreKeyRecord generateLastResortKyberPreKey( - ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair, final int offset + ServiceIdType serviceIdType, + IdentityKeyPair identityKeyPair, + final int offset ) { final var accountData = account.getAccountData(serviceIdType); final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId() + offset; 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 03d277f9..184eac6b 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 @@ -271,7 +271,9 @@ public final class ProfileHelper { } private Profile decryptProfileAndDownloadAvatar( - final RecipientId recipientId, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile + final RecipientId recipientId, + final ProfileKey profileKey, + final SignalServiceProfile encryptedProfile ) { final var avatarPath = encryptedProfile.getAvatar(); downloadProfileAvatar(recipientId, avatarPath, profileKey); @@ -280,7 +282,9 @@ public final class ProfileHelper { } public void downloadProfileAvatar( - final RecipientId recipientId, final String avatarPath, final ProfileKey profileKey + final RecipientId recipientId, + final String avatarPath, + final ProfileKey profileKey ) { var profile = account.getProfileStore().getProfile(recipientId); if (profile == null || !Objects.equals(avatarPath, profile.getAvatarUrlPath())) { @@ -308,7 +312,8 @@ public final class ProfileHelper { } private Single retrieveProfile( - RecipientId recipientId, SignalServiceProfile.RequestType requestType + RecipientId recipientId, + SignalServiceProfile.RequestType requestType ) { var unidentifiedAccess = getUnidentifiedAccess(recipientId); var profileKey = Optional.ofNullable(account.getProfileStore().getProfileKey(recipientId)); @@ -408,9 +413,7 @@ public final class ProfileHelper { }); } - private void downloadProfileAvatar( - RecipientAddress address, String avatarPath, ProfileKey profileKey - ) { + private void downloadProfileAvatar(RecipientAddress address, String avatarPath, ProfileKey profileKey) { if (avatarPath == null) { try { context.getAvatarStore().deleteProfileAvatar(address); @@ -430,7 +433,9 @@ public final class ProfileHelper { } private void retrieveProfileAvatar( - String avatarPath, ProfileKey profileKey, OutputStream outputStream + String avatarPath, + ProfileKey profileKey, + OutputStream outputStream ) throws IOException { var tmpFile = IOUtils.createTempFile(); try (var input = dependencies.getMessageReceiver() diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java index baa0d583..ab75bd16 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java @@ -83,7 +83,10 @@ public class ReceiveHelper { } public void receiveMessages( - Duration timeout, boolean returnOnTimeout, Integer maxMessages, Manager.ReceiveMessageHandler handler + Duration timeout, + boolean returnOnTimeout, + Integer maxMessages, + Manager.ReceiveMessageHandler handler ) throws IOException { account.setNeedsToRetryFailedMessages(true); hasCaughtUpWithOldMessages = false; @@ -264,7 +267,8 @@ public class ReceiveHelper { } private List retryFailedReceivedMessage( - final Manager.ReceiveMessageHandler handler, final CachedMessage cachedMessage + final Manager.ReceiveMessageHandler handler, + final CachedMessage cachedMessage ) { var envelope = cachedMessage.loadEnvelope(); if (envelope == null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java index 24b3eb5f..6225b982 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java @@ -97,7 +97,8 @@ public class RecipientHelper { } public RecipientId resolveRecipientByUsernameOrLink( - String username, boolean forceRefresh + String username, + boolean forceRefresh ) throws UnregisteredRecipientException { final Username finalUsername; try { @@ -180,7 +181,8 @@ public class RecipientHelper { } private Map getRegisteredUsers( - final Set numbers, final boolean isPartialRefresh + final Set numbers, + final boolean isPartialRefresh ) throws IOException { Map registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh); @@ -211,7 +213,8 @@ public class RecipientHelper { } private Map getRegisteredUsersV2( - final Set numbers, boolean isPartialRefresh + final Set numbers, + boolean isPartialRefresh ) throws IOException { final var previousNumbers = isPartialRefresh ? Set.of() : account.getCdsiStore().getAllNumbers(); final var newNumbers = new HashSet<>(numbers) {{ 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 0622b4a8..2fb55003 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 @@ -125,7 +125,8 @@ public class SendHelper { } public SendMessageResult sendReceiptMessage( - final SignalServiceReceiptMessage receiptMessage, final RecipientId recipientId + final SignalServiceReceiptMessage receiptMessage, + final RecipientId recipientId ) { final var messageSendLogStore = account.getMessageSendLogStore(); final var result = handleSendMessage(recipientId, @@ -157,7 +158,9 @@ public class SendHelper { } public SendMessageResult sendRetryReceipt( - DecryptionErrorMessage errorMessage, RecipientId recipientId, Optional groupId + DecryptionErrorMessage errorMessage, + RecipientId recipientId, + Optional groupId ) { logger.debug("Sending retry receipt for {} to {}, device: {}", errorMessage.getTimestamp(), @@ -183,7 +186,8 @@ public class SendHelper { } public SendMessageResult sendSelfMessage( - SignalServiceDataMessage.Builder messageBuilder, Optional editTargetTimestamp + SignalServiceDataMessage.Builder messageBuilder, + Optional editTargetTimestamp ) { final var recipientId = account.getSelfRecipientId(); final var contact = account.getContactStore().getContact(recipientId); @@ -214,9 +218,7 @@ public class SendHelper { } } - public SendMessageResult sendTypingMessage( - SignalServiceTypingMessage message, RecipientId recipientId - ) { + public SendMessageResult sendTypingMessage(SignalServiceTypingMessage message, RecipientId recipientId) { final var result = handleSendMessage(recipientId, (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendTyping(List.of( address), List.of(unidentifiedAccess), message, null).getFirst()); @@ -225,7 +227,8 @@ public class SendHelper { } public List sendGroupTypingMessage( - SignalServiceTypingMessage message, GroupId groupId + SignalServiceTypingMessage message, + GroupId groupId ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { final var g = getGroupForSending(groupId); if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) { @@ -238,7 +241,9 @@ public class SendHelper { } public SendMessageResult resendMessage( - final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry + final RecipientId recipientId, + final long timestamp, + final MessageSendLogEntry messageSendLogEntry ) { logger.trace("Resending message {} to {}", timestamp, recipientId); if (messageSendLogEntry.groupId().isEmpty()) { @@ -552,7 +557,9 @@ public class SendHelper { } private List sendGroupMessageInternalWithLegacy( - final LegacySenderHandler sender, final Set recipientIds, final boolean isRecipientUpdate + final LegacySenderHandler sender, + final Set recipientIds, + final boolean isRecipientUpdate ) throws IOException { final var recipientIdList = new ArrayList<>(recipientIds); final var addresses = recipientIdList.stream() @@ -644,7 +651,9 @@ public class SendHelper { } private SendMessageResult sendMessage( - SignalServiceDataMessage message, RecipientId recipientId, Optional editTargetTimestamp + SignalServiceDataMessage message, + RecipientId recipientId, + Optional editTargetTimestamp ) { final var messageSendLogStore = account.getMessageSendLogStore(); final var urgent = true; diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java index 4a0d25fe..b6d90ff9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java @@ -30,7 +30,9 @@ public class StickerHelper { } public StickerPack addOrUpdateStickerPack( - final StickerPackId stickerPackId, final byte[] stickerPackKey, final boolean installed + final StickerPackId stickerPackId, + final byte[] stickerPackKey, + final boolean installed ) { final var sticker = account.getStickerStore().getStickerPack(stickerPackId); if (sticker != null) { @@ -50,7 +52,8 @@ public class StickerHelper { } public JsonStickerPack getOrRetrieveStickerPack( - StickerPackId packId, byte[] packKey + StickerPackId packId, + byte[] packKey ) throws InvalidStickerException { try { retrieveStickerPack(packId, packKey); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java index c18e8df3..8c6b3c52 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java @@ -218,7 +218,9 @@ public class StorageHelper { } private boolean writeToStorage( - final StorageKey storageKey, final SignalStorageManifest remoteManifest, final boolean needsForcePush + final StorageKey storageKey, + final SignalStorageManifest remoteManifest, + final boolean needsForcePush ) throws IOException, RetryLaterException { final WriteOperationResult remoteWriteOperation; try (final var connection = account.getAccountDatabase().getConnection()) { @@ -408,7 +410,8 @@ public class StorageHelper { } private List getSignalStorageRecords( - final StorageKey storageKey, final List storageIds + final StorageKey storageKey, + final List storageIds ) throws IOException { List records; try { @@ -430,7 +433,8 @@ public class StorageHelper { } private List buildLocalStorageRecords( - final Connection connection, final List storageIds + final Connection connection, + final List storageIds ) throws SQLException { final var records = new ArrayList(); for (final var storageId : storageIds) { @@ -443,7 +447,8 @@ public class StorageHelper { } private SignalStorageRecord buildLocalStorageRecord( - Connection connection, StorageId storageId + Connection connection, + StorageId storageId ) throws SQLException { return switch (ManifestRecord.Identifier.Type.fromValue(storageId.getType())) { case ManifestRecord.Identifier.Type.CONTACT -> { @@ -484,7 +489,8 @@ public class StorageHelper { * exclusive to the local data set. */ private static IdDifferenceResult findIdDifference( - Collection remoteIds, Collection localIds + Collection remoteIds, + Collection localIds ) { final var base64Encoder = Base64.getEncoder(); final var remoteByRawId = remoteIds.stream() @@ -520,7 +526,8 @@ public class StorageHelper { } private List processKnownRecords( - final Connection connection, List records + final Connection connection, + List records ) throws SQLException { final var unknownRecords = new ArrayList(); diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java index 56665fda..70427f00 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java @@ -217,7 +217,9 @@ public class SyncHelper { @NotNull private DeviceContact getDeviceContact( - final RecipientAddress address, final RecipientId recipientId, final Contact contact + final RecipientAddress address, + final RecipientId recipientId, + final Contact contact ) throws IOException { var currentIdentity = address.serviceId().isEmpty() ? null @@ -262,7 +264,9 @@ public class SyncHelper { } public SendMessageResult sendVerifiedMessage( - SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel + SignalServiceAddress destination, + IdentityKey identityKey, + TrustLevel trustLevel ) { var verifiedMessage = new VerifiedMessage(destination, identityKey, @@ -278,7 +282,8 @@ public class SyncHelper { } public SendMessageResult sendStickerOperationsMessage( - List installStickers, List removeStickers + List installStickers, + List removeStickers ) { var installStickerMessages = installStickers.stream().map(s -> getStickerPackOperationMessage(s, true)); var removeStickerMessages = removeStickers.stream().map(s -> getStickerPackOperationMessage(s, false)); @@ -288,7 +293,8 @@ public class SyncHelper { } private static StickerPackOperationMessage getStickerPackOperationMessage( - final StickerPack s, final boolean installed + final StickerPack s, + final boolean installed ) { return new StickerPackOperationMessage(s.packId().serialize(), s.packKey(), @@ -414,15 +420,14 @@ public class SyncHelper { } } - public SendMessageResult sendMessageRequestResponse( - final MessageRequestResponse.Type type, final GroupId groupId - ) { + public SendMessageResult sendMessageRequestResponse(final MessageRequestResponse.Type type, final GroupId groupId) { final var response = MessageRequestResponseMessage.forGroup(groupId.serialize(), localToRemoteType(type)); return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response)); } public SendMessageResult sendMessageRequestResponse( - final MessageRequestResponse.Type type, final RecipientId recipientId + final MessageRequestResponse.Type type, + final RecipientId recipientId ) { final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId); if (address.serviceId().isEmpty()) { diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java index 3899179c..fb39789e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java @@ -158,7 +158,8 @@ public class UnidentifiedAccessHelper { } private static byte[] getTargetUnidentifiedAccessKey( - final Profile targetProfile, final ProfileKey theirProfileKey + final Profile targetProfile, + final ProfileKey theirProfileKey ) { return switch (targetProfile.getUnidentifiedAccessMode()) { case ENABLED -> theirProfileKey == null ? null : UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey); 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 27bda583..2f2ba3db 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 @@ -417,7 +417,9 @@ public class ManagerImpl implements Manager { @Override public void startChangeNumber( - String newNumber, boolean voiceVerification, String captcha + String newNumber, + boolean voiceVerification, + String captcha ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException { if (!account.isPrimaryDevice()) { throw new NotPrimaryDeviceException(); @@ -427,7 +429,9 @@ public class ManagerImpl implements Manager { @Override public void finishChangeNumber( - String newNumber, String verificationCode, String pin + String newNumber, + String verificationCode, + String pin ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException { if (!account.isPrimaryDevice()) { throw new NotPrimaryDeviceException(); @@ -447,7 +451,8 @@ public class ManagerImpl implements Manager { @Override public void submitRateLimitRecaptchaChallenge( - String challenge, String captcha + String challenge, + String captcha ) throws IOException, CaptchaRejectedException { captcha = captcha == null ? null : captcha.replace("signalcaptcha://", ""); @@ -527,7 +532,8 @@ public class ManagerImpl implements Manager { @Override public SendGroupMessageResults quitGroup( - GroupId groupId, Set groupAdmins + GroupId groupId, + Set groupAdmins ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException { final var newAdmins = context.getRecipientHelper().resolveRecipients(groupAdmins); return context.getGroupHelper().quitGroup(groupId, newAdmins); @@ -545,7 +551,9 @@ public class ManagerImpl implements Manager { @Override public Pair createGroup( - String name, Set members, String avatarFile + String name, + Set members, + String avatarFile ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException { return context.getGroupHelper() .createGroup(name, @@ -555,7 +563,8 @@ public class ManagerImpl implements Manager { @Override public SendGroupMessageResults updateGroup( - final GroupId groupId, final UpdateGroup updateGroup + final GroupId groupId, + final UpdateGroup updateGroup ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException { return context.getGroupHelper() .updateGroup(groupId, @@ -596,7 +605,9 @@ public class ManagerImpl implements Manager { } private SendMessageResults sendMessage( - SignalServiceDataMessage.Builder messageBuilder, Set recipients, boolean notifySelf + SignalServiceDataMessage.Builder messageBuilder, + Set recipients, + boolean notifySelf ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty()); } @@ -644,7 +655,8 @@ public class ManagerImpl implements Manager { } private SendMessageResults sendTypingMessage( - SignalServiceTypingMessage.Action action, Set recipients + SignalServiceTypingMessage.Action action, + Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { var results = new HashMap>(); final var timestamp = System.currentTimeMillis(); @@ -671,15 +683,14 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendTypingMessage( - TypingAction action, Set recipients + TypingAction action, + Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { return sendTypingMessage(action.toSignalService(), recipients); } @Override - public SendMessageResults sendReadReceipt( - RecipientIdentifier.Single sender, List messageIds - ) { + public SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List messageIds) { final var timestamp = System.currentTimeMillis(); var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ, messageIds, @@ -689,9 +700,7 @@ public class ManagerImpl implements Manager { } @Override - public SendMessageResults sendViewedReceipt( - RecipientIdentifier.Single sender, List messageIds - ) { + public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List messageIds) { final var timestamp = System.currentTimeMillis(); var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED, messageIds, @@ -724,7 +733,9 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendMessage( - Message message, Set recipients, boolean notifySelf + Message message, + Set recipients, + boolean notifySelf ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException { final var selfProfile = context.getProfileHelper().getSelfProfile(); if (selfProfile == null || selfProfile.getDisplayName().isEmpty()) { @@ -738,7 +749,9 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendEditMessage( - Message message, Set recipients, long editTargetTimestamp + Message message, + Set recipients, + long editTargetTimestamp ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException { final var messageBuilder = SignalServiceDataMessage.newBuilder(); applyMessage(messageBuilder, message); @@ -746,7 +759,8 @@ public class ManagerImpl implements Manager { } private void applyMessage( - final SignalServiceDataMessage.Builder messageBuilder, final Message message + final SignalServiceDataMessage.Builder messageBuilder, + final Message message ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException { final var additionalAttachments = new ArrayList(); if (message.messageText().length() > ServiceConfig.MAX_MESSAGE_BODY_SIZE) { @@ -863,7 +877,8 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendRemoteDeleteMessage( - long targetSentTimestamp, Set recipients + long targetSentTimestamp, + Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp); final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete); @@ -915,7 +930,9 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendPaymentNotificationMessage( - byte[] receipt, String note, RecipientIdentifier.Single recipient + byte[] receipt, + String note, + RecipientIdentifier.Single recipient ) throws IOException { final var paymentNotification = new SignalServiceDataMessage.PaymentNotification(receipt, note); final var payment = new SignalServiceDataMessage.Payment(paymentNotification, null); @@ -958,7 +975,8 @@ public class ManagerImpl implements Manager { @Override public SendMessageResults sendMessageRequestResponse( - final MessageRequestResponse.Type type, final Set recipients + final MessageRequestResponse.Type type, + final Set recipients ) { var results = new HashMap>(); for (final var recipient : recipients) { @@ -1021,7 +1039,9 @@ public class ManagerImpl implements Manager { @Override public void setContactName( - RecipientIdentifier.Single recipient, String givenName, final String familyName + RecipientIdentifier.Single recipient, + String givenName, + final String familyName ) throws NotPrimaryDeviceException, UnregisteredRecipientException { if (!account.isPrimaryDevice()) { throw new NotPrimaryDeviceException(); @@ -1033,7 +1053,8 @@ public class ManagerImpl implements Manager { @Override public void setContactsBlocked( - Collection recipients, boolean blocked + Collection recipients, + boolean blocked ) throws IOException, UnregisteredRecipientException { if (recipients.isEmpty()) { return; @@ -1067,7 +1088,8 @@ public class ManagerImpl implements Manager { @Override public void setGroupsBlocked( - final Collection groupIds, final boolean blocked + final Collection groupIds, + final boolean blocked ) throws GroupNotFoundException, IOException { if (groupIds.isEmpty()) { return; @@ -1093,7 +1115,8 @@ public class ManagerImpl implements Manager { @Override public void setExpirationTimer( - RecipientIdentifier.Single recipient, int messageExpirationTimer + RecipientIdentifier.Single recipient, + int messageExpirationTimer ) throws IOException, UnregisteredRecipientException { var recipientId = context.getRecipientHelper().resolveRecipient(recipient); context.getContactHelper().setExpirationTimer(recipientId, messageExpirationTimer); @@ -1255,7 +1278,9 @@ public class ManagerImpl implements Manager { @Override public void receiveMessages( - Optional timeout, Optional maxMessages, ReceiveMessageHandler handler + Optional timeout, + Optional maxMessages, + ReceiveMessageHandler handler ) throws IOException, AlreadyReceivingException { receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler); } @@ -1275,7 +1300,10 @@ public class ManagerImpl implements Manager { } private void receiveMessages( - Duration timeout, boolean returnOnTimeout, Integer maxMessages, ReceiveMessageHandler handler + Duration timeout, + boolean returnOnTimeout, + Integer maxMessages, + ReceiveMessageHandler handler ) throws IOException, AlreadyReceivingException { synchronized (messageHandlers) { if (isReceiving()) { @@ -1431,7 +1459,8 @@ public class ManagerImpl implements Manager { @Override public boolean trustIdentityVerified( - RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode + RecipientIdentifier.Single recipient, + IdentityVerificationCode verificationCode ) throws UnregisteredRecipientException { return switch (verificationCode) { case IdentityVerificationCode.Fingerprint fingerprint -> trustIdentity(recipient, @@ -1450,7 +1479,8 @@ public class ManagerImpl implements Manager { } private boolean trustIdentity( - RecipientIdentifier.Single recipient, Function trustMethod + RecipientIdentifier.Single recipient, + Function trustMethod ) throws UnregisteredRecipientException { final var recipientId = context.getRecipientHelper().resolveRecipient(recipient); final var updated = trustMethod.apply(recipientId); 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 543d9a99..5faf1371 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 @@ -105,7 +105,9 @@ public class RegistrationManagerImpl implements RegistrationManager { @Override public void register( - boolean voiceVerification, String captcha, final boolean forceRegister + boolean voiceVerification, + String captcha, + final boolean forceRegister ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException { if (account.isRegistered() && account.getServiceEnvironment() != null @@ -145,7 +147,8 @@ public class RegistrationManagerImpl implements RegistrationManager { @Override public void verifyAccount( - String verificationCode, String pin + String verificationCode, + String pin ) throws IOException, PinLockedException, IncorrectPinException { if (account.isRegistered()) { throw new IOException("Account is already registered"); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java index 63ba5a37..9e1c6303 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java @@ -611,7 +611,8 @@ public class AccountDatabase extends Database { } private static void createUuidMappingTable( - final Connection connection, final Statement statement + final Connection connection, + final Statement statement ) throws SQLException { statement.executeUpdate(""" CREATE TABLE tmp_mapping_table ( diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java index 5e734174..d25f1a72 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java @@ -22,7 +22,8 @@ public class AttachmentStore { } public void storeAttachmentPreview( - final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer + final SignalServiceAttachmentPointer pointer, + final AttachmentStorer storer ) throws IOException { storeAttachment(getAttachmentPreviewFile(pointer.getRemoteId(), pointer.getFileName(), @@ -30,7 +31,8 @@ public class AttachmentStore { } public void storeAttachment( - final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer + final SignalServiceAttachmentPointer pointer, + final AttachmentStorer storer ) throws IOException { storeAttachment(getAttachmentFile(pointer), storer); } @@ -54,22 +56,24 @@ public class AttachmentStore { } private File getAttachmentPreviewFile( - SignalServiceAttachmentRemoteId attachmentId, Optional filename, Optional contentType + SignalServiceAttachmentRemoteId attachmentId, + Optional filename, + Optional contentType ) { final var extension = getAttachmentExtension(filename, contentType); return new File(attachmentsPath, attachmentId.toString() + extension + ".preview"); } private File getAttachmentFile( - SignalServiceAttachmentRemoteId attachmentId, Optional filename, Optional contentType + SignalServiceAttachmentRemoteId attachmentId, + Optional filename, + Optional contentType ) { final var extension = getAttachmentExtension(filename, contentType); return new File(attachmentsPath, attachmentId.toString() + extension); } - private static String getAttachmentExtension( - final Optional filename, final Optional contentType - ) { + private static String getAttachmentExtension(final Optional filename, final Optional contentType) { return filename.filter(f -> f.contains(".")) .map(f -> f.substring(f.lastIndexOf(".") + 1)) .or(() -> contentType.flatMap(MimeUtils::guessExtensionFromMimeType)) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java index 71704698..2fb09a4f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java @@ -24,7 +24,8 @@ public abstract class Database implements AutoCloseable { } public static T initDatabase( - File databaseFile, Function newDatabase + File databaseFile, + Function newDatabase ) throws SQLException { HikariDataSource dataSource = null; 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 87cf3aa3..5c8a5530 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 @@ -189,7 +189,10 @@ public class SignalAccount implements Closeable { } public static SignalAccount load( - File dataPath, String accountPath, boolean waitForLock, final Settings settings + File dataPath, + String accountPath, + boolean waitForLock, + final Settings settings ) throws IOException { logger.trace("Opening account file"); final var fileName = getFileName(dataPath, accountPath); @@ -316,7 +319,9 @@ public class SignalAccount implements Closeable { } public void finishLinking( - final int deviceId, final PreKeyCollection aciPreKeys, final PreKeyCollection pniPreKeys + final int deviceId, + final PreKeyCollection aciPreKeys, + final PreKeyCollection pniPreKeys ) { this.registered = true; this.deviceId = deviceId; @@ -375,7 +380,9 @@ public class SignalAccount implements Closeable { } private void mergeRecipients( - final Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId + final Connection connection, + RecipientId recipientId, + RecipientId toBeMergedRecipientId ) throws SQLException { getMessageCache().mergeRecipients(recipientId, toBeMergedRecipientId); getGroupStore().mergeRecipients(connection, recipientId, toBeMergedRecipientId); @@ -438,9 +445,7 @@ public class SignalAccount implements Closeable { return f.exists() && !f.isDirectory() && f.length() > 0L; } - private void load( - File dataPath, String accountPath, final Settings settings - ) throws IOException { + private void load(File dataPath, String accountPath, final Settings settings) throws IOException { logger.trace("Loading account file {}", accountPath); this.dataPath = dataPath; this.accountPath = accountPath; @@ -786,7 +791,8 @@ public class SignalAccount implements Closeable { } private void loadLegacyStores( - final JsonNode rootNode, final LegacyJsonSignalProtocolStore legacySignalProtocolStore + final JsonNode rootNode, + final LegacyJsonSignalProtocolStore legacySignalProtocolStore ) { var legacyRecipientStoreNode = rootNode.get("recipientStore"); if (legacyRecipientStoreNode != null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java index 75389751..5ea5eff0 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java @@ -41,9 +41,7 @@ public class UnknownStorageIdStore { } } - public List getUnknownStorageIds( - Connection connection, Collection types - ) throws SQLException { + public List getUnknownStorageIds(Connection connection, Collection types) throws SQLException { final var typesCommaSeparated = types.stream().map(String::valueOf).collect(Collectors.joining(",")); final var sql = ( """ diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java index fa2e8916..e4858f21 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java @@ -72,7 +72,8 @@ public class Utils { } public static T executeQuerySingleRow( - PreparedStatement statement, ResultSetMapper mapper + PreparedStatement statement, + ResultSetMapper mapper ) throws SQLException { final var resultSet = statement.executeQuery(); if (!resultSet.next()) { @@ -82,7 +83,8 @@ public class Utils { } public static Optional executeQueryForOptional( - PreparedStatement statement, ResultSetMapper mapper + PreparedStatement statement, + ResultSetMapper mapper ) throws SQLException { final var resultSet = statement.executeQuery(); if (!resultSet.next()) { @@ -92,7 +94,8 @@ public class Utils { } public static Stream executeQueryForStream( - PreparedStatement statement, ResultSetMapper mapper + PreparedStatement statement, + ResultSetMapper mapper ) throws SQLException { final var resultSet = statement.executeQuery(); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java index 02379941..a0fa3012 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java @@ -41,7 +41,9 @@ public class AccountsStore { private final AccountLoader accountLoader; public AccountsStore( - final File dataPath, final ServiceEnvironment serviceEnvironment, final AccountLoader accountLoader + final File dataPath, + final ServiceEnvironment serviceEnvironment, + final AccountLoader accountLoader ) throws IOException { this.dataPath = dataPath; this.serviceEnvironment = getServiceEnvironmentString(serviceEnvironment); @@ -202,7 +204,9 @@ public class AccountsStore { } private AccountsStorage upgradeAccountsFile( - final FileChannel fileChannel, final AccountsStorage storage, final int accountsVersion + final FileChannel fileChannel, + final AccountsStorage storage, + final int accountsVersion ) { try { List newAccounts = storage.accounts(); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java index 558d4f86..ef4a4545 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java @@ -59,7 +59,8 @@ public class ConfigurationStore { } public void setUnidentifiedDeliveryIndicators( - final Connection connection, final boolean value + final Connection connection, + final boolean value ) throws SQLException { if (keyValueStore.storeEntry(connection, unidentifiedDeliveryIndicators, value)) { recipientStore.rotateSelfStorageId(connection); @@ -125,7 +126,8 @@ public class ConfigurationStore { } public void setPhoneNumberSharingMode( - final Connection connection, final PhoneNumberSharingMode value + final Connection connection, + final PhoneNumberSharingMode value ) throws SQLException { if (keyValueStore.storeEntry(connection, phoneNumberSharingMode, value)) { recipientStore.rotateSelfStorageId(connection); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java index 89306ecd..f15b94a8 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java @@ -31,7 +31,9 @@ public final class GroupInfoV2 extends GroupInfo { private final RecipientResolver recipientResolver; public GroupInfoV2( - final GroupIdV2 groupId, final GroupMasterKey masterKey, final RecipientResolver recipientResolver + final GroupIdV2 groupId, + final GroupMasterKey masterKey, + final RecipientResolver recipientResolver ) { this.groupId = groupId; this.masterKey = masterKey; 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 c4c075bf..26c4c08d 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 @@ -121,7 +121,10 @@ public class GroupStore { } public void storeStorageRecord( - final Connection connection, final GroupId groupId, final StorageId storageId, final byte[] storageRecord + final Connection connection, + final GroupId groupId, + final StorageId storageId, + final byte[] storageRecord ) throws SQLException { final var groupTable = groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2; final var deleteSql = ( @@ -250,7 +253,8 @@ public class GroupStore { } public GroupInfoV2 getGroupOrPartialMigrate( - Connection connection, final GroupMasterKey groupMasterKey + Connection connection, + final GroupMasterKey groupMasterKey ) throws SQLException { final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey); final var groupId = GroupUtils.getGroupIdV2(groupSecretParams); @@ -258,9 +262,7 @@ public class GroupStore { return getGroupOrPartialMigrate(connection, groupMasterKey, groupId); } - public GroupInfoV2 getGroupOrPartialMigrate( - final GroupMasterKey groupMasterKey, final GroupIdV2 groupId - ) { + public GroupInfoV2 getGroupOrPartialMigrate(final GroupMasterKey groupMasterKey, final GroupIdV2 groupId) { try (final var connection = database.getConnection()) { return getGroupOrPartialMigrate(connection, groupMasterKey, groupId); } catch (SQLException e) { @@ -269,7 +271,9 @@ public class GroupStore { } private GroupInfoV2 getGroupOrPartialMigrate( - Connection connection, final GroupMasterKey groupMasterKey, final GroupIdV2 groupId + Connection connection, + final GroupMasterKey groupMasterKey, + final GroupIdV2 groupId ) throws SQLException { switch (getGroup(connection, (GroupId) groupId)) { case GroupInfoV1 groupInfoV1 -> { @@ -325,7 +329,9 @@ public class GroupStore { } public void mergeRecipients( - final Connection connection, final RecipientId recipientId, final RecipientId toBeMergedRecipientId + final Connection connection, + final RecipientId recipientId, + final RecipientId toBeMergedRecipientId ) throws SQLException { final var sql = ( """ @@ -360,7 +366,9 @@ public class GroupStore { } public void updateStorageIds( - Connection connection, Map storageIdV1Map, Map storageIdV2Map + Connection connection, + Map storageIdV1Map, + Map storageIdV2Map ) throws SQLException { final var sql = ( """ @@ -385,9 +393,7 @@ public class GroupStore { } } - public void updateStorageId( - Connection connection, GroupId groupId, StorageId storageId - ) throws SQLException { + public void updateStorageId(Connection connection, GroupId groupId, StorageId storageId) throws SQLException { final var sqlV1 = ( """ UPDATE %s @@ -460,7 +466,9 @@ public class GroupStore { } private void insertOrReplaceGroup( - final Connection connection, Long internalId, final GroupInfo group + final Connection connection, + Long internalId, + final GroupInfo group ) throws SQLException { if (group instanceof GroupInfoV1 groupV1) { if (internalId != null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java index 1d8c8799..383912dd 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java @@ -151,7 +151,8 @@ public class LegacyGroupStore { @Override public List deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { var addresses = new ArrayList(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); @@ -184,7 +185,8 @@ public class LegacyGroupStore { @Override public List deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { var groups = new ArrayList<>(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java index d00d455c..0b9b8c17 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java @@ -11,9 +11,7 @@ public class IdentityInfo { private final TrustLevel trustLevel; private final long addedTimestamp; - IdentityInfo( - final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp - ) { + IdentityInfo(final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp) { this.address = address; this.identityKey = identityKey; this.trustLevel = trustLevel; diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java index a4b355ea..5e32ba12 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java @@ -49,7 +49,9 @@ public class IdentityKeyStore { } public IdentityKeyStore( - final Database database, final TrustNewIdentity trustNewIdentity, RecipientStore recipientStore + final Database database, + final TrustNewIdentity trustNewIdentity, + RecipientStore recipientStore ) { this.database = database; this.trustNewIdentity = trustNewIdentity; @@ -65,7 +67,9 @@ public class IdentityKeyStore { } public boolean saveIdentity( - final Connection connection, final ServiceId serviceId, final IdentityKey identityKey + final Connection connection, + final ServiceId serviceId, + final IdentityKey identityKey ) throws SQLException { return saveIdentity(connection, serviceId.toString(), identityKey); } @@ -82,7 +86,9 @@ public class IdentityKeyStore { } private boolean saveIdentity( - final Connection connection, final String address, final IdentityKey identityKey + final Connection connection, + final String address, + final IdentityKey identityKey ) throws SQLException { final var identityInfo = loadIdentity(connection, address); if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) { @@ -230,9 +236,7 @@ public class IdentityKeyStore { logger.debug("Complete identities migration took {}ms", (System.nanoTime() - start) / 1000000); } - private IdentityInfo loadIdentity( - final Connection connection, final String address - ) throws SQLException { + private IdentityInfo loadIdentity(final Connection connection, final String address) throws SQLException { final var sql = ( """ SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java index a7f6a4aa..fc6e93e1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java @@ -41,7 +41,9 @@ public class LegacyIdentityKeyStore { static final Pattern identityFileNamePattern = Pattern.compile("(\\d+)"); private static List getIdentities( - final File identitiesPath, final RecipientResolver resolver, final RecipientAddressResolver addressResolver + final File identitiesPath, + final RecipientResolver resolver, + final RecipientAddressResolver addressResolver ) { final var files = identitiesPath.listFiles(); if (files == null) { @@ -66,7 +68,9 @@ public class LegacyIdentityKeyStore { } private static IdentityInfo loadIdentityLocked( - final RecipientId recipientId, RecipientAddressResolver addressResolver, final File identitiesPath + final RecipientId recipientId, + RecipientAddressResolver addressResolver, + final File identitiesPath ) { final var file = getIdentityFile(recipientId, identitiesPath); if (!file.exists()) { diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java index c51f32f1..e5bbc188 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java @@ -74,7 +74,9 @@ public class KeyValueStore { } public boolean storeEntry( - final Connection connection, final KeyValueEntry key, final T value + final Connection connection, + final KeyValueEntry key, + final T value ) throws SQLException { final var entry = getEntry(key); if (Objects.equals(entry, value)) { @@ -98,7 +100,8 @@ public class KeyValueStore { @SuppressWarnings("unchecked") private static T readValueFromResultSet( - final KeyValueEntry key, final ResultSet resultSet + final KeyValueEntry key, + final ResultSet resultSet ) throws SQLException { Object value; final var clazz = key.clazz(); @@ -134,7 +137,10 @@ public class KeyValueStore { } private static void setParameterValue( - final PreparedStatement statement, final int parameterIndex, final Class clazz, final T value + final PreparedStatement statement, + final int parameterIndex, + final Class clazz, + final T value ) throws SQLException { if (clazz == int.class || clazz == Integer.class) { if (value == null) { diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java index abb66470..39d6b7fb 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java @@ -34,7 +34,8 @@ public class LegacyProfileStore { @Override public List deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java index 5d3a95a8..ec91a628 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java @@ -18,6 +18,7 @@ public interface ProfileStore { void storeProfileKey(RecipientId recipientId, ProfileKey profileKey); void storeExpiringProfileKeyCredential( - RecipientId recipientId, ExpiringProfileKeyCredential expiringProfileKeyCredential + RecipientId recipientId, + ExpiringProfileKeyCredential expiringProfileKeyCredential ); } 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 0d12a303..632efc7e 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 @@ -32,7 +32,9 @@ public class LegacyJsonIdentityKeyStore { private final int localRegistrationId; private LegacyJsonIdentityKeyStore( - final List identities, IdentityKeyPair identityKeyPair, int localRegistrationId + final List identities, + IdentityKeyPair identityKeyPair, + int localRegistrationId ) { this.identities = identities; this.identityKeyPair = identityKeyPair; @@ -77,7 +79,8 @@ public class LegacyJsonIdentityKeyStore { @Override public LegacyJsonIdentityKeyStore deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java index 7412f95a..feb27e97 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java @@ -26,7 +26,8 @@ public class LegacyJsonPreKeyStore { @Override public LegacyJsonPreKeyStore deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java index ee675d78..b971078c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java @@ -31,7 +31,8 @@ public class LegacyJsonSessionStore { @Override public LegacyJsonSessionStore deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java index cdcba916..ed1b5d95 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java @@ -26,7 +26,8 @@ public class LegacyJsonSignedPreKeyStore { @Override public LegacyJsonSignedPreKeyStore deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java index f334a2be..b631f632 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java @@ -172,7 +172,9 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore { @Override public void storeSenderKey( - final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record + final SignalProtocolAddress sender, + final UUID distributionId, + final SenderKeyRecord record ) { senderKeyStore.storeSenderKey(sender, distributionId, record); } @@ -189,7 +191,8 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore { @Override public void markSenderKeySharedWith( - final DistributionId distributionId, final Collection addresses + final DistributionId distributionId, + final Collection addresses ) { senderKeyStore.markSenderKeySharedWith(distributionId, addresses); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java index 1170e651..4b68adbe 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java @@ -98,9 +98,7 @@ public class CdsiStore { } } - private static void removeNumbers( - final Connection connection, final Set numbers - ) throws SQLException { + private static void removeNumbers(final Connection connection, final Set numbers) throws SQLException { final var sql = ( """ DELETE FROM %s @@ -116,7 +114,9 @@ public class CdsiStore { } private static void addNumbers( - final Connection connection, final Set numbers, final long lastSeen + final Connection connection, + final Set numbers, + final long lastSeen ) throws SQLException { final var sql = ( """ @@ -135,7 +135,9 @@ public class CdsiStore { } private static void updateLastSeen( - final Connection connection, final Set numbers, final long lastSeen + final Connection connection, + final Set numbers, + final long lastSeen ) throws SQLException { final var sql = ( """ diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java index fb1e188b..907aafe4 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java @@ -27,7 +27,8 @@ public class LegacyRecipientStore { @Override public List deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java index edc1121e..95c17102 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java @@ -15,7 +15,8 @@ public class MergeRecipientHelper { private static final Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class); static Pair> resolveRecipientTrustedLocked( - Store store, RecipientAddress address + Store store, + RecipientAddress address ) throws SQLException { // address has at least one of serviceId/pni and optionally number/username 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 2aad97d6..00048560 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 @@ -208,7 +208,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public RecipientId resolveRecipientByNumber( - final String number, Supplier serviceIdSupplier + final String number, + Supplier serviceIdSupplier ) throws UnregisteredRecipientException { final Optional byNumber; try (final var connection = database.getConnection()) { @@ -238,7 +239,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public RecipientId resolveRecipientByUsername( - final String username, Supplier aciSupplier + final String username, + Supplier aciSupplier ) throws UnregisteredRecipientException { final Optional byUsername; try (final var connection = database.getConnection()) { @@ -301,7 +303,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re @Override public RecipientId resolveRecipientTrusted( - final Optional aci, final Optional pni, final Optional number + final Optional aci, + final Optional pni, + final Optional number ) { return resolveRecipientTrusted(new RecipientAddress(aci, pni, number, Optional.empty())); } @@ -392,7 +396,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public List getRecipients( - boolean onlyContacts, Optional blocked, Set recipientIds, Optional name + boolean onlyContacts, + Optional blocked, + Set recipientIds, + Optional name ) { final var sqlWhere = new ArrayList(); if (onlyContacts) { @@ -614,14 +621,17 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public void storeProfileKey( - Connection connection, RecipientId recipientId, final ProfileKey profileKey + Connection connection, + RecipientId recipientId, + final ProfileKey profileKey ) throws SQLException { storeProfileKey(connection, recipientId, profileKey, true); } @Override public void storeExpiringProfileKeyCredential( - RecipientId recipientId, final ExpiringProfileKeyCredential profileKeyCredential + RecipientId recipientId, + final ExpiringProfileKeyCredential profileKeyCredential ) { try (final var connection = database.getConnection()) { storeExpiringProfileKeyCredential(connection, recipientId, profileKeyCredential); @@ -661,7 +671,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public void updateStorageId( - Connection connection, RecipientId recipientId, StorageId storageId + Connection connection, + RecipientId recipientId, + StorageId storageId ) throws SQLException { final var sql = ( """ @@ -813,7 +825,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public void storeContact( - final Connection connection, final RecipientId recipientId, final Contact contact + final Connection connection, + final RecipientId recipientId, + final Contact contact ) throws SQLException { final var sql = ( """ @@ -852,7 +866,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public int removeStorageIdsFromLocalOnlyUnregisteredRecipients( - final Connection connection, final List storageIds + final Connection connection, + final List storageIds ) throws SQLException { final var sql = ( """ @@ -965,7 +980,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void markUnregisteredAndSplitIfNecessary( - final Connection connection, final RecipientId recipientId + final Connection connection, + final RecipientId recipientId ) throws SQLException { markUnregistered(connection, recipientId); final var address = resolveRecipientAddress(connection, recipientId); @@ -977,7 +993,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void markDiscoverable( - final Connection connection, final RecipientId recipientId, final boolean discoverable + final Connection connection, + final RecipientId recipientId, + final boolean discoverable ) throws SQLException { final var sql = ( """ @@ -993,9 +1011,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } } - private void markRegistered( - final Connection connection, final RecipientId recipientId - ) throws SQLException { + private void markRegistered(final Connection connection, final RecipientId recipientId) throws SQLException { final var sql = ( """ UPDATE %s @@ -1009,9 +1025,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } } - private void markUnregistered( - final Connection connection, final RecipientId recipientId - ) throws SQLException { + private void markUnregistered(final Connection connection, final RecipientId recipientId) throws SQLException { final var sql = ( """ UPDATE %s @@ -1046,7 +1060,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } public void storeProfile( - final Connection connection, final RecipientId recipientId, final Profile profile + final Connection connection, + final RecipientId recipientId, + final Profile profile ) throws SQLException { final var sql = ( """ @@ -1079,7 +1095,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void storeProfileKey( - Connection connection, RecipientId recipientId, final ProfileKey profileKey, boolean resetProfile + Connection connection, + RecipientId recipientId, + final ProfileKey profileKey, + boolean resetProfile ) throws SQLException { if (profileKey != null) { final var recipientProfileKey = getProfileKey(connection, recipientId); @@ -1111,7 +1130,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private RecipientAddress resolveRecipientAddress( - final Connection connection, final RecipientId recipientId + final Connection connection, + final RecipientId recipientId ) throws SQLException { final var sql = ( """ @@ -1150,7 +1170,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private Pair> resolveRecipientTrustedLocked( - final Connection connection, final RecipientAddress address, final boolean isSelf + final Connection connection, + final RecipientAddress address, + final boolean isSelf ) throws SQLException { if (address.hasSingleIdentifier() || ( !isSelf && selfAddressProvider.getSelfAddress().matches(address) @@ -1168,7 +1190,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void mergeRecipients( - final Connection connection, final RecipientId recipientId, final List toBeMergedRecipientIds + final Connection connection, + final RecipientId recipientId, + final List toBeMergedRecipientIds ) throws SQLException { for (final var toBeMergedRecipientId : toBeMergedRecipientIds) { recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId); @@ -1177,9 +1201,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } } - private RecipientId resolveRecipientLocked( - Connection connection, RecipientAddress address - ) throws SQLException { + private RecipientId resolveRecipientLocked(Connection connection, RecipientAddress address) throws SQLException { final var byAci = address.aci().isEmpty() ? Optional.empty() : findByServiceId(connection, address.aci().get()); @@ -1236,7 +1258,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private RecipientId addNewRecipient( - final Connection connection, final RecipientAddress address + final Connection connection, + final RecipientAddress address ) throws SQLException { final var sql = ( """ @@ -1277,7 +1300,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void updateRecipientAddress( - Connection connection, RecipientId recipientId, final RecipientAddress address + Connection connection, + RecipientId recipientId, + final RecipientAddress address ) throws SQLException { recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId)); final var sql = ( @@ -1312,7 +1337,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private void mergeRecipientsLocked( - Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId + Connection connection, + RecipientId recipientId, + RecipientId toBeMergedRecipientId ) throws SQLException { final var contact = getContact(connection, recipientId); if (contact == null) { @@ -1343,7 +1370,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private Optional findByNumber( - final Connection connection, final String number + final Connection connection, + final String number ) throws SQLException { final var sql = """ SELECT r._id, r.number, r.aci, r.pni, r.username @@ -1358,7 +1386,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private Optional findByUsername( - final Connection connection, final String username + final Connection connection, + final String username ) throws SQLException { final var sql = """ SELECT r._id, r.number, r.aci, r.pni, r.username @@ -1373,7 +1402,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private Optional findByServiceId( - final Connection connection, final ServiceId serviceId + final Connection connection, + final ServiceId serviceId ) throws SQLException { var recipientWithAddress = Optional.ofNullable(recipientAddressCache.get(serviceId)); if (recipientWithAddress.isPresent()) { @@ -1394,7 +1424,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private Set findAllByAddress( - final Connection connection, final RecipientAddress address + final Connection connection, + final RecipientAddress address ) throws SQLException { final var sql = """ SELECT r._id, r.number, r.aci, r.pni, r.username @@ -1447,7 +1478,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re } private ExpiringProfileKeyCredential getExpiringProfileKeyCredential( - final Connection connection, final RecipientId recipientId + final Connection connection, + final RecipientId recipientId ) throws SQLException { final var sql = ( """ @@ -1593,7 +1625,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re public interface RecipientMergeHandler { void mergeRecipients( - final Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId + final Connection connection, + RecipientId recipientId, + RecipientId toBeMergedRecipientId ) throws SQLException; } @@ -1617,7 +1651,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re @Override public void updateRecipientAddress( - final RecipientId recipientId, final RecipientAddress address + final RecipientId recipientId, + final RecipientAddress address ) throws SQLException { RecipientStore.this.updateRecipientAddress(connection, recipientId, address); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java index 598ef791..06d29060 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java @@ -44,7 +44,9 @@ public interface RecipientTrustedResolver { @Override public RecipientId resolveRecipientTrusted( - final Optional aci, final Optional pni, final Optional number + final Optional aci, + final Optional pni, + final Optional number ) { return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, pni, number); } 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 910da3cf..20bfdb6a 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 @@ -83,7 +83,10 @@ public class MessageSendLogStore implements AutoCloseable { } public List findMessages( - final ServiceId serviceId, final int deviceId, final long timestamp, final boolean isSenderKey + final ServiceId serviceId, + final int deviceId, + final long timestamp, + final boolean isSenderKey ) { final var sql = """ SELECT group_id, content, content_hint, urgent @@ -111,7 +114,10 @@ public class MessageSendLogStore implements AutoCloseable { } public long insertIfPossible( - long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint, boolean urgent + long sentTimestamp, + SendMessageResult sendMessageResult, + ContentHint contentHint, + boolean urgent ) { if (sendLogDisabled) { return -1; @@ -129,7 +135,10 @@ public class MessageSendLogStore implements AutoCloseable { } public long insertIfPossible( - long sentTimestamp, List sendMessageResults, ContentHint contentHint, boolean urgent + long sentTimestamp, + List sendMessageResults, + ContentHint contentHint, + boolean urgent ) { if (sendLogDisabled) { return -1; @@ -164,7 +173,8 @@ public class MessageSendLogStore implements AutoCloseable { } public void addRecipientToExistingEntryIfPossible( - final long contentId, final List sendMessageResults + final long contentId, + final List sendMessageResults ) { if (sendLogDisabled) { return; @@ -322,7 +332,8 @@ public class MessageSendLogStore implements AutoCloseable { } private void insertRecipientsForExistingContent( - final long contentId, final List recipientDevices + final long contentId, + final List recipientDevices ) { try (final var connection = database.getConnection()) { connection.setAutoCommit(false); @@ -334,7 +345,9 @@ public class MessageSendLogStore implements AutoCloseable { } private void insertRecipientsForExistingContent( - final long contentId, final List recipientDevices, final Connection connection + final long contentId, + final List recipientDevices, + final Connection connection ) throws SQLException { final var sql = """ INSERT INTO %s (address, device_id, content_id) diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java index 39e1df97..dd48fcdc 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java @@ -59,7 +59,9 @@ public class SenderKeyRecordStore implements SenderKeyStore { @Override public void storeSenderKey( - final SignalProtocolAddress address, final UUID distributionId, final SenderKeyRecord record + final SignalProtocolAddress address, + final UUID distributionId, + final SenderKeyRecord record ) { final var key = getKey(address, distributionId); @@ -165,7 +167,9 @@ public class SenderKeyRecordStore implements SenderKeyStore { } private void storeSenderKey( - final Connection connection, final Key key, final SenderKeyRecord senderKeyRecord + final Connection connection, + final Key key, + final SenderKeyRecord senderKeyRecord ) throws SQLException { final var sqlUpdate = """ UPDATE %s diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java index 284ba08f..175524f5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java @@ -65,7 +65,8 @@ public class SenderKeySharedStore { } public void markSenderKeySharedWith( - final DistributionId distributionId, final Collection addresses + final DistributionId distributionId, + final Collection addresses ) { final var newEntries = addresses.stream() .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId())) @@ -138,9 +139,7 @@ public class SenderKeySharedStore { } } - public void deleteSharedWith( - final ServiceId serviceId, final int deviceId, final DistributionId distributionId - ) { + public void deleteSharedWith(final ServiceId serviceId, final int deviceId, final DistributionId distributionId) { try (final var connection = database.getConnection()) { final var sql = ( """ @@ -192,7 +191,9 @@ public class SenderKeySharedStore { } private void markSenderKeysSharedWith( - final Connection connection, final DistributionId distributionId, final Set newEntries + final Connection connection, + final DistributionId distributionId, + final Set newEntries ) throws SQLException { final var sql = ( """ diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java index d60249b6..5ae2790e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java @@ -25,7 +25,9 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore { @Override public void storeSenderKey( - final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record + final SignalProtocolAddress sender, + final UUID distributionId, + final SenderKeyRecord record ) { senderKeyRecordStore.storeSenderKey(sender, distributionId, record); } @@ -42,7 +44,8 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore { @Override public void markSenderKeySharedWith( - final DistributionId distributionId, final Collection addresses + final DistributionId distributionId, + final Collection addresses ) { senderKeySharedStore.markSenderKeySharedWith(distributionId, addresses); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java index 067dc5d3..86fe875e 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java @@ -342,7 +342,9 @@ public class SessionStore implements SignalServiceSessionStore { } private void storeSession( - final Connection connection, final Key key, final SessionRecord session + final Connection connection, + final Key key, + final SessionRecord session ) throws SQLException { synchronized (cachedSessions) { cachedSessions.put(key, session); diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java index 428e9e95..efe65c64 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java @@ -35,7 +35,9 @@ public class LegacyJsonThreadStore { @Override public void serialize( - final Map value, final JsonGenerator jgen, final SerializerProvider provider + final Map value, + final JsonGenerator jgen, + final SerializerProvider provider ) throws IOException { jgen.writeObject(value.values()); } @@ -45,7 +47,8 @@ public class LegacyJsonThreadStore { @Override public Map deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext + JsonParser jsonParser, + DeserializationContext deserializationContext ) throws IOException { var threads = new HashMap(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java index 31e7a90b..18dd1869 100644 --- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java +++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java @@ -33,7 +33,9 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor inserts, RecipientAddress self + SignalStorageManifest manifest, + List inserts, + RecipientAddress self ) { validateManifestAndInserts(manifest, inserts, self); } private static void validateManifestAndInserts( - SignalStorageManifest manifest, List inserts, RecipientAddress self + SignalStorageManifest manifest, + List inserts, + RecipientAddress self ) { int accountCount = 0; for (StorageId id : manifest.getStorageIds()) { diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java index ac15a30a..bab4c433 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java @@ -13,7 +13,8 @@ import java.util.UUID; public class AttachmentUtils { public static SignalServiceAttachmentStream createAttachmentStream( - String attachment, ResumableUploadSpec resumableUploadSpec + String attachment, + ResumableUploadSpec resumableUploadSpec ) throws AttachmentInvalidException { try { final var streamDetails = Utils.createStreamDetails(attachment); @@ -25,7 +26,9 @@ public class AttachmentUtils { } public static SignalServiceAttachmentStream createAttachmentStream( - StreamDetails streamDetails, Optional name, ResumableUploadSpec resumableUploadSpec + StreamDetails streamDetails, + Optional name, + ResumableUploadSpec resumableUploadSpec ) throws ResumeLocationInvalidException { // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option final var uploadTimestamp = System.currentTimeMillis(); diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java index bfcb750c..c3dcf3fe 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java @@ -63,7 +63,8 @@ public class KeyUtils { } public static SignedPreKeyRecord generateSignedPreKeyRecord( - final int signedPreKeyId, final ECPrivateKey privateKey + final int signedPreKeyId, + final ECPrivateKey privateKey ) { var keyPair = Curve.generateKeyPair(); byte[] signature; @@ -75,9 +76,7 @@ public class KeyUtils { return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature); } - public static List generateKyberPreKeyRecords( - final int offset, final ECPrivateKey privateKey - ) { + public static List generateKyberPreKeyRecords(final int offset, final ECPrivateKey privateKey) { var records = new ArrayList(PREKEY_BATCH_SIZE); for (var i = 0; i < PREKEY_BATCH_SIZE; i++) { var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID; diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java index 03b1c03a..e27ba980 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java @@ -88,7 +88,9 @@ public class NumberVerificationUtils { } public static void requestVerificationCode( - RegistrationApi registrationApi, String sessionId, boolean voiceVerification + RegistrationApi registrationApi, + String sessionId, + boolean voiceVerification ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException { final var locale = Utils.getDefaultLocale(Locale.US); final var response = registrationApi.requestSmsVerificationCode(sessionId, @@ -108,7 +110,11 @@ public class NumberVerificationUtils { } public static Pair verifyNumber( - String sessionId, String verificationCode, String pin, PinHelper pinHelper, Verifier verifier + String sessionId, + String verificationCode, + String pin, + PinHelper pinHelper, + Verifier verifier ) throws IOException, PinLockedException, IncorrectPinException { verificationCode = verificationCode.replace("-", ""); try { @@ -138,7 +144,8 @@ public class NumberVerificationUtils { } private static RegistrationSessionMetadataResponse validateSession( - final RegistrationApi registrationApi, final String sessionId + final RegistrationApi registrationApi, + final String sessionId ) throws IOException { if (sessionId == null || sessionId.isEmpty()) { throw new NoSuchSessionException(); @@ -153,7 +160,8 @@ public class NumberVerificationUtils { } private static RegistrationSessionMetadataResponse getValidSession( - final RegistrationApi registrationApi, final String sessionId + final RegistrationApi registrationApi, + final String sessionId ) throws IOException { try { return validateSession(registrationApi, sessionId); @@ -164,7 +172,9 @@ public class NumberVerificationUtils { } private static RegistrationSessionMetadataResponse submitCaptcha( - RegistrationApi registrationApi, String sessionId, String captcha + RegistrationApi registrationApi, + String sessionId, + String captcha ) throws IOException, CaptchaRequiredException { captcha = captcha == null ? null : captcha.replace("signalcaptcha://", ""); try { @@ -184,7 +194,9 @@ public class NumberVerificationUtils { public interface Verifier { VerifyAccountResponse verify( - String sessionId, String verificationCode, String registrationLock + String sessionId, + String verificationCode, + String registrationLock ) throws IOException; } } diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java index fe338e73..36275d8f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java @@ -20,9 +20,7 @@ public class PaymentUtils { /** * Signs the supplied address bytes with the {@link IdentityKeyPair}'s private key and returns a proto that includes it, and it's signature. */ - public static PaymentAddress signPaymentsAddress( - byte[] publicAddressBytes, ECPrivateKey privateKey - ) { + public static PaymentAddress signPaymentsAddress(byte[] publicAddressBytes, ECPrivateKey privateKey) { byte[] signature = privateKey.calculateSignature(publicAddressBytes); return new PaymentAddress.Builder().mobileCoinAddress(new PaymentAddress.MobileCoinAddress.Builder().address( @@ -34,9 +32,7 @@ public class PaymentUtils { *

* Returns the validated bytes if so, otherwise returns null. */ - public static byte[] verifyPaymentsAddress( - PaymentAddress paymentAddress, ECPublicKey publicKey - ) { + public static byte[] verifyPaymentsAddress(PaymentAddress paymentAddress, ECPublicKey publicKey) { final var mobileCoinAddress = paymentAddress.mobileCoinAddress; if (mobileCoinAddress == null || mobileCoinAddress.address == null || mobileCoinAddress.signature == null) { logger.debug("Got payment address without mobile coin address, ignoring."); diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java index 17e26ee8..def75049 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java @@ -23,9 +23,7 @@ public class ProfileUtils { private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class); - public static Profile decryptProfile( - final ProfileKey profileKey, final SignalServiceProfile encryptedProfile - ) { + public static Profile decryptProfile(final ProfileKey profileKey, final SignalServiceProfile encryptedProfile) { var profileCipher = new ProfileCipher(profileKey); IdentityKey identityKey = null; try { @@ -64,7 +62,8 @@ public class ProfileUtils { } public static Profile.UnidentifiedAccessMode getUnidentifiedAccessMode( - final SignalServiceProfile encryptedProfile, final ProfileCipher profileCipher + final SignalServiceProfile encryptedProfile, + final ProfileCipher profileCipher ) { if (encryptedProfile.isUnrestrictedUnidentifiedAccess()) { return Profile.UnidentifiedAccessMode.UNRESTRICTED; @@ -90,7 +89,8 @@ public class ProfileUtils { } private static String decryptString( - final String encrypted, final ProfileCipher profileCipher + final String encrypted, + final ProfileCipher profileCipher ) throws InvalidCiphertextException { try { return encrypted == null ? null : profileCipher.decryptString(Base64.getDecoder().decode(encrypted)); @@ -100,7 +100,8 @@ public class ProfileUtils { } private static Optional decryptBoolean( - final String encrypted, final ProfileCipher profileCipher + final String encrypted, + final ProfileCipher profileCipher ) throws InvalidCiphertextException { try { return encrypted == null @@ -112,7 +113,9 @@ public class ProfileUtils { } private static byte[] decryptAndVerifyMobileCoinAddress( - final byte[] encryptedPaymentAddress, final ProfileCipher profileCipher, final ECPublicKey publicKey + final byte[] encryptedPaymentAddress, + final ProfileCipher profileCipher, + final ECPublicKey publicKey ) throws InvalidCiphertextException { byte[] decrypted; try { 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 302535d9..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 @@ -100,7 +100,9 @@ public class StickerUtils { } private static Pair getInputStreamAndLength( - final String rootPath, final ZipFile zip, final String subfile + final String rootPath, + final ZipFile zip, + final String subfile ) throws IOException { if (zip != null) { final var entry = zip.getEntry(subfile); @@ -112,7 +114,9 @@ public class StickerUtils { } private static String getContentType( - final String rootPath, final ZipFile zip, final String subfile + final String rootPath, + final ZipFile zip, + final String subfile ) throws IOException { if (zip != null) { final var entry = zip.getEntry(subfile); diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java index 16aa3275..ee1f608f 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java @@ -59,7 +59,10 @@ public class Utils { } public static Fingerprint computeSafetyNumberForNumber( - String ownNumber, IdentityKey ownIdentityKey, String theirNumber, IdentityKey theirIdentityKey + String ownNumber, + IdentityKey ownIdentityKey, + String theirNumber, + IdentityKey theirIdentityKey ) { // Version 1: E164 user final var version = 1; @@ -70,7 +73,10 @@ public class Utils { } public static Fingerprint computeSafetyNumberForUuid( - ServiceId ownServiceId, IdentityKey ownIdentityKey, ServiceId theirServiceId, IdentityKey theirIdentityKey + ServiceId ownServiceId, + IdentityKey ownIdentityKey, + ServiceId theirServiceId, + IdentityKey theirIdentityKey ) { // Version 2: UUID user final var version = 2; diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java index b57dc6fc..0931b008 100644 --- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java +++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java @@ -217,9 +217,7 @@ class MergeRecipientHelperTest { } @Override - public void updateRecipientAddress( - final RecipientId recipientId, final RecipientAddress address - ) { + public void updateRecipientAddress(final RecipientId recipientId, final RecipientAddress address) { recipients.removeIf(r -> r.id().equals(recipientId)); recipients.add(new RecipientWithAddress(recipientId, address)); } diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java index 1d715659..ac1f6d50 100644 --- a/src/main/java/org/asamk/Signal.java +++ b/src/main/java/org/asamk/Signal.java @@ -27,39 +27,44 @@ public interface Signal extends DBusInterface { void unsubscribeReceive(); long sendMessage( - String message, List attachments, String recipient + String message, + List attachments, + String recipient ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity; long sendMessage( - String message, List attachments, List recipients + String message, + List attachments, + List recipients ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity; - void sendTyping( - String recipient, boolean stop - ) throws Error.Failure, Error.UntrustedIdentity; + void sendTyping(String recipient, boolean stop) throws Error.Failure, Error.UntrustedIdentity; - void sendReadReceipt( - String recipient, List messageIds - ) throws Error.Failure, Error.UntrustedIdentity; + void sendReadReceipt(String recipient, List messageIds) throws Error.Failure, Error.UntrustedIdentity; - void sendViewedReceipt( - String recipient, List messageIds - ) throws Error.Failure, Error.UntrustedIdentity; + void sendViewedReceipt(String recipient, List messageIds) throws Error.Failure, Error.UntrustedIdentity; - long sendRemoteDeleteMessage( - long targetSentTimestamp, String recipient - ) throws Error.Failure, Error.InvalidNumber; + long sendRemoteDeleteMessage(long targetSentTimestamp, String recipient) throws Error.Failure, Error.InvalidNumber; long sendRemoteDeleteMessage( - long targetSentTimestamp, List recipients + long targetSentTimestamp, + List recipients ) throws Error.Failure, Error.InvalidNumber; long sendMessageReaction( - String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, String recipient + String emoji, + boolean remove, + String targetAuthor, + long targetSentTimestamp, + String recipient ) throws Error.InvalidNumber, Error.Failure; long sendMessageReaction( - String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List recipients + String emoji, + boolean remove, + String targetAuthor, + long targetSentTimestamp, + List recipients ) throws Error.InvalidNumber, Error.Failure; long sendPaymentNotification(byte[] receipt, String note, String recipient) throws Error.Failure; @@ -68,9 +73,7 @@ public interface Signal extends DBusInterface { void sendSyncRequest() throws Error.Failure; - long sendNoteToSelfMessage( - String message, List attachments - ) throws Error.AttachmentInvalid, Error.Failure; + long sendNoteToSelfMessage(String message, List attachments) throws Error.AttachmentInvalid, Error.Failure; void sendEndSessionMessage(List recipients) throws Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity; @@ -79,19 +82,27 @@ public interface Signal extends DBusInterface { void deleteContact(final String recipient) throws Error.Failure; long sendGroupMessage( - String message, List attachments, byte[] groupId + String message, + List attachments, + byte[] groupId ) throws Error.GroupNotFound, Error.Failure, Error.AttachmentInvalid, Error.InvalidGroupId; void sendGroupTyping( - final byte[] groupId, final boolean stop + final byte[] groupId, + final boolean stop ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity; long sendGroupRemoteDeleteMessage( - long targetSentTimestamp, byte[] groupId + long targetSentTimestamp, + byte[] groupId ) throws Error.Failure, Error.GroupNotFound, Error.InvalidGroupId; long sendGroupMessageReaction( - String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, byte[] groupId + String emoji, + boolean remove, + String targetAuthor, + long targetSentTimestamp, + byte[] groupId ) throws Error.GroupNotFound, Error.Failure, Error.InvalidNumber, Error.InvalidGroupId; String getContactName(String number) throws Error.InvalidNumber; @@ -119,12 +130,17 @@ public interface Signal extends DBusInterface { List getGroupMembers(byte[] groupId) throws Error.InvalidGroupId; byte[] createGroup( - String name, List members, String avatar + String name, + List members, + String avatar ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber; @Deprecated byte[] updateGroup( - byte[] groupId, String name, List members, String avatar + byte[] groupId, + String name, + List members, + String avatar ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId; @Deprecated @@ -156,7 +172,11 @@ public interface Signal extends DBusInterface { ) throws Error.Failure; void updateProfile( - String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar + String name, + String about, + String aboutEmoji, + String avatarPath, + boolean removeAvatar ) throws Error.Failure; void removePin(); diff --git a/src/main/java/org/asamk/SignalControl.java b/src/main/java/org/asamk/SignalControl.java index fe51a7f7..3eea790f 100644 --- a/src/main/java/org/asamk/SignalControl.java +++ b/src/main/java/org/asamk/SignalControl.java @@ -13,11 +13,14 @@ import java.util.List; public interface SignalControl extends DBusInterface { void register( - String number, boolean voiceVerification + String number, + boolean voiceVerification ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha; void registerWithCaptcha( - String number, boolean voiceVerification, String captcha + String number, + boolean voiceVerification, + String captcha ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha; void verify(String number, String verificationCode) throws Error.Failure, Error.InvalidNumber; diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index f8585386..d3d74c3e 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -292,7 +292,8 @@ public class App { } private RegistrationManager loadRegistrationManager( - final String account, final SignalAccountFiles signalAccountFiles + final String account, + final SignalAccountFiles signalAccountFiles ) throws UnexpectedErrorException { try { return signalAccountFiles.initRegistrationManager(account); @@ -306,7 +307,8 @@ public class App { } private Manager loadManager( - final String account, final SignalAccountFiles signalAccountFiles + final String account, + final SignalAccountFiles signalAccountFiles ) throws CommandException { logger.trace("Loading account file for {}", account); try { diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java index d96835a5..d7fd1104 100644 --- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java @@ -101,9 +101,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { writer.println(); } - private void printDataMessage( - PlainTextWriter writer, MessageEnvelope.Data message - ) { + private void printDataMessage(PlainTextWriter writer, MessageEnvelope.Data message) { writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.timestamp())); if (message.isViewOnce()) { writer.println("=VIEW ONCE="); @@ -197,16 +195,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printEditMessage( - PlainTextWriter writer, MessageEnvelope.Edit message - ) { + private void printEditMessage(PlainTextWriter writer, MessageEnvelope.Edit message) { writer.println("Edit: Target message timestamp: {}", DateUtils.formatTimestamp(message.targetSentTimestamp())); printDataMessage(writer.indentedWriter(), message.dataMessage()); } - private void printStoryMessage( - PlainTextWriter writer, MessageEnvelope.Story message - ) { + private void printStoryMessage(PlainTextWriter writer, MessageEnvelope.Story message) { writer.println("Story: with replies: {}", message.allowsReplies()); if (message.groupId().isPresent()) { writer.println("Group info:"); @@ -226,9 +220,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printTypingMessage( - final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage - ) { + private void printTypingMessage(final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage) { writer.println("Action: {}", typingMessage.type()); writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.timestamp())); if (typingMessage.groupId().isPresent()) { @@ -238,9 +230,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printReceiptMessage( - final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage - ) { + private void printReceiptMessage(final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage) { writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.when())); if (receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY) { writer.println("Is delivery receipt"); @@ -257,9 +247,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printCallMessage( - final PlainTextWriter writer, final MessageEnvelope.Call callMessage - ) { + private void printCallMessage(final PlainTextWriter writer, final MessageEnvelope.Call callMessage) { if (callMessage.destinationDeviceId().isPresent()) { final var deviceId = callMessage.destinationDeviceId().get(); writer.println("Destination device id: {}", deviceId); @@ -302,9 +290,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printSyncMessage( - final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage - ) { + private void printSyncMessage(final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage) { if (syncMessage.contacts().isPresent()) { final var contactsMessage = syncMessage.contacts().get(); var type = contactsMessage.isComplete() ? "complete" : "partial"; @@ -392,9 +378,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printPreview( - final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview - ) { + private void printPreview(final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview) { writer.println("Title: {}", preview.title()); writer.println("Description: {}", preview.description()); writer.println("Date: {}", DateUtils.formatTimestamp(preview.date())); @@ -405,25 +389,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printSticker( - final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker - ) { + private void printSticker(final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker) { writer.println("Pack id: {}", Hex.toStringCondensed(sticker.packId().serialize())); writer.println("Sticker id: {}", sticker.stickerId()); } - private void printReaction( - final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction - ) { + private void printReaction(final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction) { writer.println("Emoji: {}", reaction.emoji()); writer.println("Target author: {}", formatContact(reaction.targetAuthor())); writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.targetSentTimestamp())); writer.println("Is remove: {}", reaction.isRemove()); } - private void printQuote( - final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote - ) { + private void printQuote(final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote) { writer.println("Id: {}", quote.id()); writer.println("Author: {}", formatContact(quote.author())); if (quote.text().isPresent()) { @@ -541,17 +519,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printGroupContext( - final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext - ) { + private void printGroupContext(final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext) { printGroupInfo(writer, groupContext.groupId()); writer.println("Revision: {}", groupContext.revision()); writer.println("Type: {}", groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER"); } - private void printStoryContext( - final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext - ) { + private void printStoryContext(final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext) { writer.println("Sender: {}", formatContact(storyContext.author())); writer.println("Sent timestamp: {}", storyContext.sentTimestamp()); } @@ -567,15 +541,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler { } } - private void printMention( - PlainTextWriter writer, MessageEnvelope.Data.Mention mention - ) { + private void printMention(PlainTextWriter writer, MessageEnvelope.Data.Mention mention) { writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length()); } - private void printTextStyle( - PlainTextWriter writer, TextStyle textStyle - ) { + private void printTextStyle(PlainTextWriter writer, TextStyle textStyle) { writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length()); } diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java index c40e4901..43e1a0b7 100644 --- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java @@ -38,7 +38,9 @@ public class AddDeviceCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final URI linkUri; try { diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java index 89c82200..2d720362 100644 --- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java +++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java @@ -36,7 +36,9 @@ public class AddStickerPackCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var uris = ns.getList("uri"); for (final var uri : uris) { diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java index 1518c53a..e7d0af49 100644 --- a/src/main/java/org/asamk/signal/commands/BlockCommand.java +++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java @@ -35,7 +35,9 @@ public class BlockCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var contacts = ns.getList("recipient"); final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/CommandHandler.java b/src/main/java/org/asamk/signal/commands/CommandHandler.java index 8e138b3f..86fede61 100644 --- a/src/main/java/org/asamk/signal/commands/CommandHandler.java +++ b/src/main/java/org/asamk/signal/commands/CommandHandler.java @@ -20,13 +20,15 @@ public class CommandHandler { } public void handleProvisioningCommand( - final ProvisioningCommand command, final ProvisioningManager provisioningManager + final ProvisioningCommand command, + final ProvisioningManager provisioningManager ) throws CommandException { command.handleCommand(ns, provisioningManager, outputWriter); } public void handleRegistrationCommand( - final RegistrationCommand command, final RegistrationManager registrationManager + final RegistrationCommand command, + final RegistrationManager registrationManager ) throws CommandException { command.handleCommand(ns, registrationManager); } @@ -36,7 +38,8 @@ public class CommandHandler { } public void handleMultiLocalCommand( - final MultiLocalCommand command, MultiAccountManager multiAccountManager + final MultiLocalCommand command, + MultiAccountManager multiAccountManager ) throws CommandException { command.handleCommand(ns, multiAccountManager, outputWriter); } diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index 59c2245e..197e1286 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -92,7 +92,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { Shutdown.installHandler(); logger.info("Starting daemon in single-account mode for " + m.getSelfNumber()); @@ -117,7 +119,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { @Override public void handleCommand( - final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + final Namespace ns, + final MultiAccountManager c, + final OutputWriter outputWriter ) throws CommandException { Shutdown.installHandler(); logger.info("Starting daemon in multi-account mode"); diff --git a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java index 51c8582d..71f8867c 100644 --- a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java +++ b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java @@ -60,7 +60,9 @@ public class DeleteLocalAccountDataCommand implements RegistrationCommand, JsonR @Override public void handleCommand( - Map request, RegistrationManager m, JsonWriter jsonWriter + Map request, + RegistrationManager m, + JsonWriter jsonWriter ) throws CommandException { Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request); handleCommand(commandNamespace, m); diff --git a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java index c2c18dde..8fce4dbf 100644 --- a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java +++ b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java @@ -33,7 +33,9 @@ public class FinishChangeNumberCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var newNumber = ns.getString("number"); final var verificationCode = ns.getString("verification-code"); diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java index a0fa0ab7..c9282616 100644 --- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java @@ -32,7 +32,9 @@ public class FinishLinkCommand implements JsonRpcMultiCommand registered; diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java index f9e9f513..1ecc5aca 100644 --- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java @@ -33,7 +33,9 @@ public class JoinGroupCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final GroupInviteLinkUrl linkUrl; var uri = ns.getString("uri"); diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java index 0eb99351..5ce9daf4 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java @@ -59,7 +59,9 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { Shutdown.installHandler(); final var receiveMode = ns.get("receive-mode"); @@ -79,7 +81,9 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand @Override public void handleCommand( - final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + final Namespace ns, + final MultiAccountManager c, + final OutputWriter outputWriter ) throws CommandException { Shutdown.installHandler(); final var receiveMode = ns.get("receive-mode"); diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java index d87b97cd..212c3e87 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java @@ -18,9 +18,7 @@ public interface JsonRpcLocalCommand extends JsonRpcSingleCommand() {}; } - default void handleCommand( - Map request, Manager m, JsonWriter jsonWriter - ) throws CommandException { + default void handleCommand(Map request, Manager m, JsonWriter jsonWriter) throws CommandException { Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request); handleCommand(commandNamespace, m, jsonWriter); } diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java index 6082f6c5..f14edeff 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java @@ -19,7 +19,9 @@ public interface JsonRpcMultiLocalCommand extends JsonRpcMultiCommand request, MultiAccountManager c, JsonWriter jsonWriter + Map request, + MultiAccountManager c, + JsonWriter jsonWriter ) throws CommandException { Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request); handleCommand(commandNamespace, c, jsonWriter); diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java index ed0cc0ed..7c29a3a9 100644 --- a/src/main/java/org/asamk/signal/commands/LinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java @@ -33,7 +33,9 @@ public class LinkCommand implements ProvisioningCommand { @Override public void handleCommand( - final Namespace ns, final ProvisioningManager m, final OutputWriter outputWriter + final Namespace ns, + final ProvisioningManager m, + final OutputWriter outputWriter ) throws CommandException { final var writer = (PlainTextWriter) outputWriter; diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java index b19a1686..b9542934 100644 --- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java @@ -23,7 +23,9 @@ public class ListAccountsCommand implements JsonRpcMultiLocalCommand { @Override public void handleCommand( - final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + final Namespace ns, + final MultiAccountManager c, + final OutputWriter outputWriter ) throws CommandException { final var accountNumbers = c.getAccountNumbers(); switch (outputWriter) { diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java index 3865d829..81a1bcb1 100644 --- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java @@ -47,7 +47,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var allRecipients = Boolean.TRUE.equals(ns.getBoolean("all-recipients")); final var blocked = ns.getBoolean("blocked"); diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java index c4ae6e72..e9b03a17 100644 --- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java @@ -33,7 +33,9 @@ public class ListDevicesCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { List devices; try { diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java index debe4ad0..62bb4f14 100644 --- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java @@ -48,9 +48,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand { .collect(Collectors.toSet()); } - private static void printGroupPlainText( - PlainTextWriter writer, Group group, boolean detailed - ) { + private static void printGroupPlainText(PlainTextWriter writer, Group group, boolean detailed) { if (detailed) { final var groupInviteLink = group.groupInviteLinkUrl(); @@ -79,7 +77,9 @@ public class ListGroupsCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var groups = m.getGroups(); diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java index 6b49a812..70b939d6 100644 --- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java @@ -46,7 +46,9 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var number = ns.getString("number"); diff --git a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java index 233eb4b5..db081211 100644 --- a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java +++ b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java @@ -27,7 +27,9 @@ public class ListStickerPacksCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager c, final OutputWriter outputWriter + final Namespace ns, + final Manager c, + final OutputWriter outputWriter ) throws CommandException { final var stickerPacks = c.getStickerPacks(); switch (outputWriter) { diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java index f1b8ef5b..346398a5 100644 --- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java @@ -44,7 +44,9 @@ public class QuitGroupCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var groupId = CommandUtil.getGroupId(ns.getString("group-id")); diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index ba126f7e..37da35e1 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -66,7 +66,9 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommandgetList("recipient"); diff --git a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java index aca52778..253cb7ad 100644 --- a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java @@ -31,7 +31,9 @@ public class RemoveContactCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var recipientString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java index 68a53616..eab0a6be 100644 --- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java @@ -30,7 +30,9 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { final var deviceId = ns.getInt("device-id"); diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java index 8085bc65..bc55f9d2 100644 --- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java @@ -27,7 +27,9 @@ public class RemovePinCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { m.setRegistrationLockPin(Optional.empty()); diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 004ba506..9784171a 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -108,7 +108,9 @@ public class SendCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self")); final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self")); @@ -257,7 +259,8 @@ public class SendCommand implements JsonRpcLocalCommand { } private List parseMentions( - final String selfNumber, final List mentionStrings + final String selfNumber, + final List mentionStrings ) throws UserErrorException { final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)"); final var mentions = new ArrayList(); diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java index a5128937..a67950c1 100644 --- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java @@ -24,7 +24,9 @@ public class SendContactsCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { m.sendContacts(); diff --git a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java index 53cd3ea7..732fd749 100644 --- a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java @@ -31,7 +31,9 @@ public class SendMessageRequestResponseCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var recipientStrings = ns.getList("recipient"); final var groupIdStrings = ns.getList("group-id"); diff --git a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java index 77181e3e..0814658e 100644 --- a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java @@ -31,7 +31,9 @@ public class SendPaymentNotificationCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var recipientString = ns.getString("recipient"); final var recipientIdentifier = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index 56fa81f2..da877d76 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -53,7 +53,9 @@ public class SendReactionCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self")); final var recipientStrings = ns.getList("recipient"); diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java index adae7c4d..93c8a564 100644 --- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java @@ -35,7 +35,9 @@ public class SendReceiptCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var recipientString = ns.getString("recipient"); final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java index 1f35ba2b..eda364c0 100644 --- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java @@ -24,7 +24,9 @@ public class SendSyncRequestCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { m.requestAllSyncData(); diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java index 9293ec6a..a9e699cc 100644 --- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java @@ -38,7 +38,9 @@ public class SendTypingCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var recipientStrings = ns.getList("recipient"); final var groupIdStrings = ns.getList("group-id"); diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java index f6b5f7ad..4d4a458f 100644 --- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java +++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java @@ -29,7 +29,9 @@ public class SetPinCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { var registrationLockPin = ns.getString("pin"); diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java index 84fcf527..c75b3077 100644 --- a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java +++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java @@ -39,7 +39,9 @@ public class StartChangeNumberCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var newNumber = ns.getString("number"); final var voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice")); diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java index ac269e95..895b5dae 100644 --- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java +++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java @@ -23,7 +23,9 @@ public class StartLinkCommand implements JsonRpcMultiCommand { @Override public void handleCommand( - final Void request, final MultiAccountManager m, final JsonWriter jsonWriter + final Void request, + final MultiAccountManager m, + final JsonWriter jsonWriter ) throws CommandException { final URI deviceLinkUri; try { diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java index a130c03c..7f18507a 100644 --- a/src/main/java/org/asamk/signal/commands/TrustCommand.java +++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java @@ -33,7 +33,9 @@ public class TrustCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var recipientString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java index 1299d0db..a6b5e6b3 100644 --- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java @@ -35,7 +35,9 @@ public class UnblockCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var contacts = ns.getList("recipient"); final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java index 83694953..e044f691 100644 --- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java @@ -28,7 +28,9 @@ public class UnregisterCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { try { if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) { diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java index a750bc88..9c8c18b8 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java @@ -47,7 +47,9 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var deviceName = ns.getString("device-name"); final var unrestrictedUnidentifiedSender = ns.getBoolean("unrestricted-unidentified-sender"); diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java index d1feff8a..03882e25 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java @@ -38,7 +38,9 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var readReceipts = ns.getBoolean("read-receipts"); final var unidentifiedDeliveryIndicators = ns.getBoolean("unidentified-delivery-indicators"); diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java index 7ff91e9b..815c15da 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java @@ -33,7 +33,9 @@ public class UpdateContactCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var recipientString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber()); diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java index f29f0732..1231d3d4 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -102,7 +102,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { final var groupIdString = ns.getString("group-id"); var groupId = CommandUtil.getGroupId(groupIdString); @@ -180,7 +182,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { } private void outputResult( - final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId + final OutputWriter outputWriter, + final SendGroupMessageResults results, + final GroupId groupId ) { switch (outputWriter) { case PlainTextWriter writer -> { diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java index cea2da0d..b122f58c 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java @@ -36,7 +36,9 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var givenName = ns.getString("given-name"); var familyName = ns.getString("family-name"); diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java index b4c09b41..710f4d35 100644 --- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java +++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java @@ -36,7 +36,9 @@ public class UploadStickerPackCommand implements JsonRpcLocalCommand { @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { var path = new File(ns.getString("path")); diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java index 54d05a4d..a8543c5a 100644 --- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java +++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java @@ -55,13 +55,17 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo @Override public void handleCommand( - final VerifyParams request, final RegistrationManager m, final JsonWriter jsonWriter + final VerifyParams request, + final RegistrationManager m, + final JsonWriter jsonWriter ) throws CommandException { verify(m, request.verificationCode(), request.pin()); } private void verify( - final RegistrationManager m, final String verificationCode, final String pin + final RegistrationManager m, + final String verificationCode, + final String pin ) throws UserErrorException, IOErrorException { try { m.verifyAccount(verificationCode, pin); diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java index 01f1a2d7..498e5e71 100644 --- a/src/main/java/org/asamk/signal/commands/VersionCommand.java +++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java @@ -35,14 +35,18 @@ public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCom @Override public void handleCommand( - final Namespace ns, final Manager m, final OutputWriter outputWriter + final Namespace ns, + final Manager m, + final OutputWriter outputWriter ) throws CommandException { outputVersion(outputWriter); } @Override public void handleCommand( - final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter + final Namespace ns, + final MultiAccountManager c, + final OutputWriter outputWriter ) throws CommandException { outputVersion(outputWriter); } diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java index 5e272895..546a433f 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java +++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java @@ -87,7 +87,8 @@ public class DbusCommandHandler { } private static String tryGetSingleAccountObjectPath( - final DBusConnection dBusConn, final String busname + final DBusConnection dBusConn, + final String busname ) throws DBusException, CommandException { var control = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class); try { diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java index e71d7281..b6799de7 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusHandler.java +++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java @@ -28,7 +28,10 @@ public class DbusHandler implements AutoCloseable { private final boolean noReceiveOnStart; public DbusHandler( - final boolean isDbusSystem, final String busname, final Manager m, final boolean noReceiveOnStart + final boolean isDbusSystem, + final String busname, + final Manager m, + final boolean noReceiveOnStart ) { this.isDbusSystem = isDbusSystem; this.dbusRunner = (connection) -> { diff --git a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java index d3c2ca83..73cfab67 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java +++ b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java @@ -12,9 +12,7 @@ public class DbusInterfacePropertiesHandler { private final String interfaceName; private final List> properties; - public DbusInterfacePropertiesHandler( - final String interfaceName, final List> properties - ) { + public DbusInterfacePropertiesHandler(final String interfaceName, final List> properties) { this.interfaceName = interfaceName; this.properties = properties; } diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java index bd5bdfb2..159407e1 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java @@ -201,14 +201,18 @@ public class DbusManagerImpl implements Manager { @Override public void startChangeNumber( - final String newNumber, final boolean voiceVerification, final String captcha + final String newNumber, + final boolean voiceVerification, + final String captcha ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException { throw new UnsupportedOperationException(); } @Override public void finishChangeNumber( - final String newNumber, final String verificationCode, final String pin + final String newNumber, + final String verificationCode, + final String pin ) throws IncorrectPinException, PinLockedException, IOException { throw new UnsupportedOperationException(); } @@ -270,7 +274,8 @@ public class DbusManagerImpl implements Manager { @Override public SendGroupMessageResults quitGroup( - final GroupId groupId, final Set groupAdmins + final GroupId groupId, + final Set groupAdmins ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException { if (!groupAdmins.isEmpty()) { throw new UnsupportedOperationException(); @@ -296,7 +301,9 @@ public class DbusManagerImpl implements Manager { @Override public Pair createGroup( - final String name, final Set members, final String avatarFile + final String name, + final Set members, + final String avatarFile ) throws IOException, AttachmentInvalidException { final var newGroupId = signal.createGroup(emptyIfNull(name), members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(), @@ -306,7 +313,8 @@ public class DbusManagerImpl implements Manager { @Override public SendGroupMessageResults updateGroup( - final GroupId groupId, final UpdateGroup updateGroup + final GroupId groupId, + final UpdateGroup updateGroup ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException { final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class); if (updateGroup.getName() != null) { @@ -380,7 +388,8 @@ public class DbusManagerImpl implements Manager { @Override public SendMessageResults sendTypingMessage( - final TypingAction action, final Set recipients + final TypingAction action, + final Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { return handleMessage(recipients, numbers -> { numbers.forEach(n -> signal.sendTyping(n, action == TypingAction.STOP)); @@ -395,24 +404,22 @@ public class DbusManagerImpl implements Manager { } @Override - public SendMessageResults sendReadReceipt( - final RecipientIdentifier.Single sender, final List messageIds - ) { + public SendMessageResults sendReadReceipt(final RecipientIdentifier.Single sender, final List messageIds) { signal.sendReadReceipt(sender.getIdentifier(), messageIds); return new SendMessageResults(0, Map.of()); } @Override - public SendMessageResults sendViewedReceipt( - final RecipientIdentifier.Single sender, final List messageIds - ) { + public SendMessageResults sendViewedReceipt(final RecipientIdentifier.Single sender, final List messageIds) { signal.sendViewedReceipt(sender.getIdentifier(), messageIds); return new SendMessageResults(0, Map.of()); } @Override public SendMessageResults sendMessage( - final Message message, final Set recipients, final boolean notifySelf + final Message message, + final Set recipients, + final boolean notifySelf ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { return handleMessage(recipients, numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers), @@ -422,14 +429,17 @@ public class DbusManagerImpl implements Manager { @Override public SendMessageResults sendEditMessage( - final Message message, final Set recipients, final long editTargetTimestamp + final Message message, + final Set recipients, + final long editTargetTimestamp ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException { throw new UnsupportedOperationException(); } @Override public SendMessageResults sendRemoteDeleteMessage( - final long targetSentTimestamp, final Set recipients + final long targetSentTimestamp, + final Set recipients ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException { return handleMessage(recipients, numbers -> signal.sendRemoteDeleteMessage(targetSentTimestamp, numbers), @@ -466,7 +476,9 @@ public class DbusManagerImpl implements Manager { @Override public SendMessageResults sendPaymentNotificationMessage( - final byte[] receipt, final String note, final RecipientIdentifier.Single recipient + final byte[] receipt, + final String note, + final RecipientIdentifier.Single recipient ) throws IOException { final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier()); return new SendMessageResults(timestamp, Map.of()); @@ -502,14 +514,17 @@ public class DbusManagerImpl implements Manager { @Override public void setContactName( - final RecipientIdentifier.Single recipient, final String givenName, final String familyName + final RecipientIdentifier.Single recipient, + final String givenName, + final String familyName ) throws NotPrimaryDeviceException { signal.setContactName(recipient.getIdentifier(), givenName); } @Override public void setContactsBlocked( - final Collection recipients, final boolean blocked + final Collection recipients, + final boolean blocked ) throws NotPrimaryDeviceException, IOException { for (final var recipient : recipients) { signal.setContactBlocked(recipient.getIdentifier(), blocked); @@ -518,7 +533,8 @@ public class DbusManagerImpl implements Manager { @Override public void setGroupsBlocked( - final Collection groupIds, final boolean blocked + final Collection groupIds, + final boolean blocked ) throws GroupNotFoundException, IOException { for (final var groupId : groupIds) { setGroupProperty(groupId, "IsBlocked", blocked); @@ -532,7 +548,8 @@ public class DbusManagerImpl implements Manager { @Override public void setExpirationTimer( - final RecipientIdentifier.Single recipient, final int messageExpirationTimer + final RecipientIdentifier.Single recipient, + final int messageExpirationTimer ) throws IOException { signal.setExpirationTimer(recipient.getIdentifier(), messageExpirationTimer); } @@ -597,7 +614,9 @@ public class DbusManagerImpl implements Manager { @Override public void receiveMessages( - Optional timeout, Optional maxMessages, ReceiveMessageHandler handler + Optional timeout, + Optional maxMessages, + ReceiveMessageHandler handler ) throws IOException, AlreadyReceivingException { if (receiveThread != null) { throw new AlreadyReceivingException("Already receiving message."); @@ -784,7 +803,8 @@ public class DbusManagerImpl implements Manager { @Override public boolean trustIdentityVerified( - final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode + final RecipientIdentifier.Single recipient, + final IdentityVerificationCode verificationCode ) { throw new UnsupportedOperationException(); } @@ -1124,9 +1144,7 @@ public class DbusManagerImpl implements Manager { } @SuppressWarnings("unchecked") - private T getValue( - final Map> stringVariantMap, final String field - ) { + private T getValue(final Map> stringVariantMap, final String field) { return (T) stringVariantMap.get(field).getValue(); } } diff --git a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java index 27e28779..2b9a0a77 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java @@ -34,7 +34,9 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager { private final String busname; public DbusMultiAccountManagerImpl( - final SignalControl signalControl, DBusConnection connection, final String busname + final SignalControl signalControl, + DBusConnection connection, + final String busname ) { this.signalControl = signalControl; this.connection = connection; diff --git a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java index 2e026c8a..e3cf4c12 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java @@ -27,7 +27,9 @@ public class DbusProvisioningManagerImpl implements ProvisioningManager { } public DbusProvisioningManagerImpl( - final SignalControl signalControl, DBusConnection connection, URI deviceLinkUri + final SignalControl signalControl, + DBusConnection connection, + URI deviceLinkUri ) { this.signalControl = signalControl; this.connection = connection; diff --git a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java index 788e0c91..0c02c680 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java @@ -27,7 +27,9 @@ public class DbusRegistrationManagerImpl implements RegistrationManager { @Override public void register( - final boolean voiceVerification, final String captcha, final boolean forceRegister + final boolean voiceVerification, + final String captcha, + final boolean forceRegister ) throws IOException, CaptchaRequiredException { if (forceRegister) { throw new UnsupportedOperationException(); @@ -41,7 +43,8 @@ public class DbusRegistrationManagerImpl implements RegistrationManager { @Override public void verifyAccount( - final String verificationCode, final String pin + final String verificationCode, + final String pin ) throws IOException, PinLockedException, IncorrectPinException { if (pin == null) { signalControl.verify(number, verificationCode); diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java index def343a9..cf6999a9 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java @@ -49,14 +49,17 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { @Override public void register( - final String number, final boolean voiceVerification + final String number, + final boolean voiceVerification ) throws Error.Failure, Error.InvalidNumber { registerWithCaptcha(number, voiceVerification, null); } @Override public void registerWithCaptcha( - final String number, final boolean voiceVerification, final String captcha + final String number, + final boolean voiceVerification, + final String captcha ) throws Error.Failure, Error.InvalidNumber { if (!Manager.isValidNumber(number, null)) { throw new SignalControl.Error.InvalidNumber( @@ -86,7 +89,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl { @Override public void verifyWithPin( - final String number, final String verificationCode, final String pin + final String number, + final String verificationCode, + final String pin ) throws Error.Failure, Error.InvalidNumber { try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) { registrationManager.verifyAccount(verificationCode, pin); diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java index 1b8b7825..bbae26b5 100644 --- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java +++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java @@ -81,7 +81,10 @@ public class DbusSignalImpl implements Signal, AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class); public DbusSignalImpl( - final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart + final Manager m, + DBusConnection connection, + final String objectPath, + final boolean noReceiveOnStart ) { this.m = m; this.connection = connection; @@ -258,16 +261,12 @@ public class DbusSignalImpl implements Signal, AutoCloseable { } @Override - public long sendRemoteDeleteMessage( - final long targetSentTimestamp, final String recipient - ) { + public long sendRemoteDeleteMessage(final long targetSentTimestamp, final String recipient) { return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient)); } @Override - public long sendRemoteDeleteMessage( - final long targetSentTimestamp, final List recipients - ) { + public long sendRemoteDeleteMessage(final long targetSentTimestamp, final List recipients) { try { final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream() @@ -323,7 +322,9 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public long sendPaymentNotification( - final byte[] receipt, final String note, final String recipient + final byte[] receipt, + final String note, + final String recipient ) throws Error.Failure { try { final var results = m.sendPaymentNotificationMessage(receipt, @@ -338,7 +339,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public void sendTyping( - final String recipient, final boolean stop + final String recipient, + final boolean stop ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity { try { final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START, @@ -355,7 +357,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public void sendReadReceipt( - final String recipient, final List messageIds + final String recipient, + final List messageIds ) throws Error.Failure, Error.UntrustedIdentity { final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds); checkSendMessageResults(results); @@ -363,7 +366,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public void sendViewedReceipt( - final String recipient, final List messageIds + final String recipient, + final List messageIds ) throws Error.Failure, Error.UntrustedIdentity { final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds); checkSendMessageResults(results); @@ -389,7 +393,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public long sendNoteToSelfMessage( - final String messageText, final List attachments + final String messageText, + final List attachments ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity { try { final var message = new Message(messageText, @@ -461,7 +466,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public void sendGroupTyping( - final byte[] groupId, final boolean stop + final byte[] groupId, + final boolean stop ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity { try { final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START, @@ -475,9 +481,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable { } @Override - public long sendGroupRemoteDeleteMessage( - final long targetSentTimestamp, final byte[] groupId - ) { + public long sendGroupRemoteDeleteMessage(final long targetSentTimestamp, final byte[] groupId) { try { final var results = m.sendRemoteDeleteMessage(targetSentTimestamp, Set.of(getGroupRecipientIdentifier(groupId))); @@ -621,7 +625,9 @@ public class DbusSignalImpl implements Signal, AutoCloseable { @Override public byte[] createGroup( - final String name, final List members, final String avatar + final String name, + final List members, + final String avatar ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber { return updateGroupInternal(new byte[0], name, members, avatar); } @@ -900,7 +906,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { } private static void checkGroupSendMessageResults( - long timestamp, Collection results + long timestamp, + Collection results ) throws DBusExecutionException { if (results.size() == 1) { checkSendMessageResult(timestamp, results.stream().findFirst().get()); @@ -927,7 +934,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { } private static Set getSingleRecipientIdentifiers( - final Collection recipientStrings, final String localNumber + final Collection recipientStrings, + final String localNumber ) throws DBusExecutionException { final var identifiers = new HashSet(); for (var recipientString : recipientStrings) { @@ -937,7 +945,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable { } private static RecipientIdentifier.Single getSingleRecipientIdentifier( - final String recipientString, final String localNumber + final String recipientString, + final String localNumber ) throws DBusExecutionException { try { return RecipientIdentifier.Single.fromString(recipientString, localNumber); diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java index c9c8fa16..e1780665 100644 --- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java +++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java @@ -240,7 +240,9 @@ public class HttpServerHandler implements AutoCloseable { } private List> subscribeReceiveHandlers( - final List managers, final ServerSentEventSender sender, Callable unsubscribe + final List managers, + final ServerSentEventSender sender, + Callable unsubscribe ) { return managers.stream().map(m1 -> { final var receiveMessageHandler = new JsonReceiveMessageHandler(m1, s -> { diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java index 7ba4b307..8ab8ea83 100644 --- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java +++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java @@ -28,9 +28,7 @@ public record JsonMessageEnvelope( @JsonInclude(JsonInclude.Include.NON_NULL) JsonTypingMessage typingMessage ) { - public static JsonMessageEnvelope from( - MessageEnvelope envelope, Throwable exception, Manager m - ) { + public static JsonMessageEnvelope from(MessageEnvelope envelope, Throwable exception, Manager m) { final RecipientAddress sourceAddress; final Integer sourceDevice; if (envelope.sourceAddress().isPresent()) { diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java index e90d740c..29866c1a 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java +++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java @@ -38,7 +38,9 @@ public final class JsonRpcRequest extends JsonRpcMessage { private ValueNode id; public static JsonRpcRequest forNotification( - final String method, final ContainerNode params, final ValueNode id + final String method, + final ContainerNode params, + final ValueNode id ) { return new JsonRpcRequest("2.0", method, params, id); } @@ -47,7 +49,10 @@ public final class JsonRpcRequest extends JsonRpcMessage { } private JsonRpcRequest( - final String jsonrpc, final String method, final ContainerNode params, final ValueNode id + final String jsonrpc, + final String method, + final ContainerNode params, + final ValueNode id ) { this.jsonrpc = jsonrpc; this.method = method; diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java index 96456a4e..48eb4a45 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java @@ -56,7 +56,9 @@ public class SignalJsonRpcCommandHandler { } public JsonNode handleRequest( - final ObjectMapper objectMapper, final String method, ContainerNode params + final ObjectMapper objectMapper, + final String method, + ContainerNode params ) throws JsonRpcException { var command = getCommand(method); if (c != null) { @@ -197,7 +199,9 @@ public class SignalJsonRpcCommandHandler { } private JsonNode runCommand( - final ObjectMapper objectMapper, final ContainerNode params, final CommandRunner command + final ObjectMapper objectMapper, + final ContainerNode params, + final CommandRunner command ) throws JsonRpcException { final Object[] result = {null}; final JsonWriter commandJsonWriter = s -> { diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java index c8b4bc15..5d3fa261 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java @@ -43,7 +43,9 @@ public class SignalJsonRpcDispatcherHandler { private SignalJsonRpcCommandHandler commandHandler; public SignalJsonRpcDispatcherHandler( - final JsonWriter jsonWriter, final Supplier lineSupplier, final boolean noReceiveOnStart + final JsonWriter jsonWriter, + final Supplier lineSupplier, + final boolean noReceiveOnStart ) { this.noReceiveOnStart = noReceiveOnStart; this.objectMapper = Util.createJsonObjectMapper(); @@ -167,7 +169,9 @@ public class SignalJsonRpcDispatcherHandler { @Override public void handleCommand( - final Void request, final Manager m, final JsonWriter jsonWriter + final Void request, + final Manager m, + final JsonWriter jsonWriter ) throws CommandException { final var subscriptionId = subscribeReceive(m, false); jsonWriter.write(subscriptionId); @@ -175,7 +179,9 @@ public class SignalJsonRpcDispatcherHandler { @Override public void handleCommand( - final Void request, final MultiAccountManager c, final JsonWriter jsonWriter + final Void request, + final MultiAccountManager c, + final JsonWriter jsonWriter ) throws CommandException { final var subscriptionId = subscribeReceive(c.getManagers(), false); jsonWriter.write(subscriptionId); @@ -196,7 +202,9 @@ public class SignalJsonRpcDispatcherHandler { @Override public void handleCommand( - final JsonNode request, final Manager m, final JsonWriter jsonWriter + final JsonNode request, + final Manager m, + final JsonWriter jsonWriter ) throws CommandException { final var subscriptionId = getSubscriptionId(request); if (subscriptionId == null) { @@ -210,7 +218,9 @@ public class SignalJsonRpcDispatcherHandler { @Override public void handleCommand( - final JsonNode request, final MultiAccountManager c, final JsonWriter jsonWriter + final JsonNode request, + final MultiAccountManager c, + final JsonWriter jsonWriter ) throws CommandException { final var subscriptionId = getSubscriptionId(request); if (subscriptionId == null) { diff --git a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java index dc620bc8..2e0d50e4 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java @@ -39,7 +39,9 @@ public class SocketHandler implements AutoCloseable { } public SocketHandler( - final ServerSocketChannel serverChannel, final MultiAccountManager c, final boolean noReceiveOnStart + final ServerSocketChannel serverChannel, + final MultiAccountManager c, + final boolean noReceiveOnStart ) { this.serverChannel = serverChannel; this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(c); diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java index f6e23b70..2ee7b5f0 100644 --- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java +++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java @@ -83,7 +83,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { } private ConsoleAppender createLoggingConsoleAppender( - final LoggerContext lc, final LayoutWrappingEncoder layoutEncoder + final LoggerContext lc, + final LayoutWrappingEncoder layoutEncoder ) { return new ConsoleAppender<>() {{ setContext(lc); @@ -95,7 +96,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { } private FileAppender createLoggingFileAppender( - final LoggerContext lc, final LayoutWrappingEncoder layoutEncoder + final LoggerContext lc, + final LayoutWrappingEncoder layoutEncoder ) { return new FileAppender<>() {{ setContext(lc); diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java index 6078c6ba..9d796a64 100644 --- a/src/main/java/org/asamk/signal/logging/Scrubber.java +++ b/src/main/java/org/asamk/signal/logging/Scrubber.java @@ -249,9 +249,7 @@ public final class Scrubber { return scrub(in, IPV4_PATTERN, (matcher, output) -> output.append(IPV4_CENSOR)); } - private static CharSequence scrub( - CharSequence in, Pattern pattern, ProcessMatch processMatch - ) { + private static CharSequence scrub(CharSequence in, Pattern pattern, ProcessMatch processMatch) { final StringBuilder output = new StringBuilder(in.length()); final Matcher matcher = pattern.matcher(in); diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java index 039ac2a7..61f5013e 100644 --- a/src/main/java/org/asamk/signal/util/CommandUtil.java +++ b/src/main/java/org/asamk/signal/util/CommandUtil.java @@ -84,7 +84,8 @@ public class CommandUtil { } public static Set getSingleRecipientIdentifiers( - final Collection recipientStrings, final String localNumber + final Collection recipientStrings, + final String localNumber ) throws UserErrorException { if (recipientStrings == null) { return Set.of(); @@ -97,7 +98,8 @@ public class CommandUtil { } public static RecipientIdentifier.Single getSingleRecipientIdentifier( - final String recipientString, final String localNumber + final String recipientString, + final String localNumber ) throws UserErrorException { try { return RecipientIdentifier.Single.fromString(recipientString, localNumber); diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java index 76932402..a23e3c54 100644 --- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java +++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java @@ -41,7 +41,8 @@ public class SendMessageResultUtils { } public static void outputResult( - final OutputWriter outputWriter, final SendMessageResults sendMessageResults + final OutputWriter outputWriter, + final SendMessageResults sendMessageResults ) throws CommandException { switch (outputWriter) { case PlainTextWriter writer -> { -- 2.50.1