Clean up unnecessary GCM stuff, improve FCM logging.

signalapp · Feb 2, 2021 · 53177bf · 53177bf
1 parent 857b945
commit 53177bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git 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
@@ -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 void onNewToken(String token) {
     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));