diff --git a/Podfile.lock b/Podfile.lock index 315d5d92e..68dfbe524 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -134,7 +134,7 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: SignalServiceKit: - :commit: 91fcd01632a81f2aa67d2d94b97c68d519e6881a + :commit: d4c55d69404c99927da716c443997415ad7bc6ba :git: https://github.com/WhisperSystems/SignalServiceKit.git SocketRocket: :commit: 41b57bb2fc292a814f758441a05243eb38457027 diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m index c0863d86b..8fa4a03f2 100644 --- a/Signal/src/view controllers/MessagesViewController.m +++ b/Signal/src/view controllers/MessagesViewController.m @@ -2027,14 +2027,18 @@ typedef enum : NSUInteger { __block TSOutgoingMessage *message; [self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction]; - groupThread.groupModel = newGroupModel; - [groupThread saveWithTransaction:transaction]; - message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] - inThread:groupThread - messageBody:@"" - attachmentIds:[NSMutableArray new]]; - message.groupMetaMessage = TSGroupMessageUpdate; + groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction]; + + NSString *updateGroupInfo = [groupThread.groupModel getInfoStringAboutUpdateTo:newGroupModel contactsManager:self.contactsManager]; + + groupThread.groupModel = newGroupModel; + [groupThread saveWithTransaction:transaction]; + message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] + inThread:groupThread + messageBody:@"" + attachmentIds:[NSMutableArray new]]; + message.groupMetaMessage = TSGroupMessageUpdate; + message.customMessage = updateGroupInfo; }]; if (newGroupModel.groupImage != nil) { diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/view controllers/NewGroupViewController.m index 2c3761961..5cabf5055 100644 --- a/Signal/src/view controllers/NewGroupViewController.m +++ b/Signal/src/view controllers/NewGroupViewController.m @@ -138,6 +138,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue" messageBody:@"" attachmentIds:[NSMutableArray new]]; message.groupMetaMessage = TSGroupMessageNew; + message.customMessage = NSLocalizedString(@"GROUP_CREATED", nil); if (model.groupImage != nil) { [[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(model.groupImage) contentType:OWSMimeTypeImagePng diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index e02120f31..f8ed70bb9 100644 Binary files a/Signal/translations/en.lproj/Localizable.strings and b/Signal/translations/en.lproj/Localizable.strings differ