keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Map any incoming group messages from slave devices to master devices.

Browse Source 
Closed groups should only have master devices in them.
pull/83/head
Mikunj 6 years ago
parent ecc40368cb
commit efc2988576
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -1403,6 +1403,8 @@ NS_ASSUME_NONNULL_BEGIN
} }
} }
NSString *hexEncodedPublicKey = ([LKDatabaseUtilities getMasterHexEncodedPublicKeyFor:envelope.source in:transaction] ?: envelope.source);
// Group messages create the group if it doesn't already exist. // Group messages create the group if it doesn't already exist.
// //
// We distinguish between the old group state (if any) and the new group state. // We distinguish between the old group state (if any) and the new group state.
@ -1411,17 +1413,15 @@ NS_ASSUME_NONNULL_BEGIN
// Loki: Try to figure out removed members // Loki: Try to figure out removed members
removedMemberIds = [NSMutableSet setWithArray:oldGroupThread.groupModel.groupMemberIds]; removedMemberIds = [NSMutableSet setWithArray:oldGroupThread.groupModel.groupMemberIds];
[removedMemberIds minusSet:newMemberIds]; [removedMemberIds minusSet:newMemberIds];
[removedMemberIds removeObject:envelope.source]; [removedMemberIds removeObject:hexEncodedPublicKey];
} }
NSString *hexEncodedPublicKey = ([LKDatabaseUtilities getMasterHexEncodedPublicKeyFor:envelope.source in:transaction] ?: envelope.source);
// Only set the display name here, the logic for updating profile pictures is handled when we're setting profile key // Only set the display name here, the logic for updating profile pictures is handled when we're setting profile key
[self handleProfileNameUpdateIfNeeded:dataMessage recipientId:hexEncodedPublicKey transaction:transaction]; [self handleProfileNameUpdateIfNeeded:dataMessage recipientId:hexEncodedPublicKey transaction:transaction];
switch (dataMessage.group.type) { switch (dataMessage.group.type) {
case SSKProtoGroupContextTypeUpdate: { case SSKProtoGroupContextTypeUpdate: {
if (oldGroupThread && ![oldGroupThread.groupModel.groupAdminIds containsObject:envelope.source]) { if (oldGroupThread && ![oldGroupThread.groupModel.groupAdminIds containsObject:hexEncodedPublicKey]) {
[LKLogger print:[NSString stringWithFormat:@"[Loki] Received a group update from a non-admin user for %@; ignoring.", [LKGroupUtilities getEncodedGroupID:groupId]]]; [LKLogger print:[NSString stringWithFormat:@"[Loki] Received a group update from a non-admin user for %@; ignoring.", [LKGroupUtilities getEncodedGroupID:groupId]]];
return nil; return nil;
} }
@ -1464,12 +1464,12 @@ NS_ASSUME_NONNULL_BEGIN
OWSLogWarn(@"ignoring quit group message from unknown group."); OWSLogWarn(@"ignoring quit group message from unknown group.");
return nil; return nil;
} }
[newMemberIds removeObject:envelope.source]; [newMemberIds removeObject:hexEncodedPublicKey];
oldGroupThread.groupModel.groupMemberIds = [newMemberIds.allObjects mutableCopy]; oldGroupThread.groupModel.groupMemberIds = [newMemberIds.allObjects mutableCopy];
[oldGroupThread saveWithTransaction:transaction]; [oldGroupThread saveWithTransaction:transaction];
NSString *nameString = NSString *nameString =
[self.contactsManager displayNameForPhoneIdentifier:envelope.source transaction:transaction]; [self.contactsManager displayNameForPhoneIdentifier:hexEncodedPublicKey transaction:transaction];
NSString *updateGroupInfo = NSString *updateGroupInfo =
[NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_LEFT", @""), nameString]; [NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_LEFT", @""), nameString];
// MJK TODO - should be safe to remove senderTimestamp // MJK TODO - should be safe to remove senderTimestamp
@ -1487,7 +1487,7 @@ NS_ASSUME_NONNULL_BEGIN
[[OWSDisappearingMessagesJob sharedJob] becomeConsistentWithDisappearingDuration:dataMessage.expireTimer [[OWSDisappearingMessagesJob sharedJob] becomeConsistentWithDisappearingDuration:dataMessage.expireTimer
thread:oldGroupThread thread:oldGroupThread
createdByRemoteRecipientId:envelope.source createdByRemoteRecipientId:hexEncodedPublicKey
createdInExistingGroup:NO createdInExistingGroup:NO
transaction:transaction]; transaction:transaction];
@ -1514,7 +1514,7 @@ NS_ASSUME_NONNULL_BEGIN
TSIncomingMessage *incomingMessage = TSIncomingMessage *incomingMessage =
[[TSIncomingMessage alloc] initIncomingMessageWithTimestamp:timestamp [[TSIncomingMessage alloc] initIncomingMessageWithTimestamp:timestamp
inThread:oldGroupThread inThread:oldGroupThread
authorId:envelope.source authorId:hexEncodedPublicKey
sourceDeviceId:envelope.sourceDevice sourceDeviceId:envelope.sourceDevice
messageBody:body messageBody:body
attachmentIds:@[] attachmentIds:@[]
@ -1540,7 +1540,7 @@ NS_ASSUME_NONNULL_BEGIN
// Loki: Don't process friend requests in group chats // Loki: Don't process friend requests in group chats
if (body.length == 0 && attachmentPointers.count < 1 && !contact) { if (body.length == 0 && attachmentPointers.count < 1 && !contact) {
OWSLogWarn(@"ignoring empty incoming message from: %@ for group: %@ with timestamp: %lu", OWSLogWarn(@"ignoring empty incoming message from: %@ for group: %@ with timestamp: %lu",
envelopeAddress(envelope), hexEncodedPublicKey,
groupId, groupId,
(unsigned long)timestamp); (unsigned long)timestamp);
return nil; return nil;

Write Preview
Loading…
Cancel
Save