From f656a1d4d8fbb2820300c379e2251e4d29a279e0 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 30 Jan 2020 09:15:42 +1100
Subject: [PATCH] Clean

---
 Signal/src/AppDelegate.m                          | 2 +-
 SignalServiceKit/src/Messages/OWSMessageManager.m | 2 +-
 SignalServiceKit/src/Messages/TSGroupModel.m      | 9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 9c746dea5..f0331766c 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -591,7 +591,7 @@ static NSTimeInterval launchStartedAt;
         return;
     }
 
-    OWSLogInfo(@"registered vanilla push token %@", deviceToken);
+    OWSLogInfo(@"Registered for push notifications with token: %@.", deviceToken);
     [LKPushNotificationManager.shared registerWithToken:deviceToken];
     [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken];
 }
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 0226d65e3..4de6a8a7e 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -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
 {
     NSString *userHexEncodedPublicKey = OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;
diff --git a/SignalServiceKit/src/Messages/TSGroupModel.m b/SignalServiceKit/src/Messages/TSGroupModel.m
index 0fcf59c9e..3b8414d7d 100644
--- a/SignalServiceKit/src/Messages/TSGroupModel.m
+++ b/SignalServiceKit/src/Messages/TSGroupModel.m
@@ -140,13 +140,8 @@ const int32_t kGroupIdLength = 16;
                                                            [oldMembersNames componentsJoinedByString:@", "]]];
     }
     
-    if ([membersWhoJoined count] > 0) {
-        NSArray *newMembersNames = [[membersWhoJoined allObjects] map:^NSString*(NSString* item) {
-            return [LKDisplayNameUtilities getPrivateChatDisplayNameFor:item];
-        }];
-        updatedGroupInfoString = [updatedGroupInfoString
-                                  stringByAppendingString:[NSString stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_JOINED", @""),
-                                                           [newMembersNames componentsJoinedByString:@", "]]];
+    if (membersWhoJoined.count > 0) {
+        updatedGroupInfoString = [NSString stringWithFormat:@"%d members joined", membersWhoJoined.count];
     }
     
     if (_removedMembers.count > 0) {