X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..beb3adcc72cd24b29688a931bf6246ab688249ea:/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 9278ee37..720130ef 100644
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,15 +1,13 @@
 package org.asamk.signal.json;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.util.Hex;
 
-import java.util.Base64;
+public record JsonSticker(String packId, int stickerId) {
 
-public record JsonSticker(String packId, String packKey, int stickerId) {
-
-    static JsonSticker from(SignalServiceDataMessage.Sticker sticker) {
-        final var packId = Base64.getEncoder().encodeToString(sticker.getPackId());
-        final var packKey = Base64.getEncoder().encodeToString(sticker.getPackKey());
-        final var stickerId = sticker.getStickerId();
-        return new JsonSticker(packId, packKey, stickerId);
+    static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {
+        final var packId = Hex.toStringCondensed(sticker.packId().serialize());
+        final var stickerId = sticker.stickerId();
+        return new JsonSticker(packId, stickerId);
     }
 }