pull/80/head
Niels Andriesse 5 years ago
parent 78ab0d483b
commit f656a1d4d8

@ -591,7 +591,7 @@ static NSTimeInterval launchStartedAt;
return; return;
} }
OWSLogInfo(@"registered vanilla push token %@", deviceToken); OWSLogInfo(@"Registered for push notifications with token: %@.", deviceToken);
[LKPushNotificationManager.shared registerWithToken:deviceToken]; [LKPushNotificationManager.shared registerWithToken:deviceToken];
[self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken]; [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken];
} }

@ -1659,7 +1659,7 @@ NS_ASSUME_NONNULL_BEGIN
} }
} }
//Loki: Establish a session if there is no session between the memebers of a group // Loki: Establish a session if there is no session between the memebers of a group
- (void)establishSessionsWithMembersIfNeeded: (NSArray *)members forThread: (TSGroupThread *)thread transaction:(YapDatabaseReadWriteTransaction *)transaction - (void)establishSessionsWithMembersIfNeeded: (NSArray *)members forThread: (TSGroupThread *)thread transaction:(YapDatabaseReadWriteTransaction *)transaction
{ {
NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey; NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;

@ -140,13 +140,8 @@ const int32_t kGroupIdLength = 16;
[oldMembersNames componentsJoinedByString:@", "]]]; [oldMembersNames componentsJoinedByString:@", "]]];
} }
if ([membersWhoJoined count] > 0) { if (membersWhoJoined.count > 0) {
NSArray *newMembersNames = [[membersWhoJoined allObjects] map:^NSString*(NSString* item) { updatedGroupInfoString = [NSString stringWithFormat:@"%d members joined", membersWhoJoined.count];
return [LKDisplayNameUtilities getPrivateChatDisplayNameFor:item];
}];
updatedGroupInfoString = [updatedGroupInfoString
stringByAppendingString:[NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_JOINED", @""),
[newMembersNames componentsJoinedByString:@", "]]];
} }
if (_removedMembers.count > 0) { if (_removedMembers.count > 0) {

Loading…
Cancel
Save