Merge branch 'charlesmchen/messageViewPerf2_'

Podfile.lock

@@ -136,7 +136,7 @@ CHECKOUT OPTIONS:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: 12c45b8a47ac6e65c97dc7c64af0e07aa94d6145
+    :commit: b89d16ea905c08f368c7320fb32bbd31e127ecca
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
         _attachment      = attachment;
         _attachmentId    = attachment.uniqueId;
         _incoming = incoming;
-        _imageSize = [attachment cachedImageSizeWithoutTransaction];
+        _imageSize = [attachment imageSizeWithoutTransaction];
     }
 
     return self;

Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m

@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
     _attachment = attachment;
     _attachmentId = attachment.uniqueId;
     _incoming = incoming;
-    _imageSize = [attachment cachedImageSizeWithoutTransaction];
+    _imageSize = [attachment imageSizeWithoutTransaction];
 
     return self;
 }

Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m

@@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
         _contentType     = attachment.contentType;
         _attachment      = attachment;
         _incoming        = incoming;
-        _imageSize = [attachment cachedImageSizeWithoutTransaction];
+        _imageSize = [attachment imageSizeWithoutTransaction];
     }
     return self;
 }
@@ -267,7 +267,7 @@ NS_ASSUME_NONNULL_BEGIN
 {
     OWSAssert([self isAudio]);
 
-    self.audioDurationSeconds = [self.attachment cachedAudioDurationSecondsWithoutTransaction];
+    self.audioDurationSeconds = [self.attachment audioDurationSecondsWithoutTransaction];
 
     CGSize viewSize = [self mediaViewDisplaySize];
     UIColor *textColor = [self audioTextColor];