Respond to CR.

// FREEBIE
pull/1/head
Matthew Chen 7 years ago
parent db07ea8a8e
commit c70487be80

@ -157,7 +157,7 @@ NS_ASSUME_NONNULL_BEGIN
NSString *filename = self.attachment.sourceFilename; NSString *filename = self.attachment.sourceFilename;
if (!filename) { if (!filename) {
filename = [self.attachment localFilePathWithoutTransaction]; filename = [[self.attachment localFilePath] lastPathComponent];
} }
NSString *fileExtension = filename.pathExtension; NSString *fileExtension = filename.pathExtension;
if (fileExtension.length < 1) { if (fileExtension.length < 1) {
@ -207,8 +207,7 @@ NS_ASSUME_NONNULL_BEGIN
NSError *error; NSError *error;
unsigned long long fileSize = unsigned long long fileSize =
[[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachment localFilePathWithoutTransaction] [[NSFileManager defaultManager] attributesOfItemAtPath:[self.attachment localFilePath] error:&error]
error:&error]
.fileSize; .fileSize;
OWSAssert(!error); OWSAssert(!error);
NSString *bottomText = [ViewControllerUtils formatFileSize:fileSize]; NSString *bottomText = [ViewControllerUtils formatFileSize:fileSize];

@ -289,7 +289,7 @@ NS_ASSUME_NONNULL_BEGIN
const CGFloat kLabelVSpacing = 2; const CGFloat kLabelVSpacing = 2;
NSString *filename = self.attachment.sourceFilename; NSString *filename = self.attachment.sourceFilename;
if (!filename) { if (!filename) {
filename = [self.attachment localFilePathWithoutTransaction]; filename = [[self.attachment localFilePath] lastPathComponent];
} }
NSString *topText = [[filename stringByDeletingPathExtension] NSString *topText = [[filename stringByDeletingPathExtension]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];

Loading…
Cancel
Save