From 1672fd3acd3743d897687cfbed4947ce89104ad9 Mon Sep 17 00:00:00 2001 From: Michael Feldstein Date: Sat, 29 Nov 2014 21:51:37 -0800 Subject: [PATCH] Change extension property to fileExtension since extension is a reserved keyword in Swift --- Classes/SendGrid.m | 2 +- Classes/SendGridEmailAttachment.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/SendGrid.m b/Classes/SendGrid.m index e581495..bd7b149 100755 --- a/Classes/SendGrid.m +++ b/Classes/SendGrid.m @@ -97,7 +97,7 @@ - (void)sendAttachmentWithWeb:(SendGridEmail *)email successBlock:(void(^)(id re SendGridEmailAttachment *attachment = [email.attachments objectAtIndex:i]; NSData *attachmentData = attachment.attachmentData; NSString *mimetype = attachment.mimeType; - NSString *filename = [NSString stringWithFormat:@"%@.%@", attachment.fileName, attachment.extension]; + NSString *filename = [NSString stringWithFormat:@"%@.%@", attachment.fileName, attachment.fileExtension]; NSString *name = [NSString stringWithFormat:@"files[%@]", filename]; [formData appendPartWithFileData:attachmentData name:name fileName:filename mimeType:mimetype]; } diff --git a/Classes/SendGridEmailAttachment.h b/Classes/SendGridEmailAttachment.h index 3315aaf..63e80e2 100644 --- a/Classes/SendGridEmailAttachment.h +++ b/Classes/SendGridEmailAttachment.h @@ -13,6 +13,6 @@ @property (nonatomic, strong) NSData *attachmentData; @property (nonatomic, strong) NSString *mimeType; @property (nonatomic, strong) NSString *fileName; -@property (nonatomic, strong) NSString *extension; +@property (nonatomic, strong) NSString *fileExtension; @end