Small improvements

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 3f7b8de241147cb27b3dfbbbc0212de3f5bf49f6..61a3b14458b2654f3498a067ca5c2ec5418306de 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -713,6 +713,13 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.asamk.signal.json.JsonAttachmentData",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"data","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.json.JsonCallMessage",
   "allDeclaredFields":true,
@@ -975,6 +982,10 @@
     {"name":"startColor","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.asamk.signal.json.JsonStreamSerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,

diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
index e3c96ad6eb66d36a3525642bfb861623b193616d..e95c206958a282583ee4ef1d5174d9330834ea8c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
@@ -43,9 +43,6 @@ public class AttachmentStore {
 
     public StreamDetails retrieveAttachment(final String id) throws IOException {
         final var attachmentFile = new File(attachmentsPath, id);
-        if (!attachmentFile.exists()) {
-            return null;
-        }
         return Utils.createStreamDetailsFromFile(attachmentFile);
     }
 

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 4f58190507075a321d12bb411ba9f90c10cba4a6..977544f2de3440ae8d1cf09ad4504c8ceb591e37 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -62,8 +62,9 @@ class LiveConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
+                new SignalContactDiscoveryUrl[]{
+                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
+                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 2f2cd8e37acb5db182a12850d0496744c971c312..050726b6a8f4ca074bc6606550cab97f5e9f290c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -62,8 +62,9 @@ class StagingConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
+                new SignalContactDiscoveryUrl[]{
+                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
+                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},

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 b4b0d04b9d3d2300bd5145da58babe853346bb99..9250927db0fdb00bc9ba95e8a07c7b17d527435c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -43,7 +43,6 @@ public class AttachmentHelper {
         return attachmentStore.retrieveAttachment(id);
     }
 
-
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
         var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);
 

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index be940418e001044f6eecabdee3048f3e803aaba5..d55d8ec7a3bdf17d86bf9d46d6eaba3e93e16415 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -637,17 +637,19 @@ The path of the manifest.json or a zip file containing the sticker pack you wish
 
 === getAttachment
 
-Gets teh raw data for a specified attachment. This is done using the ID of the attachment the recipient or group ID.
+Gets the raw data for a specified attachment.
+This is done using the ID of the attachment the recipient or group ID.
 The attachment data is returned as a Base64 String.
 
 *--id* [ID]::
 The ID of the attachment as given in the attachment list of the message.
 
 *--recipient* [RECIPIENT]::
-Specify the number which sent the attachment. Referred to generally as recipient.
+Specify the number which sent the attachment.
+Referred to generally as recipient.
 
 *-g* [GROUP], *--group-id* [GROUP]::
-Alternatively, specify the group IDs that for which to get the attachment.
+Alternatively, specify the group IDs for which to get the attachment.
 
 === daemon
 

diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 1f0fc2ec48bb92eb609e0899b5f26fa8f777b81f..51820c9a2dc250123832098163eacdf5cd60feae 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -11,11 +11,11 @@ public class Commands {
 
     static {
         addCommand(new AddDeviceCommand());
-        addCommand(new GetAttachmentCommand());
         addCommand(new BlockCommand());
         addCommand(new DaemonCommand());
         addCommand(new DeleteLocalAccountDataCommand());
         addCommand(new FinishLinkCommand());
+        addCommand(new GetAttachmentCommand());
         addCommand(new GetUserStatusCommand());
         addCommand(new JoinGroupCommand());
         addCommand(new JsonRpcDispatcherCommand());

diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index 560be9f9071418a810e90cd41c5a4383917e87ba..6deed90a4b1d9fb2a63bd9f143e7cda74d43ad9f 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -26,27 +26,20 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("--id")
-                .required(true)
-                .help("The ID of the attachment file.");
-        var mut = subparser.addMutuallyExclusiveGroup()
-                .required(true);
-        mut.addArgument("--recipient")
-                .help("Sender of the attachment");
-        mut.addArgument("-g", "--group-id")
-                .help("Group in which the attachment was received");
+        subparser.addArgument("--id").required(true).help("The ID of the attachment file.");
+        var mut = subparser.addMutuallyExclusiveGroup().required(true);
+        mut.addArgument("--recipient").help("Sender of the attachment");
+        mut.addArgument("-g", "--group-id").help("Group in which the attachment was received");
     }
 
     @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 id = ns.getString("id");
 
-        try(InputStream attachment = m.retrieveAttachment(id)) {
+        try (InputStream attachment = m.retrieveAttachment(id)) {
             if (outputWriter instanceof PlainTextWriter writer) {
                 final var bytes = attachment.readAllBytes();
                 final var base64 = Base64.getEncoder().encodeToString(bytes);

diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
index 004f02d8035e4d471a532aa50930b960a3f9bc6f..fd759674d01e750f1f674fedde733f40fae84d5c 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -5,5 +5,5 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.InputStream;
 
 public record JsonAttachmentData(
-        @JsonSerialize(using=JsonStreamSerializer.class) InputStream data
+        @JsonSerialize(using = JsonStreamSerializer.class) InputStream data
 ) {}

diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
index 4748e72259e2d1b0437dbd580153b99c9f59d388..012df53d815a8b1ab159b50c115f2a55b65d1cdb 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -43,11 +43,7 @@ record JsonStoryMessage(
         }
 
         public record Gradient(
-                String startColor,
-                String endColor,
-                List<String> colors,
-                List<Float> positions,
-                Integer angle
+                String startColor, String endColor, List<String> colors, List<Float> positions, Integer angle
         ) {
 
             static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) {

diff --git a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
index 6eb359cd0696bab0aab678c0f4894a4e80112d70..4cd2797edea382c0935da4224922c11363665622 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
+++ b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
@@ -11,9 +11,7 @@ public class JsonStreamSerializer extends JsonSerializer<InputStream> {
 
     @Override
     public void serialize(
-            final InputStream value,
-            final JsonGenerator jsonGenerator,
-            final SerializerProvider serializers
+            final InputStream value, final JsonGenerator jsonGenerator, final SerializerProvider serializers
     ) throws IOException {
         jsonGenerator.writeBinary(value, -1);
     }

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 596f23a96a64c658de0490432bd5fc7a107df2cd..f7a870ca13ff940fdc2db00eec3a4fc01296f380 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -2,7 +2,9 @@ package org.asamk.signal.util;
 
 public class Hex {
 
-    private final static char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+    private final static char[] HEX_DIGITS = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
 
     private Hex() {
     }