From 701e43c13dc018d022d13ff8a48c210a7bff4720 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 29 Jan 2021 14:18:41 -0500
Subject: [PATCH] Do a normal message fetch in
 FcmReceiveService#onDeleteMessages()

---
 .../org/thoughtcrime/securesms/gcm/FcmReceiveService.java | 8 +++++++-
 1 file changed, 7 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 9f2c93b9d8..b24411c177 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java
@@ -20,7 +20,7 @@ public class FcmReceiveService extends FirebaseMessagingService {
 
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
-    Log.i(TAG, "FCM message... Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()));
+    Log.i(TAG, "onMessageReceived() ID: " + remoteMessage.getMessageId() + ", Delay: " + (System.currentTimeMillis() - remoteMessage.getSentTime()));
 
     String challenge = remoteMessage.getData().get("challenge");
     if (challenge != null) {
@@ -30,6 +30,12 @@ public class FcmReceiveService extends FirebaseMessagingService {
     }
   }
 
+  @Override
+  public void onDeletedMessages() {
+    Log.w(TAG, "onDeleteMessages() -- Messages may have been dropped. Doing a normal message fetch.");
+    handleReceivedNotification(ApplicationDependencies.getApplication());
+  }
+
   @Override
   public void onNewToken(String token) {
     Log.i(TAG, "onNewToken()");