Merge pull request #1345 from Bilb/fix-medium-group-message-identity

pull/1347/head
Audric Ackermann 5 years ago committed by GitHub
commit 141b46588e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -82,7 +82,7 @@ async function decryptForMediumGroup(
); );
return null; return null;
} }
envelope.senderIdentity = sourceAsStr;
const plaintext = await decryptWithSenderKey( const plaintext = await decryptWithSenderKey(
ciphertext, ciphertext,
keyIdx, keyIdx,

@ -296,7 +296,7 @@ export async function handleDataMessage(
} }
const message = await processDecrypted(envelope, dataMessage); const message = await processDecrypted(envelope, dataMessage);
const ourPubKey = window.textsecure.storage.user.getNumber(); const ourPubKey = window.textsecure.storage.user.getNumber();
const senderPubKey = envelope.source; const senderPubKey = envelope.senderIdentity || envelope.source;
const isMe = senderPubKey === ourPubKey; const isMe = senderPubKey === ourPubKey;
const conversation = window.ConversationController.get(senderPubKey); const conversation = window.ConversationController.get(senderPubKey);

Loading…
Cancel
Save