From 511ff83edb1d75074c2cb5d8a6bf98683a352e51 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 6 Nov 2017 22:31:47 -0500
Subject: [PATCH 1/4] Bumped version numbers for hotfix v2.18.2.

// FREEBIE
---
 Signal/Signal-Info.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index bc3f5cdac..e77575f42 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.18.1</string>
+	<string>2.18.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -55,7 +55,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.18.1.0</string>
+	<string>2.18.2.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>

From 167a171cafb8146f590d914f43c70a5b3fccf22e Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 7 Nov 2017 09:46:34 -0500
Subject: [PATCH 2/4] Fix crashes in attachment approval view.

// FREEBIE
---
 .../src/ViewControllers/AttachmentApprovalViewController.swift  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/AttachmentApprovalViewController.swift b/Signal/src/ViewControllers/AttachmentApprovalViewController.swift
index 06bdf2ec9..c2ba00799 100644
--- a/Signal/src/ViewControllers/AttachmentApprovalViewController.swift
+++ b/Signal/src/ViewControllers/AttachmentApprovalViewController.swift
@@ -155,7 +155,7 @@ class AttachmentApprovalViewController: OWSViewController {
                                     backgroundColor:color,
                                     width:buttonWidth,
                                     height:buttonHeight,
-                                    target:target,
+                                    target:self,
                                     selector:action)
     }
 

From 1f35a1d29cb493e64d6259953bacd4cbb84db24c Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 7 Nov 2017 20:34:52 -0500
Subject: [PATCH 3/4] Show attachment approval for GIFs.

// FREEBIE
---
 .../ConversationView/ConversationViewController.m   | 12 +++++-------
 .../GifPicker/GifPickerViewController.swift         | 13 ++++---------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 91c45177b..816087c66 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3226,15 +3226,13 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
 
 #pragma mark GifPickerViewControllerDelegate
 
-- (void)gifPickerWillSend
+- (void)gifPickerDidSelectWithAttachment:(SignalAttachment *)attachment
 {
+    OWSAssert(attachment);
+
+    [self tryToSendAttachmentIfApproved:attachment];
+
     [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread];
-}
-
-- (void)gifPickerDidSendWithOutgoingMessage:(TSOutgoingMessage *)message
-{
-    [self messageWasSent:message];
-
     [self ensureDynamicInteractions];
 }
 
diff --git a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
index 31d7f6e63..606f462f5 100644
--- a/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
+++ b/Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
@@ -6,8 +6,7 @@ import Foundation
 
 @objc
 protocol GifPickerViewControllerDelegate: class {
-    func gifPickerWillSend()
-    func gifPickerDidSend(outgoingMessage: TSOutgoingMessage)
+    func gifPickerDidSelect(attachment: SignalAttachment)
 }
 
 class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollectionViewDataSource, UICollectionViewDelegate, GifPickerLayoutDelegate {
@@ -363,13 +362,9 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
             }
             let attachment = SignalAttachment(dataSource: dataSource, dataUTI: asset.rendition.utiType)
 
-            strongSelf.delegate?.gifPickerWillSend()
-
-            let outgoingMessage = ThreadUtil.sendMessage(with: attachment, in: strongSelf.thread, messageSender: strongSelf.messageSender)
-
-            strongSelf.delegate?.gifPickerDidSend(outgoingMessage: outgoingMessage)
-
-            strongSelf.dismiss(animated: true, completion: nil)
+            strongSelf.dismiss(animated: true, completion: {
+                strongSelf.delegate?.gifPickerDidSelect(attachment: attachment)
+            })
         }.catch { [weak self] error in
             guard let strongSelf = self else {
                 Logger.info("\(GifPickerViewController.TAG) ignoring failure, since VC was dismissed before fetching finished.")

From 40d2e003a40db305f61720c495d3db70fa5dbe3b Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 7 Nov 2017 20:39:28 -0500
Subject: [PATCH 4/4] Bump build to 2.18.2.1.

// FREEBIE
---
 Signal/Signal-Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index e77575f42..b854a92a3 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -55,7 +55,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.18.2.0</string>
+	<string>2.18.2.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>