From dee26e6e0a3496fca476239c43dab60e0b48cb98 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.john.kirk@gmail.com>
Date: Fri, 2 Sep 2016 10:22:06 -0400
Subject: [PATCH] Use PNG constant

// FREEBIE
---
 Podfile.lock                                  |  6 +--
 .../view controllers/MessagesViewController.m | 46 ++++++++++---------
 .../view controllers/NewGroupViewController.m | 17 +++----
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 856386904..205e3f436 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -44,7 +44,7 @@ PODS:
   - Reachability (3.2)
   - SAMKeychain (1.5.0)
   - SCWaveformView (1.0.0)
-  - SignalServiceKit (0.1.0):
+  - SignalServiceKit (0.2.0):
     - '25519'
     - AFNetworking
     - AxolotlKit
@@ -131,7 +131,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   SignalServiceKit:
-    :commit: 80be2b6db99ceb5e8f77d84a219d0c2a9dd9f5a2
+    :commit: e61d89666e408d3a9d124f897ee2bf274b45712e
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6
@@ -155,7 +155,7 @@ SPEC CHECKSUMS:
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
-  SignalServiceKit: 84781a0e45a7eead501a3e35065a1b32dcbbe0ac
+  SignalServiceKit: 4e7a552635e10f4d94f0a047fc6554e932340b30
   SocketRocket: 3f77ec2104cc113add553f817ad90a77114f5d43
   SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 1f82422dd..04ad7a740 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -8,48 +8,50 @@
 
 #import "AppDelegate.h"
 
-#import <AddressBookUI/AddressBookUI.h>
-#import <ContactsUI/CNContactViewController.h>
-#import <MobileCoreServices/UTCoreTypes.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <YapDatabase/YapDatabaseView.h>
-#import <JSQMessagesViewController/JSQMessagesBubbleImage.h>
-#import <JSQMessagesViewController/JSQMessagesBubbleImageFactory.h>
-#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
-#import <JSQMessagesViewController/UIColor+JSQMessages.h>
-#import <JSQMessagesViewController/JSQMessagesCollectionViewFlowLayoutInvalidationContext.h>
-#import <JSQMessagesViewController/JSQSystemSoundPlayer+JSQMessages.h>
-#import <JSQSystemSoundPlayer.h>
-#import "OWSContactsManager.h"
 #import "DJWActionSheet+OWS.h"
 #import "Environment.h"
 #import "FingerprintViewController.h"
 #import "FullImageViewController.h"
-#import "OWSCallCollectionViewCell.h"
-#import "OWSDisplayedMessageCollectionViewCell.h"
 #import "MessagesViewController.h"
 #import "NSDate+millisecondTimeStamp.h"
 #import "NewGroupViewController.h"
+#import "OWSCall.h"
+#import "OWSCallCollectionViewCell.h"
+#import "OWSContactsManager.h"
+#import "OWSDisplayedMessageCollectionViewCell.h"
+#import "OWSErrorMessage.h"
+#import "OWSInfoMessage.h"
+#import "OWSMessagesBubblesSizeCalculator.h"
 #import "PhoneManager.h"
 #import "PreferencesUtil.h"
 #import "ShowGroupMembersViewController.h"
 #import "SignalKeyingStorage.h"
 #import "TSAttachmentPointer.h"
+#import "TSCall.h"
 #import "TSContentAdapters.h"
 #import "TSDatabaseView.h"
-#import "OWSMessagesBubblesSizeCalculator.h"
-#import "OWSInfoMessage.h"
-#import "TSInfoMessage.h"
-#import "OWSErrorMessage.h"
 #import "TSErrorMessage.h"
-#import "OWSCall.h"
-#import "TSCall.h"
 #import "TSIncomingMessage.h"
+#import "TSInfoMessage.h"
 #import "TSInvalidIdentityKeyErrorMessage.h"
 #import "TSMessagesManager+attachments.h"
 #import "TSMessagesManager+sendMessages.h"
 #import "UIFont+OWS.h"
 #import "UIUtil.h"
+#import <AddressBookUI/AddressBookUI.h>
+#import <ContactsUI/CNContactViewController.h>
+#import <JSQMessagesViewController/JSQMessagesBubbleImage.h>
+#import <JSQMessagesViewController/JSQMessagesBubbleImageFactory.h>
+#import <JSQMessagesViewController/JSQMessagesCollectionViewFlowLayoutInvalidationContext.h>
+#import <JSQMessagesViewController/JSQMessagesTimestampFormatter.h>
+#import <JSQMessagesViewController/JSQSystemSoundPlayer+JSQMessages.h>
+#import <JSQMessagesViewController/UIColor+JSQMessages.h>
+#import <JSQSystemSoundPlayer.h>
+#import <MobileCoreServices/UTCoreTypes.h>
+#import <SignalServiceKit/MimeTypeUtil.h>
+#import <SignalServiceKit/SignalRecipient.h>
+#import <SignalServiceKit/TSAccountManager.h>
+#import <YapDatabase/YapDatabaseView.h>
 
 @import Photos;
 
@@ -2019,7 +2021,7 @@ typedef enum : NSUInteger {
 
     if (newGroupModel.groupImage != nil) {
         [[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(newGroupModel.groupImage)
-                                              contentType:@"image/png"
+                                              contentType:OWSMimeTypeImagePng
                                                 inMessage:message
                                                    thread:groupThread
                                                   success:nil
diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/view controllers/NewGroupViewController.m
index f696278e2..2c3761961 100644
--- a/Signal/src/view controllers/NewGroupViewController.m	
+++ b/Signal/src/view controllers/NewGroupViewController.m	
@@ -6,22 +6,23 @@
 //  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
 //
 
-#import <MobileCoreServices/UTCoreTypes.h>
-#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
-#import <SignalServiceKit/TSAccountManager.h>
-#import <SignalServiceKit/TSMessagesManager+attachments.h>
-#import <SignalServiceKit/TSMessagesManager+sendMessages.h>
-#import "OWSContactsManager.h"
+#import "NewGroupViewController.h"
 #import "DJWActionSheet+OWS.h"
 #import "Environment.h"
 #import "FunctionalUtil.h"
-#import "NewGroupViewController.h"
+#import "OWSContactsManager.h"
 #import "SecurityUtils.h"
 #import "SignalKeyingStorage.h"
 #import "SignalsViewController.h"
 #import "TSOutgoingMessage.h"
 #import "UIImage+normalizeImage.h"
 #import "UIUtil.h"
+#import <MobileCoreServices/UTCoreTypes.h>
+#import <SignalServiceKit/MimeTypeUtil.h>
+#import <SignalServiceKit/NSDate+millisecondTimeStamp.h>
+#import <SignalServiceKit/TSAccountManager.h>
+#import <SignalServiceKit/TSMessagesManager+attachments.h>
+#import <SignalServiceKit/TSMessagesManager+sendMessages.h>
 
 static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue";
 
@@ -139,7 +140,7 @@ static NSString *const kUnwindToMessagesViewSegue = @"UnwindToMessagesViewSegue"
                        message.groupMetaMessage = TSGroupMessageNew;
                        if (model.groupImage != nil) {
                            [[TSMessagesManager sharedManager] sendAttachment:UIImagePNGRepresentation(model.groupImage)
-                               contentType:@"image/png"
+                               contentType:OWSMimeTypeImagePng
                                inMessage:message
                                thread:self.thread
                                success:^{