From b080a5db4dd18630d2005bc09c3864eba912c819 Mon Sep 17 00:00:00 2001
From: gram-signal <84339875+gram-signal@users.noreply.github.com>
Date: Tue, 7 Sep 2021 11:04:17 -0600
Subject: [PATCH] Get-and-set accounts, since other updates may have made them
 stale.

Co-authored-by: Chris Eager <79161849+eager-signal@users.noreply.github.com>
---
 .../textsecuregcm/storage/ContactDiscoveryWriter.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
index 2453ef16c..18f230c14 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ContactDiscoveryWriter.java
@@ -27,7 +27,7 @@ public class ContactDiscoveryWriter extends AccountDatabaseCrawlerListener {
       throws AccountDatabaseCrawlerRestartException {
     for (Account account : chunkAccounts) {
       if (account.isCanonicallyDiscoverable() != account.shouldBeVisibleInDirectory()) {
-        accounts.update(account);
+        accounts.get(account.getUuid()).ifPresent(accounts::update);
       }
     }
   }