Support for calls & groups in new blue styled format.

pull/1/head
Christine Corbett 11 years ago committed by Frederic Jacobs
parent a9ad6643a0
commit 91591545a2

@ -50,9 +50,9 @@
} }
- (NSString*) getInfoStringAboutUpdateTo:(TSGroupModel*)newModel { - (NSString*) getInfoStringAboutUpdateTo:(TSGroupModel*)newModel {
NSString* updatedGroupInfoString = @"Group updated. "; NSString* updatedGroupInfoString = @"";
if (self == newModel) { if (self == newModel) {
return updatedGroupInfoString; return @"Group updated.";
} }
if (![_groupName isEqual:newModel.groupName]) { if (![_groupName isEqual:newModel.groupName]) {
updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:[NSString stringWithFormat:@"Title is now '%@'. ",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)])) { if(_groupImage!=nil && newModel.groupImage!=nil && !([UIImagePNGRepresentation(_groupImage) isEqualToData:UIImagePNGRepresentation(newModel.groupImage)])) {
updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:@"Avatar changed. "]; updatedGroupInfoString = [updatedGroupInfoString stringByAppendingString:@"Avatar changed. "];
} }
if([updatedGroupInfoString length]==0) {
updatedGroupInfoString = @"Group updated";
}
NSSet* oldMembers = [NSSet setWithArray:_groupMemberIds]; NSSet* oldMembers = [NSSet setWithArray:_groupMemberIds];
NSSet* newMembers = [NSSet setWithArray:newModel.groupMemberIds]; NSSet* newMembers = [NSSet setWithArray:newModel.groupMemberIds];

@ -135,6 +135,12 @@
adapter.infoMessageType = infoMessage.messageType; adapter.infoMessageType = infoMessage.messageType;
adapter.messageBody = infoMessage.description; adapter.messageBody = infoMessage.description;
adapter.messageType = TSInfoMessageAdapter; 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 { } else {
TSErrorMessage * errorMessage = (TSErrorMessage*)interaction; TSErrorMessage * errorMessage = (TSErrorMessage*)interaction;
adapter.infoMessageType = errorMessage.errorType; adapter.infoMessageType = errorMessage.errorType;

Loading…
Cancel
Save