From 2e3667370242f09cdfdd4e4ae4b895ae50384e0a Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Mon, 8 Jul 2024 11:31:04 -0500
Subject: [PATCH] Add warn log if changeNumber messages fail

---
 .../textsecuregcm/storage/ChangeNumberManager.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java
index 927f537be..f86393e0f 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ChangeNumberManager.java
@@ -115,8 +115,13 @@ public class ChangeNumberManager {
   }
 
   private void sendDeviceMessages(final Account account, final List<IncomingMessage> deviceMessages) {
-    deviceMessages.forEach(message ->
-        sendMessageToSelf(account, account.getDevice(message.destinationDeviceId()), message));
+    try {
+      deviceMessages.forEach(message ->
+          sendMessageToSelf(account, account.getDevice(message.destinationDeviceId()), message));
+    } catch (RuntimeException e) {
+      logger.warn("Changed number but could not send all device messages on {}", account.getUuid(), e);
+      throw e;
+    }
   }
 
   @VisibleForTesting