From a1d8c7765d3caf0a412e3d5b3ff659e3a35d6079 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 23 Oct 2017 17:35:35 -0400
Subject: [PATCH] Respond to CR.

// FREEBIE
---
 .../ConversationView/Cells/OWSAudioMessageView.m              | 1 -
 .../ConversationView/Cells/OWSGenericAttachmentView.m         | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
index d9d276cad..7913b63b7 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
@@ -217,7 +217,6 @@ NS_ASSUME_NONNULL_BEGIN
     [self.audioPlayPauseButton autoVCenterInSuperview];
     [self.audioPlayPauseButton autoSetDimension:ALDimensionWidth toSize:self.iconSize];
     [self.audioPlayPauseButton autoSetDimension:ALDimensionHeight toSize:self.iconSize];
-    [self.audioPlayPauseButton setContentHuggingHigh];
 
     const CGFloat kLabelHSpacing = self.audioIconHSpacing;
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
index 64cb5b9c9..8a0eb832d 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
@@ -121,8 +121,7 @@ NS_ASSUME_NONNULL_BEGIN
     UIColor *iconColor
         = (self.isIncoming ? [UIColor colorWithRGBHex:0x9e9e9e] : [self foregroundColorWithOpacity:0.15f]);
     iconCircleView.configureShapeLayerBlock = ^(CAShapeLayer *_Nonnull layer, CGRect bounds) {
-        CGFloat radius = MIN(bounds.size.width, bounds.size.height) * 0.5f;
-        layer.path = [UIBezierPath bezierPathWithRoundedRect:bounds cornerRadius:radius].CGPath;
+        layer.path = [UIBezierPath bezierPathWithOvalInRect:bounds].CGPath;
         layer.fillColor = iconColor.CGColor;
     };
     [contentView addSubview:iconCircleView];
@@ -130,7 +129,6 @@ NS_ASSUME_NONNULL_BEGIN
     [iconCircleView autoVCenterInSuperview];
     [iconCircleView autoSetDimension:ALDimensionWidth toSize:self.iconSize];
     [iconCircleView autoSetDimension:ALDimensionHeight toSize:self.iconSize];
-    [iconCircleView setContentHuggingHigh];
 
     UIImage *image = [UIImage imageNamed:@"generic-attachment-small"];
     OWSAssert(image);