From d6e03f50b9cd61a4be712665d0a505b49a62492c Mon Sep 17 00:00:00 2001
From: Katherine <katherine@signal.org>
Date: Fri, 13 Sep 2024 12:28:31 -0400
Subject: [PATCH] Fix bug in ignoring svr errors in account deletion flow

---
 .../textsecuregcm/storage/AccountsManager.java              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 13d524320..2c82c09bd 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -989,14 +989,14 @@ public class AccountsManager {
                     device.getId())))
         .toList();
     CompletableFuture<Void> deleteBackupFuture = secureValueRecovery2Client.deleteBackups(account.getUuid())
-        .exceptionally(exception -> {
+        .exceptionally(ExceptionUtils.exceptionallyHandler(SecureValueRecoveryException.class, exception -> {
           final List<String> svrStatusCodesToIgnore = dynamicConfigurationManager.getConfiguration().getSvrStatusCodesToIgnoreForAccountDeletion();
-          if (exception instanceof SecureValueRecoveryException e && svrStatusCodesToIgnore.contains(e.getStatusCode())) {
+          if (svrStatusCodesToIgnore.contains(exception.getStatusCode())) {
             logger.warn("Failed to delete backup for account: " + account.getUuid(), exception);
             return null;
           }
           throw new CompletionException(exception);
-        });
+        }));
 
     return CompletableFuture.allOf(
             secureStorageClient.deleteStoredData(account.getUuid()),