From b90b71351f7e0b8f4ae73a8677b8c7fd423b2027 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 20 Apr 2017 11:12:58 -0400 Subject: [PATCH] Respond to CR. // FREEBIE --- Signal/src/ViewControllers/OWSAudioAttachmentPlayer.h | 4 ++++ Signal/src/ViewControllers/OWSAudioAttachmentPlayer.m | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.h b/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.h index 85fbdeefb..9071cd07d 100644 --- a/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.h +++ b/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.h @@ -4,6 +4,8 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class TSVideoAttachmentAdapter; @class YapDatabaseConnection; @@ -20,3 +22,5 @@ - (void)togglePlayState; @end + +NS_ASSUME_NONNULL_END diff --git a/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.m b/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.m index 74c6cfd03..9181be7c8 100644 --- a/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.m +++ b/Signal/src/ViewControllers/OWSAudioAttachmentPlayer.m @@ -9,6 +9,8 @@ #import "ViewControllerUtils.h" #import +NS_ASSUME_NONNULL_BEGIN + @interface OWSAudioAttachmentPlayer () @property (nonatomic) TSAttachmentStream *attachmentStream; @@ -111,7 +113,7 @@ self.mediaAdapter.isPaused = YES; [self.audioPlayer pause]; [self.audioPlayerPoller invalidate]; - double current = [self.audioPlayer currentTime] / [_audioPlayer duration]; + double current = [self.audioPlayer currentTime] / [self.audioPlayer duration]; [self.mediaAdapter setAudioProgressFromFloat:(float)current]; [self.mediaAdapter setAudioIconToPlay]; } @@ -123,7 +125,7 @@ [self.audioPlayer pause]; [self.audioPlayerPoller invalidate]; [self.mediaAdapter setAudioProgressFromFloat:0]; - [self.mediaAdapter setDurationOfAudio:_audioPlayer.duration]; + [self.mediaAdapter setDurationOfAudio:self.audioPlayer.duration]; [self.mediaAdapter setAudioIconToPlay]; self.mediaAdapter.isAudioPlaying = NO; self.mediaAdapter.isPaused = NO; @@ -171,3 +173,5 @@ } @end + +NS_ASSUME_NONNULL_END