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

Populate dataMessage on CallbackResultType when sending 1:1 messages

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-04 17:39:37 -08:00 • committed by GitHub
parent 78fd36e880
commit 4be2a33be5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ts/textsecure/SendMessage.ts
View file

@ -889,7 +889,6 @@ export default class MessageSender {
new Promise((resolve, reject) => {
this.sendMessageProto({
callback: (res: CallbackResultType) => {
res.dataMessage = message.encode();
if (res.errors && res.errors.length > 0) {
reject(new SendMessageProtoError(res));
} else {
@ -974,7 +973,6 @@ export default class MessageSender {
reject(new SendMessageProtoError(result));
return;
}
resolve(result);
};
@ -1808,15 +1806,15 @@ export default class MessageSender {
sendLogCallback?: SendLogCallbackType;
timestamp: number;
}>): Promise<CallbackResultType> {
const dataMessage = proto.dataMessage
? Proto.DataMessage.encode(proto.dataMessage).finish()
: undefined;
const myE164 = window.textsecure.storage.user.getNumber();
const myUuid = window.textsecure.storage.user.getUuid()?.toString();
const identifiers = recipients.filter(id => id !== myE164 && id !== myUuid);
if (identifiers.length === 0) {
const dataMessage = proto.dataMessage
? Proto.DataMessage.encode(proto.dataMessage).finish()
: undefined;
return Promise.resolve({
dataMessage,
errors: [],
@ -1828,7 +1826,6 @@ export default class MessageSender {
return new Promise((resolve, reject) => {
const callback = (res: CallbackResultType) => {
res.dataMessage = dataMessage;
if (res.errors && res.errors.length > 0) {
reject(new SendMessageProtoError(res));
} else {