Change stickerId to hex everywhere

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / jobs / RetrieveStickerPackJob.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index c27bcafcb745f9612be848cf277df548f17a75d5..f9768004d90682a9458a381793f83ec0e6c6200d 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -1,7 +1,8 @@
 package org.asamk.signal.manager.jobs;
 
 import org.asamk.signal.manager.JsonStickerPack;
-import org.asamk.signal.manager.storage.stickers.StickerPackId;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,7 +11,6 @@ import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.stream.Collectors;
 
 public class RetrieveStickerPackJob implements Job {
 
@@ -54,16 +54,18 @@ public class RetrieveStickerPackJob implements Job {
             final var jsonManifest = new JsonStickerPack(manifest.getTitle().orNull(),
                     manifest.getAuthor().orNull(),
                     manifest.getCover()
-                            .transform(c -> new JsonStickerPack.JsonSticker(c.getEmoji(),
+                            .transform(c -> new JsonStickerPack.JsonSticker(c.getId(),
+                                    c.getEmoji(),
                                     String.valueOf(c.getId()),
                                     c.getContentType()))
                             .orNull(),
                     manifest.getStickers()
                             .stream()
-                            .map(c -> new JsonStickerPack.JsonSticker(c.getEmoji(),
+                            .map(c -> new JsonStickerPack.JsonSticker(c.getId(),
+                                    c.getEmoji(),
                                     String.valueOf(c.getId()),
                                     c.getContentType()))
-                            .collect(Collectors.toList()));
+                            .toList());
             context.getStickerPackStore().storeManifest(packId, jsonManifest);
         } catch (IOException e) {
             logger.warn("Failed to retrieve sticker pack {}: {}",