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

fix sending contact sync messages

Browse Source
pull/104/head
Ryan ZHAO 5 years ago
parent 12c7fd4313
commit ecf02bbb3e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
SignalMessaging/contacts/OWSSyncManager.m
Unescape Escape View File

@ -279,7 +279,7 @@ NSString *const kSyncManagerLastContactSyncKey = @"kTSStorageManagerOWSSyncManag
NSMutableArray<SignalAccount *> *friends = @[].mutableCopy; NSMutableArray<SignalAccount *> *friends = @[].mutableCopy;
[TSContactThread enumerateCollectionObjectsUsingBlock:^(TSContactThread *thread, BOOL *stop) { [TSContactThread enumerateCollectionObjectsUsingBlock:^(TSContactThread *thread, BOOL *stop) {
NSString *hexEncodedPublicKey = thread.contactIdentifier; NSString *hexEncodedPublicKey = thread.contactIdentifier;
if (hexEncodedPublicKey != nil && thread.isContactFriend) { if (hexEncodedPublicKey != nil && thread.isContactFriend && thread.shouldThreadBeVisible && !thread.isForceHidden) {
[friends addObject:[[SignalAccount alloc] initWithRecipientId:hexEncodedPublicKey]]; [friends addObject:[[SignalAccount alloc] initWithRecipientId:hexEncodedPublicKey]];
} }
}]; }];

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

@ -1035,6 +1035,7 @@ NS_ASSUME_NONNULL_BEGIN
// acceptable. // acceptable.
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
[[self.syncManager syncAllContacts] retainUntilComplete]; [[self.syncManager syncAllContacts] retainUntilComplete];
[[self.syncManager syncAllGroups] retainUntilComplete];
}); });
} else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeGroups) { } else if (syncMessage.request.type == SSKProtoSyncMessageRequestTypeGroups) {
OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init]; OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];
@ -1090,6 +1091,7 @@ NS_ASSUME_NONNULL_BEGIN
// [messageSender sendMessage:automatedFriendRequestMessage]; // [messageSender sendMessage:automatedFriendRequestMessage];
// }); // });
LKFriendRequestMessage *automatedFriendRequestMessage = [messageSender getMultiDeviceFriendRequestMessageForHexEncodedPublicKey:hexEncodedPublicKey inThread:thread transaction:transaction]; LKFriendRequestMessage *automatedFriendRequestMessage = [messageSender getMultiDeviceFriendRequestMessageForHexEncodedPublicKey:hexEncodedPublicKey inThread:thread transaction:transaction];
[automatedFriendRequestMessage saveWithTransaction:transaction];
[self.messageSenderJobQueue addMessage:automatedFriendRequestMessage transaction:transaction]; [self.messageSenderJobQueue addMessage:automatedFriendRequestMessage transaction:transaction];
break; break;
} }
@ -1113,7 +1115,7 @@ NS_ASSUME_NONNULL_BEGIN
for (TSGroupModel *groupModel in groupModels) { for (TSGroupModel *groupModel in groupModels) {
TSGroupThread *thread = [TSGroupThread getOrCreateThreadWithGroupModel:groupModel transaction:transaction]; TSGroupThread *thread = [TSGroupThread getOrCreateThreadWithGroupModel:groupModel transaction:transaction];
//TODO: Join the group and send update group information //TODO: Join the group and send update group information
[self establishSessionsWithMembersIfNeeded:groupModel.groupMemberIds forThread:thread transaction:transaction]; // [self establishSessionsWithMembersIfNeeded:groupModel.groupMemberIds forThread:thread transaction:transaction];
} }
} }
} else { } else {

Write Preview
Loading…
Cancel
Save