|
|
@ -528,12 +528,18 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Send delivery receipts for "valid data" messages received via UD.
|
|
|
|
// Send delivery receipts for "valid data" messages received via UD.
|
|
|
|
BOOL wasReceivedByUD = envelope.type == SSKProtoEnvelopeTypeUnidentifiedSender;
|
|
|
|
BOOL wasReceivedByUD = [self wasReceivedByUD:envelope];
|
|
|
|
if (wasReceivedByUD) {
|
|
|
|
if (wasReceivedByUD) {
|
|
|
|
[self.outgoingReceiptManager enqueueDeliveryReceiptForEnvelope:envelope];
|
|
|
|
[self.outgoingReceiptManager enqueueDeliveryReceiptForEnvelope:envelope];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- (BOOL)wasReceivedByUD:(SSKProtoEnvelope *)envelope
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
|
|
|
envelope.type == SSKProtoEnvelopeTypeUnidentifiedSender && (!envelope.hasSource || envelope.source.length < 1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)sendGroupInfoRequest:(NSData *)groupId
|
|
|
|
- (void)sendGroupInfoRequest:(NSData *)groupId
|
|
|
|
envelope:(SSKProtoEnvelope *)envelope
|
|
|
|
envelope:(SSKProtoEnvelope *)envelope
|
|
|
|
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
|
|
|
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
|
|
@ -1121,7 +1127,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
NSData *groupId = dataMessage.group ? dataMessage.group.id : nil;
|
|
|
|
NSData *groupId = dataMessage.group ? dataMessage.group.id : nil;
|
|
|
|
OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction];
|
|
|
|
OWSContact *_Nullable contact = [OWSContacts contactForDataMessage:dataMessage transaction:transaction];
|
|
|
|
NSNumber *_Nullable serverTimestamp = (envelope.hasServerTimestamp ? @(envelope.serverTimestamp) : nil);
|
|
|
|
NSNumber *_Nullable serverTimestamp = (envelope.hasServerTimestamp ? @(envelope.serverTimestamp) : nil);
|
|
|
|
BOOL wasReceivedByUD = envelope.type == SSKProtoEnvelopeTypeUnidentifiedSender;
|
|
|
|
BOOL wasReceivedByUD = [self wasReceivedByUD:envelope];
|
|
|
|
|
|
|
|
|
|
|
|
if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) {
|
|
|
|
if (dataMessage.group.type == SSKProtoGroupContextTypeRequestInfo) {
|
|
|
|
[self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction];
|
|
|
|
[self handleGroupInfoRequest:envelope dataMessage:dataMessage transaction:transaction];
|
|
|
|