From 8e9eb6d2128568851ec2f74773a964a7aad6ff41 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 20 Mar 2018 10:25:48 -0400 Subject: [PATCH] CR: Use a less-likely-to-collide thumbnail name for legacy attachments If you had a legacy file foo.jpg and a file foo-thumbnail.jpg, we'd use the foo-thumbnail.jpg as the thumbnail for foo. This isn't a problem with modern attachments as each is in it's own directory. // FREEBIE --- SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index 15b3a9f50..e963195dd 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -243,7 +243,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *filename = filePath.lastPathComponent.stringByDeletingPathExtension; NSString *containingDir = filePath.stringByDeletingLastPathComponent; - NSString *newFilename = [filename stringByAppendingString:@"-thumbnail"]; + NSString *newFilename = [filename stringByAppendingString:@"-signal-ios-thumbnail"]; return [[containingDir stringByAppendingPathComponent:newFilename] stringByAppendingPathExtension:@"jpg"]; }