X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9bba7a85ab6fbe7cc8de6ece4b3850c883907e01..b09677a46c4ecf07f305892b51a927e4d7341793:/src/main/java/org/asamk/signal/json/JsonSticker.java diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java index 228d2883..e56ddf3f 100644 --- a/src/main/java/org/asamk/signal/json/JsonSticker.java +++ b/src/main/java/org/asamk/signal/json/JsonSticker.java @@ -1,18 +1,25 @@ package org.asamk.signal.json; +import com.fasterxml.jackson.annotation.JsonProperty; + import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; -import org.whispersystems.util.Base64; + +import java.util.Base64; public class JsonSticker { - String packId; - String packKey; - int stickerId; + @JsonProperty + final String packId; + + @JsonProperty + final String packKey; + + @JsonProperty + final int stickerId; public JsonSticker(SignalServiceDataMessage.Sticker sticker) { - this.packId = Base64.encodeBytes(sticker.getPackId()); - this.packKey = Base64.encodeBytes(sticker.getPackKey()); + this.packId = Base64.getEncoder().encodeToString(sticker.getPackId()); + this.packKey = Base64.getEncoder().encodeToString(sticker.getPackKey()); this.stickerId = sticker.getStickerId(); - // TODO also download sticker image ?? } }