diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts index 20bb2e1ee..a9e3ce161 100644 --- a/ts/textsecure/SocketManager.ts +++ b/ts/textsecure/SocketManager.ts @@ -263,7 +263,7 @@ export class SocketManager extends EventListener { } if (code === 4409) { - this.emit('deviceConflict'); + log.error('SocketManager: got 4409, connected on another device'); return; } @@ -770,7 +770,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( @@ -783,7 +782,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 e8d3ac3e1..ebe5df155 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 }); }