Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens

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

@@ -163,4 +163,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.m

@@ -2050,8 +2050,8 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
             [self removeEventWithEventId:eventId];
             
             if (event.isVoiceMessage) {
-                NSNumber *duration = event.content[kMXMessageContentKeyExtensibleAudio][kMXMessageContentKeyExtensibleAudioDuration];
-                NSArray<NSNumber *> *samples = event.content[kMXMessageContentKeyExtensibleAudio][kMXMessageContentKeyExtensibleAudioWaveform];
+                NSNumber *duration = event.content[kMXMessageContentKeyExtensibleAudioMSC1767][kMXMessageContentKeyExtensibleAudioDuration];
+                NSArray<NSNumber *> *samples = event.content[kMXMessageContentKeyExtensibleAudioMSC1767][kMXMessageContentKeyExtensibleAudioWaveform];
                 
                 [self sendVoiceMessage:localFileURL mimeType:mimetype duration:duration.doubleValue samples:samples success:success failure:failure];
             } else {