From 71c0fc8d4a14d2749e1a1d37d719744be8c7a177 Mon Sep 17 00:00:00 2001
From: erik-signal <113138376+erik-signal@users.noreply.github.com>
Date: Wed, 22 Feb 2023 15:43:44 -0500
Subject: [PATCH] Improve metrics around spam report tokens.

---
 .../textsecuregcm/controllers/MessageController.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index 730a98364..9c1f77029 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -637,9 +637,11 @@ public class MessageController {
 
     UUID spamReporterUuid = auth.getAccount().getUuid();
 
-    // spam report token is optional, but if provided ensure it is valid base64.
+    // spam report token is optional, but if provided ensure it is valid base64 and non-empty.
     final Optional<byte[]> maybeSpamReportToken =
-        spamReport != null ? Optional.ofNullable(spamReport.token()) : Optional.empty();
+        Optional.ofNullable(spamReport)
+            .flatMap(r -> Optional.ofNullable(r.token()))
+            .filter(t -> t.length > 0);
 
     reportMessageManager.report(sourceNumber, sourceAci, sourcePni, messageGuid, spamReporterUuid, maybeSpamReportToken, userAgent);