Use .isEmpty() for checking lists and strings

[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 96435ad69031c25d01406e312efbdae03d34d23e..720130efea6eb2896d50211806ad8466e02d11d1 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -1,16 +1,13 @@
 package org.asamk.signal.json;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.util.Hex;
 
-import java.util.Base64;
-
-public record JsonSticker(String packId, String packKey, int stickerId) {
+public record JsonSticker(String packId, int stickerId) {
 
     static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {
-        final var encoder = Base64.getEncoder();
-        final var packId = encoder.encodeToString(sticker.packId());
-        final var packKey = encoder.encodeToString(sticker.packKey());
+        final var packId = Hex.toStringCondensed(sticker.packId().serialize());
         final var stickerId = sticker.stickerId();
-        return new JsonSticker(packId, packKey, stickerId);
+        return new JsonSticker(packId, stickerId);
     }
 }