element-hq/element-ios/issues/4090 - Added the VoiceMessage attacheme…

…nt type.
matrix-org · Jun 23, 2021 · e855a71 · e855a71
1 parent 5d4f3c6
commit e855a71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/MatrixKit/Models/Room/MXKAttachment.h b/MatrixKit/Models/Room/MXKAttachment.h
@@ -29,6 +29,7 @@ typedef enum : NSUInteger {
     MXKAttachmentTypeUndefined,
     MXKAttachmentTypeImage,
     MXKAttachmentTypeAudio,
+    MXKAttachmentTypeVoiceMessage,
     MXKAttachmentTypeVideo,
     MXKAttachmentTypeLocation,
     MXKAttachmentTypeFile,

diff --git a/MatrixKit/Models/Room/MXKAttachment.m b/MatrixKit/Models/Room/MXKAttachment.m
@@ -97,7 +97,11 @@ - (instancetype)initWithEvent:(MXEvent*)event andMediaManager:(MXMediaManager*)m
             }
             else if ([msgtype isEqualToString:kMXMessageTypeAudio])
             {
-                _type = MXKAttachmentTypeAudio;
+                if (eventContent[kMXMessageTypeVoiceMessage]) {
+                    _type = MXKAttachmentTypeVoiceMessage;
+                } else {
+                    _type = MXKAttachmentTypeAudio;
+                }
             }
             else if ([msgtype isEqualToString:kMXMessageTypeVideo])
             {

diff --git a/MatrixKit/Models/Room/MXKRoomBubbleCellData.m b/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
@@ -427,7 +427,7 @@ - (void)prepareBubbleComponentsPosition
 
     if (firstComponent)
     {
-        CGFloat positionY = (attachment == nil || attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
+        CGFloat positionY = (attachment == nil || attachment.type == MXKAttachmentTypeFile || attachment.type == MXKAttachmentTypeAudio || attachment.type == MXKAttachmentTypeVoiceMessage) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
         firstComponent.position = CGPointMake(0, positionY);
     }
 }

diff --git a/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m b/MatrixKit/Views/RoomBubbleList/MXKRoomBubbleTableViewCell.m
@@ -1092,7 +1092,7 @@ - (BOOL)shouldInteractWithURL:(NSURL *)URL urlItemInteractionValue:(NSNumber*)ur
 - (BOOL)isBubbleDataContainsFileAttachment
 {
     return bubbleData.attachment
-    && (bubbleData.attachment.type == MXKAttachmentTypeFile || bubbleData.attachment.type == MXKAttachmentTypeAudio)
+    && (bubbleData.attachment.type == MXKAttachmentTypeFile || bubbleData.attachment.type == MXKAttachmentTypeAudio || bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage)
     && bubbleData.attachment.contentURL
     && bubbleData.attachment.contentInfo;
 }