From ae3ff21689ce19b324e14e931007d5a1dd7b1431 Mon Sep 17 00:00:00 2001
From: Chris Eager <79161849+eager-signal@users.noreply.github.com>
Date: Thu, 23 Feb 2023 15:27:14 -0600
Subject: [PATCH] Update spam reporting token JSON field name.

---
 .../signalservice/api/SignalServiceMessageReceiver.java     | 4 ++--
 .../internal/push/SignalServiceEnvelopeEntity.java          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
index 19be68a99d..02779e6cdd 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java
@@ -217,7 +217,7 @@ public class SignalServiceMessageReceiver {
                                              entity.getDestinationUuid(),
                                              entity.isUrgent(),
                                              entity.isStory(),
-                                             entity.getReportingToken());
+                                             entity.getReportSpamToken());
       } else {
         envelope = new SignalServiceEnvelope(entity.getType(),
                                              entity.getTimestamp(),
@@ -228,7 +228,7 @@ public class SignalServiceMessageReceiver {
                                              entity.getDestinationUuid(),
                                              entity.isUrgent(),
                                              entity.isStory(),
-                                             entity.getReportingToken());
+                                             entity.getReportSpamToken());
       }
 
       callback.onMessage(envelope);
diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java
index 27d9041652..07a91cddd0 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java
@@ -44,7 +44,7 @@ public class SignalServiceEnvelopeEntity {
   private Boolean story;
 
   @JsonProperty
-  private byte[] reportingToken;
+  private byte[] reportSpamToken;
 
   public SignalServiceEnvelopeEntity() {}
 
@@ -104,7 +104,7 @@ public class SignalServiceEnvelopeEntity {
     return story != null && story;
   }
 
-  public byte[] getReportingToken() {
-    return reportingToken;
+  public byte[] getReportSpamToken() {
+    return reportSpamToken;
   }
 }