From 7c442865c547672e0c8701c52ec77fe52150904d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 16 Apr 2020 13:34:21 -0400
Subject: [PATCH] Interpret non-present message bodies as 'null'.

---
 .../signalservice/api/messages/SignalServiceContent.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
index 2104861f7d..6526e5ade6 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
@@ -316,7 +316,7 @@ public final class SignalServiceContent {
     return new SignalServiceDataMessage(metadata.getTimestamp(),
                                         groupInfoV1, groupInfoV2,
                                         attachments,
-                                        content.getBody(),
+                                        content.hasBody() ? content.getBody() : null,
                                         endSession,
                                         content.getExpireTimer(),
                                         expirationUpdate,