From 9da8d1ac3f6b2982deba3268747aecee79cfa6e3 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 20 Dec 2018 12:35:01 -0700 Subject: [PATCH 1/2] "Bump build to 2.32.2.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 595f3376c..271e2e857 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -32,7 +32,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.32.1 + 2.32.2 CFBundleSignature ???? CFBundleURLTypes @@ -49,7 +49,7 @@ CFBundleVersion - 2.32.1.0 + 2.32.2.0 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 98e2b1301..bfbca660f 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 2.32.1 + 2.32.2 CFBundleVersion - 2.32.1.0 + 2.32.2.0 ITSAppUsesNonExemptEncryption NSAppTransportSecurity From f27d0ef992e3fdab5fbe2fa64cbfea606fa2fc11 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 20 Dec 2018 12:25:58 -0700 Subject: [PATCH 2/2] Fix SAE crash --- .../ViewControllers/SharingThreadPickerViewController.m | 2 ++ SignalMessaging/utils/ThreadUtil.h | 1 + SignalMessaging/utils/ThreadUtil.m | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index 07cf5b808..2b3ae178e 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -232,6 +232,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); - (void)attachmentApproval:(AttachmentApprovalViewController *)approvalViewController didApproveAttachments:(NSArray *)attachments + messageText:(NSString *_Nullable)messageText { [ThreadUtil addThreadToProfileWhitelistIfEmptyContactThread:self.thread]; [self tryToSendMessageWithBlock:^(SendCompletionBlock sendCompletion) { @@ -243,6 +244,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); // SAE runs as long as it needs. // TODO ALBUMS - send album via SAE outgoingMessage = [ThreadUtil sendMessageNonDurablyWithAttachment:attachments.firstObject + messageBody:messageText inThread:self.thread quotedReplyModel:nil messageSender:self.messageSender diff --git a/SignalMessaging/utils/ThreadUtil.h b/SignalMessaging/utils/ThreadUtil.h index 2d7908058..1ffdfc6a7 100644 --- a/SignalMessaging/utils/ThreadUtil.h +++ b/SignalMessaging/utils/ThreadUtil.h @@ -73,6 +73,7 @@ NS_ASSUME_NONNULL_BEGIN // Used by SAE, otherwise we should use the durable `enqueue` counterpart + (TSOutgoingMessage *)sendMessageNonDurablyWithAttachment:(SignalAttachment *)attachment + messageBody:(nullable NSString *)messageBody inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel messageSender:(OWSMessageSender *)messageSender diff --git a/SignalMessaging/utils/ThreadUtil.m b/SignalMessaging/utils/ThreadUtil.m index 86e1b9287..56fd180ff 100644 --- a/SignalMessaging/utils/ThreadUtil.m +++ b/SignalMessaging/utils/ThreadUtil.m @@ -214,6 +214,7 @@ NS_ASSUME_NONNULL_BEGIN } + (TSOutgoingMessage *)sendMessageNonDurablyWithAttachment:(SignalAttachment *)attachment + messageBody:(nullable NSString *)messageBody inThread:(TSThread *)thread quotedReplyModel:(nullable OWSQuotedReplyModel *)quotedReplyModel messageSender:(OWSMessageSender *)messageSender @@ -232,7 +233,7 @@ NS_ASSUME_NONNULL_BEGIN TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initOutgoingMessageWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:thread - messageBody:attachment.captionText + messageBody:messageBody attachmentIds:[NSMutableArray new] expiresInSeconds:expiresInSeconds expireStartedAt:0