From 8956e1e0cfaab97e6f5d534dd6dd122f2d701499 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 2 Aug 2022 17:20:01 -0400
Subject: [PATCH] Check for null FCM error codes

---
 .../whispersystems/textsecuregcm/push/FcmSender.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java
index 1d6c92ae1..00e81fb51 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/FcmSender.java
@@ -87,7 +87,16 @@ public class FcmSender {
         sendFuture.get();
       } catch (ExecutionException e) {
         if (e.getCause() instanceof final FirebaseMessagingException firebaseMessagingException) {
-          tags = tags.and("errorCode", firebaseMessagingException.getMessagingErrorCode().name().toLowerCase());
+          final String errorCode;
+
+          if (firebaseMessagingException.getMessagingErrorCode() != null) {
+            errorCode = firebaseMessagingException.getMessagingErrorCode().name().toLowerCase();
+          } else {
+            logger.warn("Received an FCM exception with no error code", firebaseMessagingException);
+            errorCode = "unknown";
+          }
+
+          tags = tags.and("errorCode", errorCode);
 
           switch (firebaseMessagingException.getMessagingErrorCode()) {