Skip to content

Commit 802d2bf

Browse files
committed
Revert "Create TSOutgoingMessage with info on group change"
Inadvertently stole credit for work done when squashing the commits. Reverting and re-merging giving appropriate credit. This reverts commit 8242c9e.
1 parent 8242c9e commit 802d2bf

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ EXTERNAL SOURCES:
134134

135135
CHECKOUT OPTIONS:
136136
SignalServiceKit:
137-
:commit: d4c55d69404c99927da716c443997415ad7bc6ba
137+
:commit: 91fcd01632a81f2aa67d2d94b97c68d519e6881a
138138
:git: https://github.com/WhisperSystems/SignalServiceKit.git
139139
SocketRocket:
140140
:commit: 41b57bb2fc292a814f758441a05243eb38457027

Signal/src/view controllers/MessagesViewController.m

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,19 +2027,14 @@ - (void)updateGroupModelTo:(TSGroupModel *)newGroupModel
20272027
__block TSOutgoingMessage *message;
20282028

20292029
[self.editingDatabaseConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
2030-
groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction];
2031-
2032-
NSString *updateGroupInfo =
2033-
[groupThread.groupModel getInfoStringAboutUpdateTo:newGroupModel contactsManager:self.contactsManager];
2034-
2035-
groupThread.groupModel = newGroupModel;
2036-
[groupThread saveWithTransaction:transaction];
2037-
message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
2038-
inThread:groupThread
2039-
messageBody:@""
2040-
attachmentIds:[NSMutableArray new]];
2041-
message.groupMetaMessage = TSGroupMessageUpdate;
2042-
message.customMessage = updateGroupInfo;
2030+
groupThread = [TSGroupThread getOrCreateThreadWithGroupModel:newGroupModel transaction:transaction];
2031+
groupThread.groupModel = newGroupModel;
2032+
[groupThread saveWithTransaction:transaction];
2033+
message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
2034+
inThread:groupThread
2035+
messageBody:@""
2036+
attachmentIds:[NSMutableArray new]];
2037+
message.groupMetaMessage = TSGroupMessageUpdate;
20432038
}];
20442039

20452040
if (newGroupModel.groupImage != nil) {

Signal/src/view controllers/NewGroupViewController.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ - (void)createGroup
138138
messageBody:@""
139139
attachmentIds:[NSMutableArray new]];
140140
message.groupMetaMessage = TSGroupMessageNew;
141-
message.customMessage = NSLocalizedString(@"GROUP_CREATED", nil);
142141
if (model.groupImage != nil) {
143142
[[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(model.groupImage)
144143
contentType:OWSMimeTypeImagePng
-152 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)