Encourage PQ prekey upload to new store

ravi-signal · ravi-signal · commit c883cd8148fd · 2025-08-15T15:48:57.000-05:00
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysManager.java
@@ -164,9 +164,9 @@ public CompletableFuture<Integer> getEcCount(final UUID identifier, final byte d
   }
 
   public CompletableFuture<Integer> getPqCount(final UUID identifier, final byte deviceId) {
-    return pagedPqPreKeys.getCount(identifier, deviceId).thenCompose(count -> count == 0
-        ? pqPreKeys.getCount(identifier, deviceId)
-        : CompletableFuture.completedFuture(count));
+    // We only return the paged prekey count to encourage clients to upload more prekeys if they only have prekeys
+    // stored in the previous key store format
+    return pagedPqPreKeys.getCount(identifier, deviceId);
   }
 
   public CompletableFuture<Void> deleteSingleUsePreKeys(final UUID identifier) {

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,9 @@ public CompletableFuture<Integer> getEcCount(final UUID identifier, final byte d`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`public CompletableFuture<Integer> getPqCount(final UUID identifier, final byte deviceId) {`
`167`		`- return pagedPqPreKeys.getCount(identifier, deviceId).thenCompose(count -> count == 0`
`168`		`- ? pqPreKeys.getCount(identifier, deviceId)`
`169`		`- : CompletableFuture.completedFuture(count));`
	`167`	`+ // We only return the paged prekey count to encourage clients to upload more prekeys if they only have prekeys`
	`168`	`+ // stored in the previous key store format`
	`169`	`+ return pagedPqPreKeys.getCount(identifier, deviceId);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`public CompletableFuture<Void> deleteSingleUsePreKeys(final UUID identifier) {`