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 08826c57356f27e9aeb9e8316182156a29f57672..0c61764649197206063b6da9481c607afe3ded26 100644 (file)
--- 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 {
 
             ManagerImpl m = null;
             try {

-                final var accountPathFinal = accountPath;

                 m = new ManagerImpl(account,
                         pathConfig,
                 m = new ManagerImpl(account,
                         pathConfig,

-                        new AccountFileUpdaterImpl(accountsStore, accountPathFinal),
+                        new AccountFileUpdaterImpl(accountsStore, accountPath),

                         serviceEnvironmentConfig,
                         userAgent);
                 account = null;
                         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 1bd2f38dd66eaf4690fbf81d5ad7fa323e2949bd..242d0f47daa56948846c7c68f344e3ff7ad880ad 100644 (file)
--- 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 {
 
 
     record NoteToSelf() implements RecipientIdentifier {
 

-        public static NoteToSelf INSTANCE = new NoteToSelf();
+        public static final NoteToSelf INSTANCE = new NoteToSelf();

 
         @Override
         public String getIdentifier() {
 
         @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 077542e16b093589931b11e74d8f77e3213cfc8f..71b18a676aa84d3d5c831d8fc3d8d29377df3ac6 100644 (file)
--- 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) {
     }
 
     public static Builder newBuilder(final UpdateGroup copy) {

-        Builder builder = new Builder(copy.name,
+        return new Builder(copy.name,

                 copy.description,
                 copy.members,
                 copy.removeMembers,
                 copy.description,
                 copy.members,
                 copy.removeMembers,


@@ -62,7 +62,6 @@ public class UpdateGroup {
                 copy.avatarFile,
                 copy.expirationTimer,
                 copy.isAnnouncementGroup);
                 copy.avatarFile,
                 copy.expirationTimer,
                 copy.isAnnouncementGroup);

-        return builder;

     }
 
     public static Builder newBuilder(
     }
 
     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 9552de58b555bce9bf33fd9b36a4b34e427dcf34..c67a65737c24358bd237eeaabda5901d91339569 100644 (file)
--- 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()));
 
     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<Integer>();
         if (manifest.getCover().isPresent()) {
 
         final var stickerIds = new HashSet<Integer>();
         if (manifest.getCover().isPresent()) {


@@ -60,8 +61,9 @@ public class StickerHelper {
         }
 
         for (var id : stickerIds) {
         }
 
         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),
         }
 
         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 983c59e1848c70846f3da8e90ffd48d0c56a8a71..d9c553b737a2c57606f2412db7b6acf24586c043 100644 (file)
--- 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<IdentityInfo> getIdentities() {
         final var files = identitiesPath.listFiles();
 
     public List<IdentityInfo> 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)
                 .map(f -> resolver.resolveRecipient(Long.parseLong(f.getName())))
                 .filter(Objects::nonNull)
                 .map(this::loadIdentityLocked)

+                .filter(Objects::nonNull)

                 .toList();
     }
 
                 .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 575e9256b7221af20a1d602a843301fb35d9c761..bacc9f3b59478f424f30b4fe1b7191d7d6695c5f 100644 (file)
--- 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);
     }
 
         return loadSignedPreKeyRecord(file);
     }
 

-    final Pattern signedPreKeyFileNamePattern = Pattern.compile("([0-9]+)");
+    final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");

 
     @Override
     public List<SignedPreKeyRecord> loadSignedPreKeys() {
 
     @Override
     public List<SignedPreKeyRecord> 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 f9a260de1f349f51dc35cffb7d9aa12c667e98ee..0d9f6288cfddbcbf8d7993517471904241150df0 100644 (file)
--- 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);
     }
 
         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<Key> parseFileNames(final File[] files) {
         return Arrays.stream(files)
 
     private List<Key> 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 be494d51c828fc1d487a7e6e75100b9ff758562f..b265e0bc8822b6f00e1361a91827eca1a84a7baa 100644 (file)
--- 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);
     }
 
         return parseFileNames(files);
     }
 

-    final Pattern sessionFileNamePattern = Pattern.compile("([0-9]+)_([0-9]+)");
+    final Pattern sessionFileNamePattern = Pattern.compile("(\\d+)_(\\d+)");

 
     private List<Key> parseFileNames(final File[] files) {
         return Arrays.stream(files)
 
     private List<Key> 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 4ad75e956dd322dfc405c4fbc0ebc16fc82c4c81..3873cc278f8dc596d00bf638cf862e4286fdd97f 100644 (file)
--- 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<String> mentionStrings
     ) throws UserErrorException {
         List<Message.Mention> mentions;
             final Manager m, final List<String> mentionStrings
     ) throws UserErrorException {
         List<Message.Mention> 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);
         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 {
     }
 
     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 ("
         final var matcher = stickerPattern.matcher(stickerString);
         if (!matcher.matches() || matcher.group(1).length() % 2 != 0) {
             throw new UserErrorException("Invalid sticker syntax ("