Merge branch 'charlesmchen/attachmentMimeTypes'

9 years ago · 92de9a5e72
parent 955c4d8a02 3e9fbb1bec
commit 92de9a5e72
2 changed files with 1028 additions and 7 deletions
--- a/src/Util/MIMETypeUtil.h
+++ b/src/Util/MIMETypeUtil.h
@ -46,6 +46,7 @@ extern NSString *const OWSMimeTypeUnknownForTests;
 + (nullable NSString *)utiTypeForFileExtension:(NSString *)fileExtension;
 + (nullable NSString *)fileExtensionForUTIType:(NSString *)utiType;
 + (nullable NSString *)fileExtensionForMIMEType:(NSString *)mimeType;
+ (nullable NSString *)mimeTypeForFileExtension:(NSString *)fileExtension;

@end

--- a/src/Util/MIMETypeUtil.m
+++ b/src/Util/MIMETypeUtil.m