From 8458fb69a41d878c2b888c4b8cb3695c75e2f145 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 11 Apr 2017 09:16:10 -0400
Subject: [PATCH 1/3] Fix audio playback.

// FREEBIE
---
 Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
index 9ca47dd0f..0aa7cac89 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
@@ -162,7 +162,7 @@ NS_ASSUME_NONNULL_BEGIN
                             [[TSPhotoAdapter alloc] initWithAttachment:stream incoming:isIncomingAttachment];
                         adapter.mediaItem.appliesMediaViewMaskAsOutgoing = !isIncomingAttachment;
                         break;
-                    } else if ([stream isVideo]) {
+                    } else if ([stream isVideo] || [stream isAudio]) {
                         adapter.mediaItem = [[TSVideoAttachmentAdapter alloc]
                             initWithAttachment:stream
                                       incoming:[interaction isKindOfClass:[TSIncomingMessage class]]];

From 79a2612dbe2fe321e452db6187e29ea9c7af475b Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 11 Apr 2017 09:46:04 -0400
Subject: [PATCH 2/3] Fix audio playback.

// FREEBIE
---
 .../Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m   | 7 ++-----
 Signal/src/ViewControllers/MessagesViewController.m        | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
index c5db763e3..06920ac54 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m
@@ -151,6 +151,7 @@ NS_ASSUME_NONNULL_BEGIN
         _audioPlayPauseButton = [[UIButton alloc] initWithFrame:CGRectMake(3, 3, 30, 30)];
         [_audioPlayPauseButton setBackgroundImage:[UIImage imageNamed:@"audio_play_button"]
                                          forState:UIControlStateNormal];
+        _audioPlayPauseButton.enabled = NO;
 
         AVAudioPlayer *player = [[AVAudioPlayer alloc] initWithContentsOfURL:url error:&err];
         _durationLabel        = [[UILabel alloc] init];
@@ -180,13 +181,9 @@ NS_ASSUME_NONNULL_BEGIN
         [audioBubble addSubview:_durationLabel];
 
         if (!_incoming) {
-            __weak TSVideoAttachmentAdapter *weakSelf = self;
             self.attachmentUploadView = [[AttachmentUploadView alloc] initWithAttachment:self.attachment
                                                                                superview:audioBubble
-                                                                 attachmentStateCallback:^(BOOL isAttachmentReady) {
-                                                                     weakSelf.audioPlayPauseButton.enabled
-                                                                         = isAttachmentReady;
-                                                                 }];
+                                                                 attachmentStateCallback:nil];
         }
 
         return audioBubble;
diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m
index 11bab16ee..7c11abe2a 100644
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@@ -1699,7 +1699,8 @@ typedef enum : NSUInteger {
                                     NSIndexPath *indexPathI = [NSIndexPath indexPathForRow:i inSection:0];
                                     id<OWSMessageData> message = [self messageAtIndexPath:indexPathI];
 
-                                    if (message.messageType == TSIncomingMessageAdapter && message.isMediaMessage) {
+                                    if (message.messageType == TSIncomingMessageAdapter && message.isMediaMessage &&
+                                        [[message media] isKindOfClass:[TSVideoAttachmentAdapter class]]) {
                                         TSVideoAttachmentAdapter *msgMedia
                                             = (TSVideoAttachmentAdapter *)[message media];
                                         if ([msgMedia isAudio]) {

From 847a6106452c28eb16a33585d8bb9a9bc142db45 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 11 Apr 2017 10:24:49 -0400
Subject: [PATCH 3/3] [SSK] Fix audio playback.

// FREEBIE
---
 Podfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Podfile.lock b/Podfile.lock
index 6f7ebcc26..233597d13 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -132,7 +132,7 @@ CHECKOUT OPTIONS:
     :commit: 139bde37738ccb6ebcc68bf1b02c8a28400b6760
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: d4e0c49ff98f88ea053b3c4875b81270a8ab8ea0
+    :commit: 7f2ce6142471b6f9814c558838e23fc9365c78af
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf