Rework outgoing message state.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 66d1a37859
commit cc766bcc53

@ -2702,10 +2702,8 @@ typedef enum : NSUInteger {
[groupThread saveWithTransaction:transaction]; [groupThread saveWithTransaction:transaction];
message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:groupThread inThread:groupThread
messageBody:@"" groupMetaMessage:TSGroupMessageUpdate];
attachmentIds:[NSMutableArray new]]; [message updateWithCustomMessage:updateGroupInfo transaction:transaction];
message.groupMetaMessage = TSGroupMessageUpdate;
[message updateWithCustomMessage:updateGroupInfo];
}]; }];
if (newGroupModel.groupImage) { if (newGroupModel.groupImage) {

@ -309,11 +309,10 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
TSOutgoingMessage *message = TSOutgoingMessage *message =
[[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:self.thread inThread:self.thread
messageBody:@"" groupMetaMessage:TSGroupMessageNew];
attachmentIds:[NSMutableArray new]];
message.groupMetaMessage = TSGroupMessageNew; // This will save the message.
message.customMessage = NSLocalizedString(@"GROUP_CREATED", nil); [message updateWithCustomMessage:NSLocalizedString(@"GROUP_CREATED", nil)];
if (model.groupImage) { if (model.groupImage) {
[self.messageSender sendAttachmentData:UIImagePNGRepresentation(model.groupImage) [self.messageSender sendAttachmentData:UIImagePNGRepresentation(model.groupImage)
contentType:OWSMimeTypeImagePng contentType:OWSMimeTypeImagePng

@ -398,8 +398,7 @@ static NSString *const OWSConversationSettingsTableViewControllerSegueShowGroupM
TSGroupThread *gThread = (TSGroupThread *)self.thread; TSGroupThread *gThread = (TSGroupThread *)self.thread;
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:gThread inThread:gThread
messageBody:@""]; groupMetaMessage:TSGroupMessageQuit];
message.groupMetaMessage = TSGroupMessageQuit;
[self.messageSender sendMessage:message [self.messageSender sendMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully left group.", self.tag); DDLogInfo(@"%@ Successfully left group.", self.tag);

@ -460,9 +460,7 @@ NSString *const SignalsViewControllerSegueShowIncomingCall = @"ShowIncomingCallS
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:thread inThread:thread
messageBody:@"" groupMetaMessage:TSGroupMessageQuit];
attachmentIds:[NSMutableArray new]];
message.groupMetaMessage = TSGroupMessageQuit;
[self.messageSender sendMessage:message [self.messageSender sendMessage:message
success:^{ success:^{
[self dismissViewControllerAnimated:YES [self dismissViewControllerAnimated:YES

Loading…
Cancel
Save