Change stickerId to hex everywhere

[signal-cli] / 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 9278ee3779735b7101549dd8e303d334dc820933..720130efea6eb2896d50211806ad8466e02d11d1 100644 (file)
--- 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);
     }
 }