fix: anything to 03 pubkey should be wrapped to envelope for group

even if no one should care about it, android still does
pull/3281/head
Audric Ackermann 3 months ago
parent d55b88790f
commit 624134ccc9
No known key found for this signature in database

@ -4,7 +4,7 @@ import { MessageEncrypter } from '../crypto/MessageEncrypter';
import { PubKey } from '../types'; import { PubKey } from '../types';
function encryptionBasedOnConversation(destination: PubKey) { function encryptionBasedOnConversation(destination: PubKey) {
if (ConvoHub.use().get(destination.key)?.isClosedGroup()) { if (PubKey.is03Pubkey(destination.key) || ConvoHub.use().get(destination.key)?.isClosedGroup()) {
return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE;
} }
return SignalService.Envelope.Type.SESSION_MESSAGE; return SignalService.Envelope.Type.SESSION_MESSAGE;

@ -41,8 +41,9 @@ export async function toRawMessage(
): Promise<OutgoingRawMessage> { ): Promise<OutgoingRawMessage> {
const ttl = message.ttl(); const ttl = message.ttl();
const plainTextBuffer = message.plainTextBuffer(); const plainTextBuffer = message.plainTextBuffer();
const is03group = PubKey.is03Pubkey(destinationPubKey.key);
const encryption = getEncryptionTypeFromMessageType(message, isGroup); const encryption = getEncryptionTypeFromMessageType(message, isGroup || is03group);
const rawMessage: OutgoingRawMessage = { const rawMessage: OutgoingRawMessage = {
identifier: message.identifier, identifier: message.identifier,

Loading…
Cancel
Save