X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/58db3cbd53f3faec94ddfcd5e029865a380e6242..14532be:/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java index 1aae3104..f3f809dc 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java @@ -1,20 +1,28 @@ package org.asamk.signal.json; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; public class JsonQuotedAttachment { - String contentType; - String filename; - JsonAttachment thumbnail; + @JsonProperty + final String contentType; + + @JsonProperty + final String filename; + + @JsonProperty + @JsonInclude(JsonInclude.Include.NON_NULL) + final JsonAttachment thumbnail; JsonQuotedAttachment(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) { contentType = quotedAttachment.getContentType(); filename = quotedAttachment.getFileName(); if (quotedAttachment.getThumbnail() != null) { thumbnail = new JsonAttachment(quotedAttachment.getThumbnail()); - } - else { + } else { thumbnail = null; } }