From 0dea5eb779c5139804d3d344e923b80ad2445159 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 16 Feb 2021 14:29:30 -0500
Subject: [PATCH] Log both current and original priority for FCM messages.

---
 .../thoughtcrime/securesms/gcm/FcmReceiveService.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
index 9568973181..96e6af4243 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.registration.PushChallengeRequest;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import java.util.Locale;
+
 public class FcmReceiveService extends FirebaseMessagingService {
 
   private static final String TAG = FcmReceiveService.class.getSimpleName();
@@ -21,7 +23,12 @@ public class FcmReceiveService extends FirebaseMessagingService {
 
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
-    Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()) + ", Original Priority: " + remoteMessage.getOriginalPriority());
+    Log.i(TAG, String.format(Locale.US,
+                             "onMessageReceived() ID: %s, Delay: %d, Priority: %d, Original Priority: %d",
+                             remoteMessage.getMessageId(),
+                             (System.currentTimeMillis() - remoteMessage.getSentTime()),
+                             remoteMessage.getPriority(),
+                             remoteMessage.getOriginalPriority()));
 
     String challenge = remoteMessage.getData().get("challenge");
     if (challenge != null) {