From 01351125f14afe541dc13deff6ef067ff1c22204 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 22 Feb 2023 19:22:06 -0500
Subject: [PATCH] Fix reporting token data bug.

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

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
index 4a8106f22..453aa44fd 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
@@ -331,6 +331,6 @@ public class SignalServiceEnvelope {
                                      proto.getDestinationUuid(),
                                      proto.getUrgent(),
                                      proto.getStory(),
-                                     proto.getReportingToken().toByteArray());
+                                     proto.hasReportingToken() ? proto.getReportingToken().toByteArray() : null);
   }
 }