From cf48fb30769d9b38f6abd1be25441949e0743520 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 14 Dec 2018 11:03:54 -0700
Subject: [PATCH 1/2] Don't use caption field

---
 .../ConversationView/ConversationViewController.m      | 10 ++++++----
 .../AttachmentApprovalViewController.swift             |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 44a494465..4a7981bd8 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2815,7 +2815,7 @@ typedef enum : NSUInteger {
     }
 }
 
-- (void)sendMessageAttachments:(NSArray<SignalAttachment *> *)attachments
+- (void)sendMessageAttachments:(NSArray<SignalAttachment *> *)attachments messageText:(nullable NSString *)messageText
 {
     OWSAssertIsOnMainThread();
     for (SignalAttachment *attachment in attachments) {
@@ -2824,8 +2824,9 @@ typedef enum : NSUInteger {
     }
 
     BOOL didAddToProfileWhitelist = [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread];
+
     TSOutgoingMessage *message = [ThreadUtil enqueueMessageWithAttachments:attachments
-                                                               messageBody:nil
+                                                               messageBody:messageText
                                                                   inThread:self.thread
                                                           quotedReplyModel:self.inputToolbar.quotedReply];
 
@@ -3546,7 +3547,7 @@ typedef enum : NSUInteger {
         }
 
         if (skipApprovalDialog) {
-            [self sendMessageAttachments:attachments];
+            [self sendMessageAttachments:attachments messageText:nil];
         } else {
             OWSNavigationController *modal =
                 [AttachmentApprovalViewController wrappedInNavControllerWithAttachments:attachments
@@ -3662,8 +3663,9 @@ typedef enum : NSUInteger {
 
 - (void)attachmentApproval:(AttachmentApprovalViewController *)attachmentApproval
      didApproveAttachments:(NSArray<SignalAttachment *> *)attachments
+               messageText:(nullable NSString *)messageText
 {
-    [self sendMessageAttachments:attachments];
+    [self sendMessageAttachments:attachments messageText:messageText];
     [self dismissViewControllerAnimated:YES completion:nil];
     // We always want to scroll to the bottom of the conversation after the local user
     // sends a message.  Normally, this is taken care of in yapDatabaseModified:, but
diff --git a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
index e12babbc8..06e76d7e2 100644
--- a/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
+++ b/SignalMessaging/ViewControllers/AttachmentApprovalViewController.swift
@@ -8,7 +8,7 @@ import MediaPlayer
 
 @objc
 public protocol AttachmentApprovalViewControllerDelegate: class {
-    func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment])
+    func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didApproveAttachments attachments: [SignalAttachment], messageText: String?)
     func attachmentApproval(_ attachmentApproval: AttachmentApprovalViewController, didCancelAttachments attachments: [SignalAttachment])
 }
 
@@ -326,11 +326,14 @@ public class AttachmentApprovalViewController: UIPageViewController, UIPageViewC
         captioningToolbar.isUserInteractionEnabled = false
         captioningToolbar.isHidden = true
 
-        approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments)
+        approvalDelegate?.attachmentApproval(self, didApproveAttachments: attachments, messageText: captioningToolbar.captionText)
     }
 
     func captioningToolbar(_ captioningToolbar: CaptioningToolbar, textViewDidChange textView: UITextView) {
-        currentItem.attachment.captionText = textView.text
+        // For 2.32.0 we only have one input bar - and it's for mesageBody text, not for caption text.
+        // For 2.33.0 there are potentially two input bars - one for message body and one for caption text.
+        // Commenting this out for now, but we'll have to resolve this merge conflict when RI'ing to 2.33
+        // currentItem.attachment.captionText = textView.text
     }
 }
 

From 31a1fe10c7cbbb636233c86bfd7a08e1d33d9e6b Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 14 Dec 2018 11:13:09 -0700
Subject: [PATCH 2/2] "Bump build to 2.32.1.0."

---
 Signal/Signal-Info.plist        | 4 ++--
 SignalShareExtension/Info.plist | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 0dcf5b4aa..595f3376c 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.32.0</string>
+	<string>2.32.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.32.0.23</string>
+	<string>2.32.1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist
index 223f2664b..98e2b1301 100644
--- a/SignalShareExtension/Info.plist
+++ b/SignalShareExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.32.0</string>
+	<string>2.32.1</string>
 	<key>CFBundleVersion</key>
-	<string>2.32.0.23</string>
+	<string>2.32.1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>