From e7c5af7ea5f263b2519fa0ba1a365d1b003203cf Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 10 Jul 2026 06:01:29 +0000
Subject: [PATCH] Handle device-transfer authentication failures per connection
 instead of terminating the server.

---
 .../java/org/signal/devicetransfer/NetworkServerThread.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java
index 55cfabcd01..8c2d074c27 100644
--- a/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java
+++ b/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java
@@ -104,14 +104,14 @@ final class NetworkServerThread extends Thread {
 
           outputStream.write(0x53);
           outputStream.flush();
-        } catch (IOException e) {
+        } catch (IOException | DeviceTransferAuthentication.DeviceTransferAuthenticationException e) {
           if (!isRunning) {
             Log.i(TAG, "Server shutting down...");
           } else if (transferStarted) {
             Log.w(TAG, "Lost connection after the transfer started, aborting instead of accepting another client.", e);
             isRunning = false;
           } else {
-            Log.i(TAG, "Error connecting with client or server socket closed.", e);
+            Log.i(TAG, "Error connecting with or authenticating client, continuing to accept peers.", e);
           }
         } finally {
           StreamUtil.close(clientSocket);