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

Properly prepare, await and hand response for sync message send

Browse source
This commit is contained in:
Scott Nonnenberg 2020-10-24 08:11:18 -07:00
parent 89d29b49a3
commit 5c0fcad6b1
3 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/textsecure/SendMessage.ts
View file

@ -67,10 +67,15 @@ export type SendOptionsType = {
online?: boolean;
};
export interface CustomError extends Error {
identifier?: string;
number?: string;
}
export type CallbackResultType = {
successfulIdentifiers?: Array<any>;
failoverIdentifiers?: Array<any>;
errors?: Array<any>;
errors?: Array<CustomError>;
unidentifiedDeliveries?: Array<any>;
dataMessage?: ArrayBuffer;
discoveredIdentifierPairs: Array<{
@ -1216,7 +1221,7 @@ export default class MessageSender {
responseArgs: {
threadE164?: string;
threadUuid?: string;
groupId?: string;
groupId?: ArrayBuffer;
type: number;
},
sendOptions?: SendOptionsType
@ -1233,11 +1238,7 @@ export default class MessageSender {
const response = new window.textsecure.protobuf.SyncMessage.MessageRequestResponse();
response.threadE164 = responseArgs.threadE164;
response.threadUuid = responseArgs.threadUuid;
response.groupId = responseArgs.groupId
? window.Signal.Crypto.fromEncodedBinaryToArrayBuffer(
responseArgs.groupId
)
: null;
response.groupId = responseArgs.groupId || null;
response.type = responseArgs.type;
syncMessage.messageRequestResponse = response;