Handle send failures as non fatal and return detailed results in json output

[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..96435ad69031c25d01406e312efbdae03d34d23e 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,16 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;

 
 import java.util.Base64;
 
 public record JsonSticker(String packId, String packKey, int stickerId) {
 
 
 import java.util.Base64;
 
 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();
+    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 stickerId = sticker.stickerId();

         return new JsonSticker(packId, packKey, stickerId);
     }
 }
         return new JsonSticker(packId, packKey, stickerId);
     }
 }