diff --git a/syMessaging/syMessaging/Base.lproj/Main.storyboard b/syMessaging/syMessaging/Base.lproj/Main.storyboard index 3a6391220..8262fc93c 100644 --- a/syMessaging/syMessaging/Base.lproj/Main.storyboard +++ b/syMessaging/syMessaging/Base.lproj/Main.storyboard @@ -6,10 +6,10 @@ - + - + @@ -730,9 +730,9 @@ + - diff --git a/syMessaging/syMessaging/RecentsViewController.m b/syMessaging/syMessaging/RecentsViewController.m index 9146674cb..f6adfd252 100644 --- a/syMessaging/syMessaging/RecentsViewController.m +++ b/syMessaging/syMessaging/RecentsViewController.m @@ -164,10 +164,10 @@ MatrixHandler *mxHandler = [MatrixHandler sharedHandler]; MXRoomData *mxRoomData = [[mxHandler mxData] getRoomData:mxEvent.room_id]; - cell.roomTitle.text = [mxRoomData room_id]; // TODO use room display name + cell.roomTitle.text = [mxRoomData displayname]; cell.lastEventDescription.text = [mxHandler displayTextFor:mxEvent inDetailMode:YES]; - NSDate *date = [NSDate dateWithTimeIntervalSince1970:mxEvent.ts]; + NSDate *date = [NSDate dateWithTimeIntervalSince1970:mxEvent.ts/1000]; NSString *dateFormat = @"MMM dd HH:mm"; NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:[[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]]];