Merge pull request #569 from AndrewMcDrew/mostRecentMessageBug

Fixed bug when mostRecentMessageTimestampForRoom returns nil
robbiehanson · Aug 6, 2015 · db543e1 · db543e1
2 parents e09d5a3 + 87f79b6
commit db543e1
Showing 1 changed file with 2 additions and 2 deletions.
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];