diff --git a/Signal/src/view controllers/TSGroupModel.m b/Signal/src/view controllers/TSGroupModel.m index 0b0a306a9..8f9b86709 100644 --- a/Signal/src/view controllers/TSGroupModel.m +++ b/Signal/src/view controllers/TSGroupModel.m @@ -50,9 +50,9 @@ } - (NSString*) getInfoStringAboutUpdateTo:(TSGroupModel*)newModel { - NSString* updatedGroupInfoString = @"Group updated. "; + NSString* updatedGroupInfoString = @""; if (self == newModel) { - return updatedGroupInfoString; + return @"Group updated."; } if (![_groupName isEqual:newModel.groupName]) { updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:[NSString stringWithFormat:@"Title is now '%@'. ",newModel.groupName]]; @@ -60,6 +60,9 @@ if(_groupImage!=nil && newModel.groupImage!=nil && !([UIImagePNGRepresentation(_groupImage) isEqualToData:UIImagePNGRepresentation(newModel.groupImage)])) { updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:@"Avatar changed. "]; } + if([updatedGroupInfoString length]==0) { + updatedGroupInfoString = @"Group updated"; + } NSSet* oldMembers = [NSSet setWithArray:_groupMemberIds]; NSSet* newMembers = [NSSet setWithArray:newModel.groupMemberIds]; diff --git a/Signal/src/view controllers/TSMessageAdapter.m b/Signal/src/view controllers/TSMessageAdapter.m index a9d8fe5d6..b8f78cd74 100644 --- a/Signal/src/view controllers/TSMessageAdapter.m +++ b/Signal/src/view controllers/TSMessageAdapter.m @@ -135,6 +135,12 @@ adapter.infoMessageType = infoMessage.messageType; adapter.messageBody = infoMessage.description; adapter.messageType = TSInfoMessageAdapter; + if(adapter.infoMessageType == TSInfoMessageTypeGroupQuit || adapter.infoMessageType == TSInfoMessageTypeGroupUpdate) { + // repurposing call display for info message stuff for group updates, ! adapter will know because the date is nil + CallStatus status = 0; + JSQCall* call = [[JSQCall alloc] initWithCallerId:@"" callerDisplayName:adapter.messageBody date:nil status:status]; + return call; + } } else { TSErrorMessage * errorMessage = (TSErrorMessage*)interaction; adapter.infoMessageType = errorMessage.errorType;