From 96a680dcf0d7f2291738b1863921f63d2e93a4b2 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 21 Jan 2022 15:18:32 -0800
Subject: [PATCH] Remove displaced account from directory when changing numbers

---
 .../whispersystems/textsecuregcm/storage/AccountsManager.java   | 1 +
 .../textsecuregcm/storage/AccountsManagerTest.java              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 46d03e493..a3894272c 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -236,6 +236,7 @@ public class AccountsManager {
 
       if (maybeExistingAccount.isPresent()) {
         delete(maybeExistingAccount.get());
+        directoryQueue.deleteAccount(maybeExistingAccount.get());
         displacedUuid = maybeExistingAccount.map(Account::getUuid);
       } else {
         displacedUuid = Optional.empty();
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
index 7ef596f7a..0596f7fd4 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/AccountsManagerTest.java
@@ -686,7 +686,7 @@ class AccountsManagerTest {
     assertEquals(targetNumber, account.getNumber());
 
     verify(directoryQueue).changePhoneNumber(argThat(a -> a.getUuid().equals(uuid)), eq(originalNumber), eq(targetNumber));
-    verify(directoryQueue, never()).deleteAccount(any());
+    verify(directoryQueue).deleteAccount(existingAccount);
   }
 
   @Test