Create TSOutgoingMessage with info on group change

TSOutgoingMessage is created with details about the group changes so that we see more than just “Group Updated.”

* Customizes message for new group creation

  Replaces GROUP_UPDATED with GROUP_CREATED for a brand new group. Localized for English only.

* Updates to use fixed SignalServiceKit branch

// FREEBIE
pull/1/head
Matthew Douglass 9 years ago committed by Michael Kirk
parent 802d2bfdff
commit 722c3a5e78

@ -134,7 +134,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
SignalServiceKit: SignalServiceKit:
:commit: 91fcd01632a81f2aa67d2d94b97c68d519e6881a :commit: d4c55d69404c99927da716c443997415ad7bc6ba
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:commit: 41b57bb2fc292a814f758441a05243eb38457027 :commit: 41b57bb2fc292a814f758441a05243eb38457027

@ -2028,6 +2028,9 @@ typedef enum : NSUInteger {
[self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction]; groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction];
NSString *updateGroupInfo = [groupThread.groupModel getInfoStringAboutUpdateTo:newGroupModel contactsManager:self.contactsManager];
groupThread.groupModel = newGroupModel; groupThread.groupModel = newGroupModel;
[groupThread saveWithTransaction:transaction]; [groupThread saveWithTransaction:transaction];
message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
@ -2035,6 +2038,7 @@ typedef enum : NSUInteger {
messageBody:@"" messageBody:@""
attachmentIds:[NSMutableArray new]]; attachmentIds:[NSMutableArray new]];
message.groupMetaMessage = TSGroupMessageUpdate; message.groupMetaMessage = TSGroupMessageUpdate;
message.customMessage = updateGroupInfo;
}]; }];
if (newGroupModel.groupImage != nil) { if (newGroupModel.groupImage != nil) {

@ -138,6 +138,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
messageBody:@"" messageBody:@""
attachmentIds:[NSMutableArray new]]; attachmentIds:[NSMutableArray new]];
message.groupMetaMessage = TSGroupMessageNew; message.groupMetaMessage = TSGroupMessageNew;
message.customMessage = NSLocalizedString(@"GROUP_CREATED", nil);
if (model.groupImage != nil) { if (model.groupImage != nil) {
[[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(model.groupImage) [[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(model.groupImage)
contentType:OWSMimeTypeImagePng contentType:OWSMimeTypeImagePng

Loading…
Cancel
Save