don't make empty transactions

signalapp · Nov 2, 2023 · d47ff9b · d47ff9b
1 parent b081814
commit d47ff9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.../src/main/java/org/whispersystems/textsecuregcm/storage/RepeatedUseSignedPreKeyStore.java b/.../src/main/java/org/whispersystems/textsecuregcm/storage/RepeatedUseSignedPreKeyStore.java
@@ -88,6 +88,10 @@ public CompletableFuture<Void> store(final UUID identifier, final byte deviceId,
    * @return a future that completes once all keys have been stored
    */
   public CompletableFuture<Void> store(final UUID identifier, final Map<Byte, K> signedPreKeysByDeviceId) {
+    if (signedPreKeysByDeviceId.isEmpty()) {
+      return CompletableFuture.completedFuture(null);
+    }
+
     final Timer.Sample sample = Timer.start();
 
     return dynamoDbAsyncClient.transactWriteItems(TransactWriteItemsRequest.builder()

diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/KeysManagerTest.java
@@ -265,6 +265,9 @@ void testStorePqLastResort() {
         "storing new last-resort keys should leave untouched ones alone");
     assertEquals(4L, keysManager.getLastResort(ACCOUNT_UUID, deviceId3).join().get().keyId(),
         "storing new last-resort keys should overwrite old ones");
+
+    keysManager.storePqLastResort(ACCOUNT_UUID, Map.of()).join();
+    assertEquals(3, keysManager.getPqEnabledDevices(ACCOUNT_UUID).join().size(), "storing zero last-resort keys should be a no-op");
   }
 
   @Test