From b3bb4c745e07a45987f4a72f5cb557b7ff3c6f43 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michaelkirk@users.noreply.github.com>
Date: Tue, 28 Jun 2016 06:50:12 -0700
Subject: [PATCH] Set explicit height for all media types. Audio is the only
 special case. (#1237)

This might FIX #1111, but I think there are actually a handful of things
breaking our layout.

// FREEBIE
---
 .../TSMessageAdapaters/TSVideoAttachmentAdapter.m   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
index 12bd014a7..a8ac8c47f 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
@@ -39,7 +39,6 @@
     self = [super initWithFileURL:[attachment mediaURL] isReadyToPlay:YES];
 
     if (self) {
-        ;
         _image           = attachment.image;
         _cachedImageView = nil;
         _attachmentId    = attachment.uniqueId;
@@ -200,15 +199,11 @@
 }
 
 - (CGSize)mediaViewDisplaySize {
-    CGSize mediaDisplaySize;
-    if ([self isVideo]) {
-        mediaDisplaySize = [super mediaViewDisplaySize];
-    } else if ([self isAudio]) {
-        CGSize size      = [super mediaViewDisplaySize];
-        size.height      = AUDIO_BAR_HEIGHT;
-        mediaDisplaySize = size;
+    CGSize size = [super mediaViewDisplaySize];
+    if ([self isAudio]) {
+        size.height = AUDIO_BAR_HEIGHT;
     }
-    return mediaDisplaySize;
+    return size;
 }
 
 - (UIView *)mediaPlaceholderView {