Update gradle

[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 e56ddf3fef5d4d552d6f1f1006660c6565d16e12..720130efea6eb2896d50211806ad8466e02d11d1 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,25 +1,13 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.util.Hex;

 
 

-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+public record JsonSticker(String packId, int stickerId) {

 
 

-import java.util.Base64;
-
-public class JsonSticker {
-
-    @JsonProperty
-    final String packId;
-
-    @JsonProperty
-    final String packKey;
-
-    @JsonProperty
-    final int stickerId;
-
-    public JsonSticker(SignalServiceDataMessage.Sticker sticker) {
-        this.packId = Base64.getEncoder().encodeToString(sticker.getPackId());
-        this.packKey = Base64.getEncoder().encodeToString(sticker.getPackKey());
-        this.stickerId = sticker.getStickerId();
+    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);

     }
 }
     }
 }