From 01b4933dcc2b97dc3fd9d2f48017edb9022ae49f Mon Sep 17 00:00:00 2001 From: cedb Date: Wed, 23 Nov 2022 23:42:24 -0500 Subject: [PATCH] Add missing files to attachment fix --- .../org/asamk/signal/commands/GetAttachmentCommand.java | 6 +++--- src/main/java/org/asamk/signal/json/JsonAttachmentData.java | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java index 6deed90a..f2f0450c 100644 --- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java @@ -40,12 +40,12 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand { final var id = ns.getString("id"); try (InputStream attachment = m.retrieveAttachment(id)) { + final var bytes = attachment.readAllBytes(); + final var base64 = Base64.getEncoder().encodeToString(bytes); if (outputWriter instanceof PlainTextWriter writer) { - final var bytes = attachment.readAllBytes(); - final var base64 = Base64.getEncoder().encodeToString(bytes); writer.println(base64); } else if (outputWriter instanceof JsonWriter writer) { - writer.write(new JsonAttachmentData(attachment)); + writer.write(new JsonAttachmentData(base64)); } } catch (FileNotFoundException ex) { throw new UserErrorException("Could not find attachment with ID: " + id, ex); diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java index fd759674..05a90c21 100644 --- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java +++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java @@ -1,9 +1,5 @@ package org.asamk.signal.json; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -import java.io.InputStream; - public record JsonAttachmentData( - @JsonSerialize(using = JsonStreamSerializer.class) InputStream data + String data ) {}