From: AsamK Date: Thu, 26 May 2022 10:23:21 +0000 (+0200) Subject: Fix inspection issues X-Git-Tag: v0.10.7~7 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/d8d859ab0200318faf37ba184ea55871f8d9d2da?ds=inline Fix inspection issues --- diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java index 08826c57..0c617646 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java @@ -150,10 +150,9 @@ class ProvisioningManagerImpl implements ProvisioningManager { ManagerImpl m = null; try { - final var accountPathFinal = accountPath; m = new ManagerImpl(account, pathConfig, - new AccountFileUpdaterImpl(accountsStore, accountPathFinal), + new AccountFileUpdaterImpl(accountsStore, accountPath), serviceEnvironmentConfig, userAgent); account = null; diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java index 1bd2f38d..242d0f47 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java @@ -15,7 +15,7 @@ public sealed interface RecipientIdentifier { record NoteToSelf() implements RecipientIdentifier { - public static NoteToSelf INSTANCE = new NoteToSelf(); + public static final NoteToSelf INSTANCE = new NoteToSelf(); @Override public String getIdentifier() { diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java index 077542e1..71b18a67 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java @@ -47,7 +47,7 @@ public class UpdateGroup { } public static Builder newBuilder(final UpdateGroup copy) { - Builder builder = new Builder(copy.name, + return new Builder(copy.name, copy.description, copy.members, copy.removeMembers, @@ -62,7 +62,6 @@ public class UpdateGroup { copy.avatarFile, copy.expirationTimer, copy.isAnnouncementGroup); - return builder; } public static Builder newBuilder( 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 9552de58..c67a6573 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 @@ -49,7 +49,8 @@ public class StickerHelper { public void retrieveStickerPack(StickerPackId packId, byte[] packKey) throws InvalidMessageException, IOException { logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize())); - final var manifest = dependencies.getMessageReceiver().retrieveStickerManifest(packId.serialize(), packKey); + final var messageReceiver = dependencies.getMessageReceiver(); + final var manifest = messageReceiver.retrieveStickerManifest(packId.serialize(), packKey); final var stickerIds = new HashSet(); if (manifest.getCover().isPresent()) { @@ -60,8 +61,9 @@ public class StickerHelper { } for (var id : stickerIds) { - final var inputStream = dependencies.getMessageReceiver().retrieveSticker(packId.serialize(), packKey, id); - context.getStickerPackStore().storeSticker(packId, id, o -> IOUtils.copyStream(inputStream, o)); + try (final var inputStream = messageReceiver.retrieveSticker(packId.serialize(), packKey, id)) { + context.getStickerPackStore().storeSticker(packId, id, o -> IOUtils.copyStream(inputStream, o)); + } } final var jsonManifest = new JsonStickerPack(manifest.getTitle().orElse(null), 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 983c59e1..d9c553b7 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 @@ -186,7 +186,7 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide } } - final Pattern identityFileNamePattern = Pattern.compile("([0-9]+)"); + final Pattern identityFileNamePattern = Pattern.compile("(\\d+)"); public List getIdentities() { final var files = identitiesPath.listFiles(); @@ -198,6 +198,7 @@ public class IdentityKeyStore implements org.signal.libsignal.protocol.state.Ide .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName()))) .filter(Objects::nonNull) .map(this::loadIdentityLocked) + .filter(Objects::nonNull) .toList(); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java index 575e9256..bacc9f3b 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java @@ -36,7 +36,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si return loadSignedPreKeyRecord(file); } - final Pattern signedPreKeyFileNamePattern = Pattern.compile("([0-9]+)"); + final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)"); @Override public List loadSignedPreKeys() { 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 f9a260de..0d9f6288 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 @@ -161,7 +161,7 @@ public class SenderKeyRecordStore implements org.signal.libsignal.protocol.group return parseFileNames(files); } - final Pattern senderKeyFileNamePattern = Pattern.compile("([0-9]+)_([0-9]+)_([0-9a-z\\-]+)"); + final Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)"); private List parseFileNames(final File[] files) { return Arrays.stream(files) 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 be494d51..b265e0bc 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 @@ -242,7 +242,7 @@ public class SessionStore implements SignalServiceSessionStore { return parseFileNames(files); } - final Pattern sessionFileNamePattern = Pattern.compile("([0-9]+)_([0-9]+)"); + final Pattern sessionFileNamePattern = Pattern.compile("(\\d+)_(\\d+)"); private List parseFileNames(final File[] files) { return Arrays.stream(files) diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 4ad75e95..3873cc27 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -189,7 +189,7 @@ public class SendCommand implements JsonRpcLocalCommand { final Manager m, final List mentionStrings ) throws UserErrorException { List mentions; - final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)"); + final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)"); mentions = new ArrayList<>(); for (final var mention : mentionStrings) { final var matcher = mentionPattern.matcher(mention); @@ -205,7 +205,7 @@ public class SendCommand implements JsonRpcLocalCommand { } private Message.Sticker parseSticker(final String stickerString) throws UserErrorException { - final Pattern stickerPattern = Pattern.compile("([0-9a-f]+):([0-9]+)"); + final Pattern stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)"); final var matcher = stickerPattern.matcher(stickerString); if (!matcher.matches() || matcher.group(1).length() % 2 != 0) { throw new UserErrorException("Invalid sticker syntax ("