From 53177bf40e1c0b8f004938ceec19bcd7bcf4d79c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 1 Feb 2021 20:56:25 -0500
Subject: [PATCH] Clean up unnecessary GCM stuff, improve FCM logging.

---
 app/src/main/AndroidManifest.xml                    |  1 -
 .../securesms/gcm/FcmReceiveService.java            | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f55961a79..db55855b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,7 +64,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <!-- So we can add a TextSecure 'Account' -->
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
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 b24411c17..956897318 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
@@ -18,9 +18,10 @@ public class FcmReceiveService extends FirebaseMessagingService {
 
   private static final String TAG = FcmReceiveService.class.getSimpleName();
 
+
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
-    Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()));
+    Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()) + ", Original Priority: " + remoteMessage.getOriginalPriority());
 
     String challenge = remoteMessage.getData().get("challenge");
     if (challenge != null) {
@@ -48,6 +49,16 @@ public class FcmReceiveService extends FirebaseMessagingService {
     ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
   }
 
+  @Override
+  public void onMessageSent(@NonNull String s) {
+    Log.i(TAG, "onMessageSent()" + s);
+  }
+
+  @Override
+  public void onSendError(@NonNull String s, @NonNull Exception e) {
+    Log.w(TAG, "onSendError()", e);
+  }
+
   private static void handleReceivedNotification(Context context) {
     try {
       context.startService(new Intent(context, FcmFetchService.class));