From 4dfb82abd7e86bf03f12ffe40e274090635d75ba Mon Sep 17 00:00:00 2001
From: giomfo <giom@matrix.org>
Date: Wed, 15 Oct 2014 09:42:46 +0200
Subject: [PATCH] Finalize recents display

---
 syMessaging/syMessaging/Base.lproj/Main.storyboard | 6 +++---
 syMessaging/syMessaging/RecentsViewController.m    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 @@
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
-        <!--Recents-->
+        <!--RecentsNav-->
         <scene sceneID="pY4-Hu-kfo">
             <objects>
-                <navigationController title="Recents" id="RMx-3f-FxP" sceneMemberID="viewController">
+                <navigationController title="RecentsNav" id="RMx-3f-FxP" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -730,9 +730,9 @@
                                     </subviews>
                                     <constraints>
                                         <constraint firstItem="YTM-8H-EpC" firstAttribute="leading" secondItem="37f-cq-3Eg" secondAttribute="leading" constant="8" id="0FC-Ly-dRv"/>
+                                        <constraint firstAttribute="trailing" secondItem="YTM-8H-EpC" secondAttribute="trailing" constant="88" id="56p-nx-gML"/>
                                         <constraint firstAttribute="trailing" secondItem="5g8-vg-2EB" secondAttribute="trailing" constant="8" id="Avl-RN-f0J"/>
                                         <constraint firstItem="5g8-vg-2EB" firstAttribute="leading" secondItem="37f-cq-3Eg" secondAttribute="leading" constant="8" id="YEf-Sg-fK1"/>
-                                        <constraint firstItem="eKl-0r-wFc" firstAttribute="leading" secondItem="YTM-8H-EpC" secondAttribute="trailing" constant="8" id="khz-VI-SUO"/>
                                         <constraint firstItem="eKl-0r-wFc" firstAttribute="top" secondItem="37f-cq-3Eg" secondAttribute="top" constant="8" id="m8Q-2Z-v8h"/>
                                         <constraint firstAttribute="bottom" secondItem="5g8-vg-2EB" secondAttribute="bottom" constant="9" id="oqT-mf-B3Y"/>
                                         <constraint firstItem="YTM-8H-EpC" firstAttribute="top" secondItem="37f-cq-3Eg" secondAttribute="top" constant="8" id="s5s-Hs-1tF"/>
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]]];