Retrieve sticker pack before sending if necessary

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 7adb67ea5428ad0956134a53e42f6d354136b539..68af8ab4b7e70f877bd0a601e75a0050cfa2a304 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -772,7 +772,8 @@
     {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String"] }, 
     {"name":"contentType","parameterTypes":[] }, 
     {"name":"emoji","parameterTypes":[] }, 
     {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String"] }, 
     {"name":"contentType","parameterTypes":[] }, 
     {"name":"emoji","parameterTypes":[] }, 

-    {"name":"file","parameterTypes":[] }
+    {"name":"file","parameterTypes":[] }, 
+    {"name":"id","parameterTypes":[] }

   ]}
 ,
 {
   ]}
 ,
 {

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index b584da44777a785e9ba3962bfb8a3fd5e15acb29..fbcf1b48bf4108b06c100e6a02787c8940989f92 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -519,10 +519,10 @@ public class ManagerImpl implements Manager {
             final var stickerId = sticker.stickerId();
 
             final var stickerPack = context.getAccount().getStickerStore().getStickerPack(packId);
             final var stickerId = sticker.stickerId();
 
             final var stickerPack = context.getAccount().getStickerStore().getStickerPack(packId);

-            if (stickerPack == null || !context.getStickerPackStore().existsStickerPack(packId)) {
+            if (stickerPack == null) {

                 throw new InvalidStickerException("Sticker pack not found");
             }
                 throw new InvalidStickerException("Sticker pack not found");
             }

-            final var manifest = context.getStickerPackStore().retrieveManifest(packId);
+            final var manifest = context.getStickerHelper().getOrRetrieveStickerPack(packId, stickerPack.getPackKey());

             if (manifest.stickers().size() <= stickerId) {
                 throw new InvalidStickerException("Sticker id not part of this pack");
             }
             if (manifest.stickers().size() <= stickerId) {
                 throw new InvalidStickerException("Sticker id not part of this pack");
             }

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index f1b7c3c1b4d8f56d4805f276e8dbb958746a531b..3ef0bf16ec9b0ea06d5fd480339dcd429f40f6e2 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -33,6 +33,7 @@ public class Context {
     private ReceiveHelper receiveHelper;
     private RecipientHelper recipientHelper;
     private SendHelper sendHelper;
     private ReceiveHelper receiveHelper;
     private RecipientHelper recipientHelper;
     private SendHelper sendHelper;

+    private StickerHelper stickerHelper;

     private StorageHelper storageHelper;
     private SyncHelper syncHelper;
     private UnidentifiedAccessHelper unidentifiedAccessHelper;
     private StorageHelper storageHelper;
     private SyncHelper syncHelper;
     private UnidentifiedAccessHelper unidentifiedAccessHelper;


@@ -129,6 +130,10 @@ public class Context {
         return getOrCreate(() -> sendHelper, () -> sendHelper = new SendHelper(this));
     }
 
         return getOrCreate(() -> sendHelper, () -> sendHelper = new SendHelper(this));
     }
 

+    public StickerHelper getStickerHelper() {
+        return getOrCreate(() -> stickerHelper, () -> stickerHelper = new StickerHelper(this));
+    }
+

     public StorageHelper getStorageHelper() {
         return getOrCreate(() -> storageHelper, () -> storageHelper = new StorageHelper(this));
     }
     public StorageHelper getStorageHelper() {
         return getOrCreate(() -> storageHelper, () -> storageHelper = new StorageHelper(this));
     }

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
new file mode 100644 (file)
index 0000000..2fdb259
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -0,0 +1,84 @@
+package org.asamk.signal.manager.helper;
+
+import org.asamk.signal.manager.JsonStickerPack;
+import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.signalservice.internal.util.Hex;
+
+import java.io.IOException;
+import java.util.HashSet;
+
+public class StickerHelper {
+
+    private final static Logger logger = LoggerFactory.getLogger(StickerHelper.class);
+
+    private final Context context;
+    private final SignalAccount account;
+    private final SignalDependencies dependencies;
+
+    public StickerHelper(final Context context) {
+        this.account = context.getAccount();
+        this.dependencies = context.getDependencies();
+        this.context = context;
+    }
+
+    public JsonStickerPack getOrRetrieveStickerPack(
+            StickerPackId packId, byte[] packKey
+    ) throws InvalidStickerException {
+        if (!context.getStickerPackStore().existsStickerPack(packId)) {
+            try {
+                retrieveStickerPack(packId, packKey);
+            } catch (InvalidMessageException | IOException e) {
+                throw new InvalidStickerException("Failed to retrieve sticker pack");
+            }
+        }
+        final JsonStickerPack manifest;
+        try {
+            manifest = context.getStickerPackStore().retrieveManifest(packId);
+        } catch (IOException e) {
+            throw new InvalidStickerException("Failed to load sticker pack manifest");
+        }
+        return manifest;
+    }
+
+    public void retrieveStickerPack(StickerPackId packId, byte[] packKey) throws InvalidMessageException, IOException {
+        logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize()));
+        final var manifest = dependencies.getMessageReceiver().retrieveStickerManifest(packId.serialize(), packKey);
+
+        final var stickerIds = new HashSet<Integer>();
+        if (manifest.getCover().isPresent()) {
+            stickerIds.add(manifest.getCover().get().getId());
+        }
+        for (var sticker : manifest.getStickers()) {
+            stickerIds.add(sticker.getId());
+        }
+
+        for (var id : stickerIds) {
+            final var inputStream = dependencies.getMessageReceiver().retrieveSticker(packId.serialize(), packKey, id);
+            context.getStickerPackStore().storeSticker(packId, id, o -> IOUtils.copyStream(inputStream, o));
+        }
+
+        final var jsonManifest = new JsonStickerPack(manifest.getTitle().orNull(),
+                manifest.getAuthor().orNull(),
+                manifest.getCover()
+                        .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.getId(),
+                                c.getEmoji(),
+                                String.valueOf(c.getId()),
+                                c.getContentType()))
+                        .toList());
+        context.getStickerPackStore().storeManifest(packId, jsonManifest);
+    }
+}

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 f9768004d90682a9458a381793f83ec0e6c6200d..2d7633b80c3658933fb5000e1ba0ae195e8b50be 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,16 +1,13 @@
 package org.asamk.signal.manager.jobs;
 
 package org.asamk.signal.manager.jobs;
 

-import org.asamk.signal.manager.JsonStickerPack;

 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.helper.Context;
 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;
 import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;

-import java.util.HashSet;

 
 public class RetrieveStickerPackJob implements Job {
 
 
 public class RetrieveStickerPackJob implements Job {
 


@@ -30,43 +27,8 @@ public class RetrieveStickerPackJob implements Job {
             logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
             return;
         }
             logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
             return;
         }

-        logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize()));

         try {
         try {

-            final var manifest = context.getDependencies()
-                    .getMessageReceiver()
-                    .retrieveStickerManifest(packId.serialize(), packKey);
-
-            final var stickerIds = new HashSet<Integer>();
-            if (manifest.getCover().isPresent()) {
-                stickerIds.add(manifest.getCover().get().getId());
-            }
-            for (var sticker : manifest.getStickers()) {
-                stickerIds.add(sticker.getId());
-            }
-
-            for (var id : stickerIds) {
-                final var inputStream = context.getDependencies()
-                        .getMessageReceiver()
-                        .retrieveSticker(packId.serialize(), packKey, id);
-                context.getStickerPackStore().storeSticker(packId, id, o -> IOUtils.copyStream(inputStream, o));
-            }
-
-            final var jsonManifest = new JsonStickerPack(manifest.getTitle().orNull(),
-                    manifest.getAuthor().orNull(),
-                    manifest.getCover()
-                            .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.getId(),
-                                    c.getEmoji(),
-                                    String.valueOf(c.getId()),
-                                    c.getContentType()))
-                            .toList());
-            context.getStickerPackStore().storeManifest(packId, jsonManifest);
+            context.getStickerHelper().retrieveStickerPack(packId, packKey);

         } catch (IOException e) {
             logger.warn("Failed to retrieve sticker pack {}: {}",
                     Hex.toStringCondensed(packId.serialize()),
         } catch (IOException e) {
             logger.warn("Failed to retrieve sticker pack {}: {}",
                     Hex.toStringCondensed(packId.serialize()),