From 39657cfaf09dda12ef81d66057ca9729b40ca18d Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:59:45 -0500
Subject: [PATCH] Don't unlink on 4409

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/textsecure/SocketManager.ts | 4 +---
 ts/textsecure/WebAPI.ts        | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts
index 2d99cda831..25350e2593 100644
--- a/ts/textsecure/SocketManager.ts
+++ b/ts/textsecure/SocketManager.ts
@@ -253,7 +253,7 @@ export class SocketManager extends EventListener {
       }
 
       if (code === 4409) {
-        this.emit('deviceConflict');
+        log.error('SocketManager: got 4409, connected on another device');
         return;
       }
 
@@ -709,7 +709,6 @@ export class SocketManager extends EventListener {
     callback: (error: HTTPError) => void
   ): this;
   public override on(type: 'statusChange', callback: () => void): this;
-  public override on(type: 'deviceConflict', callback: () => void): this;
   public override on(type: 'connectError', callback: () => void): this;
 
   public override on(
@@ -722,7 +721,6 @@ export class SocketManager extends EventListener {
 
   public override emit(type: 'authError', error: HTTPError): boolean;
   public override emit(type: 'statusChange'): boolean;
-  public override emit(type: 'deviceConflict'): boolean;
   public override emit(type: 'connectError'): boolean;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
index 09729a1ff5..2cfe7a6eb1 100644
--- a/ts/textsecure/WebAPI.ts
+++ b/ts/textsecure/WebAPI.ts
@@ -1329,10 +1329,6 @@ export function initialize({
       window.Whisper.events.trigger('socketConnectError');
     });
 
-    socketManager.on('deviceConflict', () => {
-      window.Whisper.events.trigger('unlinkAndDisconnect');
-    });
-
     if (useWebSocket) {
       void socketManager.authenticate({ username, password });
     }