From: AsamK Date: Tue, 1 Nov 2022 20:57:23 +0000 (+0100) Subject: Small improvements X-Git-Tag: v0.11.5~15 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/43face8ead95344e3d0dcbc94c6cf85959f26203 Small improvements --- diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json index 3f7b8de2..61a3b144 100644 --- 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":"","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 e3c96ad6..e95c2069 100644 --- 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 4f581905..977544f2 100644 --- 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 2f2cd8e3..050726b6 100644 --- 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 b4b0d04b..9250927d 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 @@ -43,7 +43,6 @@ public class AttachmentHelper { return attachmentStore.retrieveAttachment(id); } - public List uploadAttachments(final List attachments) throws AttachmentInvalidException, IOException { var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments); diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc index be940418..d55d8ec7 100644 --- 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 1f0fc2ec..51820c9a 100644 --- 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 560be9f9..6deed90a 100644 --- 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 004f02d8..fd759674 100644 --- 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 4748e722..012df53d 100644 --- 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 colors, - List positions, - Integer angle + String startColor, String endColor, List colors, List 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 6eb359cd..4cd2797e 100644 --- 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 { @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 596f23a9..f7a870ca 100644 --- 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() { }