X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ae41d0c5026fe868c6198e1005344fc78b6e0a2c..8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6:/src/main/java/org/asamk/signal/json/JsonCallMessage.java

diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index c1b1d443..885c38a4 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.whispersystems.signalservice.api.messages.calls.AnswerMessage;
 import org.whispersystems.signalservice.api.messages.calls.BusyMessage;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
@@ -11,27 +14,31 @@ import java.util.List;
 
 class JsonCallMessage {
 
-    OfferMessage offerMessage;
-    AnswerMessage answerMessage;
-    BusyMessage busyMessage;
-    HangupMessage hangupMessage;
-    List<IceUpdateMessage> iceUpdateMessages;
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final OfferMessage offerMessage;
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final AnswerMessage answerMessage;
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final BusyMessage busyMessage;
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final HangupMessage hangupMessage;
+
+    @JsonProperty
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    final List<IceUpdateMessage> iceUpdateMessages;
 
     JsonCallMessage(SignalServiceCallMessage callMessage) {
-        if (callMessage.getOfferMessage().isPresent()) {
-            this.offerMessage = callMessage.getOfferMessage().get();
-        }
-        if (callMessage.getAnswerMessage().isPresent()) {
-            this.answerMessage = callMessage.getAnswerMessage().get();
-        }
-        if (callMessage.getBusyMessage().isPresent()) {
-            this.busyMessage = callMessage.getBusyMessage().get();
-        }
-        if (callMessage.getHangupMessage().isPresent()) {
-            this.hangupMessage = callMessage.getHangupMessage().get();
-        }
-        if (callMessage.getIceUpdateMessages().isPresent()) {
-            this.iceUpdateMessages = callMessage.getIceUpdateMessages().get();
-        }
+        this.offerMessage = callMessage.getOfferMessage().orNull();
+        this.answerMessage = callMessage.getAnswerMessage().orNull();
+        this.busyMessage = callMessage.getBusyMessage().orNull();
+        this.hangupMessage = callMessage.getHangupMessage().orNull();
+        this.iceUpdateMessages = callMessage.getIceUpdateMessages().orNull();
     }
 }