Tidy up attachment usage.

pull/1/head
Matthew Chen 7 years ago
parent 0be12da3dd
commit dc3467dcda

@ -848,6 +848,8 @@ NS_ASSUME_NONNULL_BEGIN
stillImageView.image = [strongSelf
tryToLoadCellMedia:^{
OWSCAssert([strongSelf.attachmentStream isImage]);
OWSCAssert([strongSelf.attachmentStream isValidImage]);
return [strongSelf.attachmentStream
thumbnailImageMediumWithSuccess:^(UIImage *image) {
weakImageView.image = image;
@ -897,6 +899,7 @@ NS_ASSUME_NONNULL_BEGIN
animatedImageView.image = [strongSelf
tryToLoadCellMedia:^{
OWSCAssert([strongSelf.attachmentStream isAnimated]);
OWSCAssert([strongSelf.attachmentStream isValidImage]);
NSString *_Nullable filePath = [strongSelf.attachmentStream originalFilePath];
YYImage *_Nullable animatedImage = nil;
@ -980,6 +983,8 @@ NS_ASSUME_NONNULL_BEGIN
stillImageView.image = [strongSelf
tryToLoadCellMedia:^{
OWSCAssert([strongSelf.attachmentStream isVideo]);
OWSCAssert([strongSelf.attachmentStream isValidVideo]);
return [strongSelf.attachmentStream
thumbnailImageMediumWithSuccess:^(UIImage *image) {
weakImageView.image = image;

@ -2220,7 +2220,7 @@ typedef enum : NSUInteger {
NSFileManager *fileManager = [NSFileManager defaultManager];
if (![fileManager fileExistsAtPath:attachmentStream.originalFilePath]) {
OWSFail(@"%@ Missing video file: %@", self.logTag, attachmentStream.originalFilePath);
OWSFail(@"%@ Missing audio file: %@", self.logTag, attachmentStream.originalFilePath);
}
[self dismissKeyBoard];

Loading…
Cancel
Save