Update libsignal-service-java

[signal-cli] / src / main / java / org / asamk / signal / json / JsonReaction.java

diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java
index 5e978fe09adbe0bd2dd2e15d1fe6468816c2af1f..e7d40fbeb9308d3bcfd55577453338e009bcbf70 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReaction.java
+++ b/src/main/java/org/asamk/signal/json/JsonReaction.java
@@ -1,18 +1,29 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage.Reaction;
 
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
 public class JsonReaction {
 
-    String emoji;
-    String targetAuthor;
-    long targetSentTimestamp;
-    boolean isRemove;
+    @JsonProperty
+    final String emoji;
+
+    @JsonProperty
+    final String targetAuthor;
+
+    @JsonProperty
+    final long targetSentTimestamp;
+
+    @JsonProperty
+    final boolean isRemove;
 
     JsonReaction(Reaction reaction, Manager m) {
         this.emoji = reaction.getEmoji();
-        this.targetAuthor = m.resolveSignalServiceAddress(reaction.getTargetAuthor()).getLegacyIdentifier();
+        this.targetAuthor = getLegacyIdentifier(m.resolveSignalServiceAddress(reaction.getTargetAuthor()));
         this.targetSentTimestamp = reaction.getTargetSentTimestamp();
         this.isRemove = reaction.isRemove();
     }