MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a method to check for the presence of persisted messages, skipping the cache

This commit is contained in:
Jon Chambers 2024-07-31 10:19:13 -04:00 committed by Jon Chambers
parent f1c153f39f
commit 822092044b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperiment.java
View File

@ -64,8 +64,8 @@ public class NotifyIdleDevicesWithoutMessagesPushNotificationExperiment implemen
return CompletableFuture.completedFuture(false); return CompletableFuture.completedFuture(false);
} }
return messagesManager.mayHaveMessages(account.getIdentifier(IdentityType.ACI), device) return messagesManager.mayHavePersistedMessages(account.getIdentifier(IdentityType.ACI), device)
.thenApply(mayHaveMessages -> !mayHaveMessages); .thenApply(mayHavePersistedMessages -> !mayHavePersistedMessages);
} }
@VisibleForTesting @VisibleForTesting

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
View File

@ -67,6 +67,10 @@ public class MessagesManager {
} }
} }
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) { public CompletableFuture<Boolean> mayHaveMessages(final UUID destinationUuid, final Device destinationDevice) {
return messagesCache.hasMessagesAsync(destinationUuid, destinationDevice.getId()) return messagesCache.hasMessagesAsync(destinationUuid, destinationDevice.getId())
.thenCombine(messagesDynamoDb.mayHaveMessages(destinationUuid, destinationDevice), .thenCombine(messagesDynamoDb.mayHaveMessages(destinationUuid, destinationDevice),

2
service/src/test/java/org/whispersystems/textsecuregcm/experiment/NotifyIdleDevicesWithoutMessagesPushNotificationExperimentTest.java
View File

@ -53,7 +53,7 @@ class NotifyIdleDevicesWithoutMessagesPushNotificationExperimentTest {
final boolean mayHaveMessages, final boolean mayHaveMessages,
final boolean expectEligible) { final boolean expectEligible) {
when(messagesManager.mayHaveMessages(account.getIdentifier(IdentityType.ACI), device)) when(messagesManager.mayHavePersistedMessages(account.getIdentifier(IdentityType.ACI), device))
.thenReturn(CompletableFuture.completedFuture(mayHaveMessages)); .thenReturn(CompletableFuture.completedFuture(mayHaveMessages));
when(idleDeviceNotificationScheduler.isIdle(device)).thenReturn(isDeviceIdle); when(idleDeviceNotificationScheduler.isIdle(device)).thenReturn(isDeviceIdle);