diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts index 67951dd9e4..1dd3c669a3 100644 --- a/ts/textsecure/SocketManager.ts +++ b/ts/textsecure/SocketManager.ts @@ -249,7 +249,7 @@ export class SocketManager extends EventListener { } if (code === 4409) { - this.emit('deviceConflict'); + log.error('SocketManager: got 4409, connected on another device'); return; } @@ -705,7 +705,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: string | symbol, @@ -717,7 +716,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; // eslint-disable-next-line @typescript-eslint/no-explicit-any public override emit(type: string | symbol, ...args: Array): boolean { diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts index 73a069c4f5..b068bbace1 100644 --- a/ts/textsecure/WebAPI.ts +++ b/ts/textsecure/WebAPI.ts @@ -1325,10 +1325,6 @@ export function initialize({ window.Whisper.events.trigger('unlinkAndDisconnect'); }); - socketManager.on('deviceConflict', () => { - window.Whisper.events.trigger('unlinkAndDisconnect'); - }); - if (useWebSocket) { void socketManager.authenticate({ username, password }); }