From c39e8b0bc6c1a9b8aeb88b949dbd5b16e3da9baa Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.john.kirk@gmail.com>
Date: Fri, 2 Sep 2016 10:11:51 -0400
Subject: [PATCH] extract constant for image/png

// FREEBIE
---
 src/Devices/OWSContactsOutputStream.m | 3 ++-
 src/Devices/OWSGroupsOutputStream.m   | 3 ++-
 src/Util/MIMETypeUtil.h               | 1 +
 src/Util/MIMETypeUtil.m               | 7 ++++---
 src/Util/UIImage+contentTypes.m       | 8 ++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Devices/OWSContactsOutputStream.m b/src/Devices/OWSContactsOutputStream.m
index 31a19e297..740148261 100644
--- a/src/Devices/OWSContactsOutputStream.m
+++ b/src/Devices/OWSContactsOutputStream.m
@@ -2,6 +2,7 @@
 
 #import "OWSContactsOutputStream.h"
 #import "Contact.h"
+#import "MIMETypeUtil.h"
 #import "OWSSignalServiceProtos.pb.h"
 #import <ProtocolBuffers/CodedOutputStream.h>
 
@@ -20,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
         OWSSignalServiceProtosContactDetailsAvatarBuilder *avatarBuilder =
             [OWSSignalServiceProtosContactDetailsAvatarBuilder new];
 
-        [avatarBuilder setContentType:@"image/png"];
+        [avatarBuilder setContentType:OWSMimeTypeImagePng];
         avatarPng = UIImagePNGRepresentation(contact.image);
         [avatarBuilder setLength:(uint32_t)avatarPng.length];
         [contactBuilder setAvatarBuilder:avatarBuilder];
diff --git a/src/Devices/OWSGroupsOutputStream.m b/src/Devices/OWSGroupsOutputStream.m
index 93b6e2dc6..cdda93b3c 100644
--- a/src/Devices/OWSGroupsOutputStream.m
+++ b/src/Devices/OWSGroupsOutputStream.m
@@ -1,6 +1,7 @@
 //  Copyright © 2016 Open Whisper Systems. All rights reserved.
 
 #import "OWSGroupsOutputStream.h"
+#import "MIMETypeUtil.h"
 #import "OWSSignalServiceProtos.pb.h"
 #import "TSGroupModel.h"
 #import <ProtocolBuffers/CodedOutputStream.h>
@@ -21,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
         OWSSignalServiceProtosGroupDetailsAvatarBuilder *avatarBuilder =
             [OWSSignalServiceProtosGroupDetailsAvatarBuilder new];
 
-        [avatarBuilder setContentType:@"image/png"];
+        [avatarBuilder setContentType:OWSMimeTypeImagePng];
         avatarPng = UIImagePNGRepresentation(group.groupImage);
         [avatarBuilder setLength:(uint32_t)avatarPng.length];
         [groupBuilder setAvatarBuilder:avatarBuilder];
diff --git a/src/Util/MIMETypeUtil.h b/src/Util/MIMETypeUtil.h
index 2f57a582f..dcfa982a4 100644
--- a/src/Util/MIMETypeUtil.h
+++ b/src/Util/MIMETypeUtil.h
@@ -1,6 +1,7 @@
 //  Copyright © 2016 Open Whisper Systems. All rights reserved.
 
 extern NSString *const OWSMimeTypeApplicationOctetStream;
+extern NSString *const OWSMimeTypeImagePng;
 
 @interface MIMETypeUtil : NSObject
 
diff --git a/src/Util/MIMETypeUtil.m b/src/Util/MIMETypeUtil.m
index 10d9f4f88..6e89ee86b 100644
--- a/src/Util/MIMETypeUtil.m
+++ b/src/Util/MIMETypeUtil.m
@@ -4,6 +4,7 @@
 #endif
 
 NSString *const OWSMimeTypeApplicationOctetStream = @"application/octet-stream";
+NSString *const OWSMimeTypeImagePng = @"image/png";
 
 @implementation MIMETypeUtil
 
@@ -43,7 +44,7 @@ NSString *const OWSMimeTypeApplicationOctetStream = @"application/octet-stream";
     return @{
         @"image/jpeg" : @"jpeg",
         @"image/pjpeg" : @"jpeg",
-        @"image/png" : @"png",
+        OWSMimeTypeImagePng : @"png",
         @"image/tiff" : @"tif",
         @"image/x-tiff" : @"tif",
         @"image/bmp" : @"bmp",
@@ -102,8 +103,8 @@ NSString *const OWSMimeTypeApplicationOctetStream = @"application/octet-stream";
 
 + (NSDictionary *)supportedImageExtensionTypesToMIMETypes {
     return @{
-        @"png" : @"image/png",
-        @"x-png" : @"image/png",
+        @"png" : OWSMimeTypeImagePng,
+        @"x-png" : OWSMimeTypeImagePng,
         @"jfif" : @"image/jpeg",
         @"jfif" : @"image/pjpeg",
         @"jfif-tbnl" : @"image/jpeg",
diff --git a/src/Util/UIImage+contentTypes.m b/src/Util/UIImage+contentTypes.m
index c1e4110de..d52bb450a 100644
--- a/src/Util/UIImage+contentTypes.m
+++ b/src/Util/UIImage+contentTypes.m
@@ -1,11 +1,7 @@
-//
-//  UIImage+contentTypes.m
-//  Signal
-//
 //  Created by Frederic Jacobs on 21/12/14.
 //  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
-//
 
+#import "MIMETypeUtil.h"
 #import "UIImage+contentTypes.h"
 
 @implementation UIImage (contentTypes)
@@ -18,7 +14,7 @@
         case 0xFF:
             return @"image/jpeg";
         case 0x89:
-            return @"image/png";
+            return OWSMimeTypeImagePng;
         case 0x47:
             return @"image/gif";
         case 0x49: