Merge pull request robbiehanson#569 from AndrewMcDrew/mostRecentMessageBug

ObjColumnist · ObjColumnist · commit db543e1b4846 · 2015-08-06T15:03:30.000+01:00
Fixed bug when mostRecentMessageTimestampForRoom returns nil
diff --git a/Extensions/XEP-0045/CoreDataStorage/XMPPRoomCoreDataStorage.m b/Extensions/XEP-0045/CoreDataStorage/XMPPRoomCoreDataStorage.m
@@ -818,11 +818,11 @@ - (NSDate *)mostRecentMessageTimestampForRoom:(XMPPJID *)roomJID
 			NSString *streamBareJidStr = [[self myJIDForXMPPStream:xmppStream] bare];
 			
 			NSString *predicateFormat = @"roomJIDStr == %@ AND streamBareJidStr == %@";
-			predicate = [NSPredicate predicateWithFormat:predicateFormat, roomJID, streamBareJidStr];
+			predicate = [NSPredicate predicateWithFormat:predicateFormat, roomJID.bare, streamBareJidStr];
 		}
 		else
 		{
-			predicate = [NSPredicate predicateWithFormat:@"roomJIDStr == %@", roomJID];
+			predicate = [NSPredicate predicateWithFormat:@"roomJIDStr == %@", roomJID.bare];
 		}
 		
 		NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"localTimestamp" ascending:NO];

Original file line number	Diff line number	Diff line change
`@@ -818,11 +818,11 @@ - (NSDate )mostRecentMessageTimestampForRoom:(XMPPJID )roomJID`
`818`	`818`	`NSString *streamBareJidStr = [[self myJIDForXMPPStream:xmppStream] bare];`
`819`	`819`
`820`	`820`	`NSString *predicateFormat = @"roomJIDStr == %@ AND streamBareJidStr == %@";`
`821`		`- predicate = [NSPredicate predicateWithFormat:predicateFormat, roomJID, streamBareJidStr];`
	`821`	`+ predicate = [NSPredicate predicateWithFormat:predicateFormat, roomJID.bare, streamBareJidStr];`
`822`	`822`	`}`
`823`	`823`	`else`
`824`	`824`	`{`
`825`		`- predicate = [NSPredicate predicateWithFormat:@"roomJIDStr == %@", roomJID];`
	`825`	`+ predicate = [NSPredicate predicateWithFormat:@"roomJIDStr == %@", roomJID.bare];`
`826`	`826`	`}`
`827`	`827`
`828`	`828`	`NSSortDescriptor *sortDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"localTimestamp" ascending:NO];`