From 6276dcb34c9a8ba040de725ef94e6fc0a3fc0b88 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 16 Jun 2017 14:58:11 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20=E2=80=9CInvalid=20media=20attachment?= =?UTF-8?q?s=E2=80=9D=20crash.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit // FREEBIE --- Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m | 3 +-- Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m | 3 +-- .../src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m index f430fc800f..800b75c828 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m @@ -103,8 +103,7 @@ NS_ASSUME_NONNULL_BEGIN NSData *fileData = [NSData dataWithContentsOfURL:[self.attachment mediaURL]]; if (!fileData) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - OWSAssert(0); - return nil; + return [UIView new]; } FLAnimatedImage *animatedGif = [FLAnimatedImage animatedImageWithGIFData:fileData]; FLAnimatedImageView *imageView = [[FLAnimatedImageView alloc] init]; diff --git a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m index dd8c2e45d3..7fd4bab6a9 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m @@ -75,8 +75,7 @@ NS_ASSUME_NONNULL_BEGIN UIImage *image = self.attachment.image; if (!image) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - OWSAssert(0); - return nil; + return [UIView new]; } CGSize size = [self mediaViewDisplaySize]; UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m index 85c268af7c..198e3d9e62 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m @@ -227,8 +227,7 @@ NS_ASSUME_NONNULL_BEGIN UIImage *image = self.attachment.image; if (!image) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - OWSAssert(0); - return nil; + return [UIView new]; } UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; imageView.contentMode = UIViewContentModeScaleAspectFill; From 119f1f34298f7b6535db32fe8113a0fee5bed369 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Sat, 17 Jun 2017 13:51:26 -0400 Subject: [PATCH 2/2] Respond to CR. // FREEBIE --- Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m | 5 ++++- Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m | 5 ++++- .../src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m index 800b75c828..9d2a737873 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSAnimatedAdapter.m @@ -7,6 +7,7 @@ #import "FLAnimatedImage.h" #import "JSQMediaItem+OWS.h" #import "TSAttachmentStream.h" +#import "UIColor+OWS.h" #import #import #import @@ -103,7 +104,9 @@ NS_ASSUME_NONNULL_BEGIN NSData *fileData = [NSData dataWithContentsOfURL:[self.attachment mediaURL]]; if (!fileData) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - return [UIView new]; + UIView *view = [UIView new]; + view.backgroundColor = [UIColor colorWithWhite:0.85f alpha:1.f]; + return view; } FLAnimatedImage *animatedGif = [FLAnimatedImage animatedImageWithGIFData:fileData]; FLAnimatedImageView *imageView = [[FLAnimatedImageView alloc] init]; diff --git a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m index 7fd4bab6a9..aa85e420e0 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m @@ -6,6 +6,7 @@ #import "AttachmentUploadView.h" #import "JSQMediaItem+OWS.h" #import "TSAttachmentStream.h" +#import "UIColor+OWS.h" #import #import #import @@ -75,7 +76,9 @@ NS_ASSUME_NONNULL_BEGIN UIImage *image = self.attachment.image; if (!image) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - return [UIView new]; + UIView *view = [UIView new]; + view.backgroundColor = [UIColor colorWithWhite:0.85f alpha:1.f]; + return view; } CGSize size = [self mediaViewDisplaySize]; UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; diff --git a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m index 198e3d9e62..c504a34f09 100644 --- a/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m +++ b/Signal/src/Models/TSMessageAdapaters/TSVideoAttachmentAdapter.m @@ -227,7 +227,9 @@ NS_ASSUME_NONNULL_BEGIN UIImage *image = self.attachment.image; if (!image) { DDLogError(@"%@ Could not load image: %@", [self tag], [self.attachment mediaURL]); - return [UIView new]; + UIView *view = [UIView new]; + view.backgroundColor = [UIColor colorWithWhite:0.85f alpha:1.f]; + return view; } UIImageView *imageView = [[UIImageView alloc] initWithImage:image]; imageView.contentMode = UIViewContentModeScaleAspectFill;