Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.h

@@ -169,4 +169,11 @@
  */
 - (MXKRoomBubbleComponent*)getFirstBubbleComponentWithDisplay;
 
+/**
+ Get the last visible component.
+ 
+ @return Last visible component or nil.
+ */
+- (MXKRoomBubbleComponent*)getLastBubbleComponentWithDisplay;
+
 @end

Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m

@@ -306,16 +306,15 @@
     return first;
 }
 
-- (MXKRoomBubbleComponent*) getFirstBubbleComponentWithDisplay
+- (MXKRoomBubbleComponent*)getFirstBubbleComponentWithDisplay
 {
     // Look for the first component which is actually displayed (some event are ignored in room history display).
     MXKRoomBubbleComponent* first = nil;
     
     @synchronized(bubbleComponents)
     {
-        for (NSInteger index = 0; index < bubbleComponents.count; index++)
+        for (MXKRoomBubbleComponent *component in bubbleComponents)
         {
-            MXKRoomBubbleComponent *component = bubbleComponents[index];
             if (component.attributedTextMessage)
             {
                 first = component;
@@ -327,6 +326,26 @@
     return first;
 }
 
+- (MXKRoomBubbleComponent*)getLastBubbleComponentWithDisplay
+{
+    // Look for the first component which is actually displayed (some event are ignored in room history display).
+    MXKRoomBubbleComponent* lastVisibleComponent = nil;
+
+    @synchronized(bubbleComponents)
+    {
+        for (MXKRoomBubbleComponent *component in bubbleComponents.reverseObjectEnumerator)
+        {
+            if (component.attributedTextMessage)
+            {
+                lastVisibleComponent = component;
+                break;
+            }
+        }
+    }
+
+    return lastVisibleComponent;
+}
+
 - (NSAttributedString*)attributedTextMessageWithHighlightedEvent:(NSString*)eventId tintColor:(UIColor*)tintColor
 {
     NSAttributedString *customAttributedTextMsg;

Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h

@@ -274,7 +274,7 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
 
  @param roomId the id of the room to get data from.
  @param initialEventId the id of the event where to start the timeline.
- @param threadId the id of the thread to load.
+ @param threadId the id of the thread to load. If provided, thread data source will be loaded from the room specified with `roomId`.
  @param mxSession the Matrix session to get data from.
  @param onComplete a block providing the newly created instance.
  */
@@ -316,7 +316,7 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
 
  @param roomId the id of the room to get data from.
  @param initialEventId the id of the event where to start the timeline.
- @param threadId the id of the thread to initialize.
+ @param threadId the id of the thread to initialize. If provided, thread data source will be initialized from the room specified with `roomId`.
  @param mxSession the Matrix session to get data from.
  @return the newly created instance.
  */

Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m

@@ -1458,7 +1458,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     paginationRequest = [_timeline paginate:numItems
                                   direction:direction
                               onlyFromStore:onlyFromStore
-//                                   threadId:_threadId
                                    complete:^{
         
         MXStrongifyAndReturnIfNil(self);
@@ -1526,7 +1525,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
         secondaryPaginationRequest = [_secondaryTimeline paginate:numItems
                                                         direction:direction
                                                     onlyFromStore:onlyFromStore
-//                                                         threadId:_threadId
                                                          complete:^{
             
             MXStrongifyAndReturnIfNil(self);