mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Be resilient to missing data in MessageReceiver constructor

Browse source
This commit is contained in:
Scott Nonnenberg 2021-01-07 11:33:27 -08:00
parent bc57a31e99
commit 37aa3146bb
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ts/textsecure/MessageReceiver.ts
View file

@ -113,7 +113,7 @@ class MessageReceiverInner extends EventTarget {
count: number;
deviceId: number;
deviceId?: number;
hasConnected?: boolean;
@ -121,7 +121,7 @@ class MessageReceiverInner extends EventTarget {
isEmptied?: boolean;
number_id: string | null;
number_id?: string;
password: string;
@ -143,7 +143,7 @@ class MessageReceiverInner extends EventTarget {
uuid: string;
uuid_id: string | null;
uuid_id?: string;
wsr?: WebSocketResource;
@ -176,12 +176,14 @@ class MessageReceiverInner extends EventTarget {
options.serverTrustRoot
);
this.number_id = oldUsername ? utils.unencodeNumber(oldUsername)[0] : null;
this.uuid_id = username ? utils.unencodeNumber(username)[0] : null;
this.deviceId = parseInt(
utils.unencodeNumber(username || oldUsername)[1],
10
);
this.number_id = oldUsername
? utils.unencodeNumber(oldUsername)[0]
: undefined;
this.uuid_id = username ? utils.unencodeNumber(username)[0] : undefined;
this.deviceId =
username || oldUsername
? parseInt(utils.unencodeNumber(username || oldUsername)[1], 10)
: undefined;
this.incomingQueue = new PQueue({ concurrency: 1, timeout: 1000 * 60 * 2 });
this.pendingQueue = new PQueue({ concurrency: 1, timeout: 1000 * 60 * 2 });