Add a method to check for the presence of persisted messages, skippin…

…g the cache
signalapp · Jul 31, 2024 · 8220920 · 8220920
1 parent f1c153f
commit 8220920
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.../textsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperiment.java b/.../textsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperiment.java
@@ -64,8 +64,8 @@ public CompletableFuture<Boolean> isDeviceEligible(final Account account, final
       return CompletableFuture.completedFuture(false);
     }
 
-    return messagesManager.mayHaveMessages(account.getIdentifier(IdentityType.ACI), device)
-        .thenApply(mayHaveMessages -> !mayHaveMessages);
+    return messagesManager.mayHavePersistedMessages(account.getIdentifier(IdentityType.ACI), device)
+        .thenApply(mayHavePersistedMessages -> !mayHavePersistedMessages);
   }
 
   @VisibleForTesting

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
@@ -67,6 +67,10 @@ public void insert(UUID destinationUuid, byte destinationDevice, Envelope messag
     }
   }
 
+  public CompletableFuture<Boolean> mayHavePersistedMessages(final UUID destinationUuid, final Device destinationDevice) {
+    return messagesDynamoDb.mayHaveMessages(destinationUuid, destinationDevice);
+  }
+
   public CompletableFuture<Boolean> mayHaveMessages(final UUID destinationUuid, final Device destinationDevice) {
     return messagesCache.hasMessagesAsync(destinationUuid, destinationDevice.getId())
         .thenCombine(messagesDynamoDb.mayHaveMessages(destinationUuid, destinationDevice),

diff --git a/...tsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperimentTest.java b/...tsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperimentTest.java
@@ -53,7 +53,7 @@ void isDeviceEligible(final Account account,
       final boolean mayHaveMessages,
       final boolean expectEligible) {
 
-    when(messagesManager.mayHaveMessages(account.getIdentifier(IdentityType.ACI), device))
+    when(messagesManager.mayHavePersistedMessages(account.getIdentifier(IdentityType.ACI), device))
         .thenReturn(CompletableFuture.completedFuture(mayHaveMessages));
 
     when(idleDeviceNotificationScheduler.isIdle(device)).thenReturn(isDeviceIdle);