signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'mlin/PR/IOS-723' into release/3.14.0

Browse Source
This commit is contained in:
Michelle Linington 2020-08-07 12:22:38 -07:00
commit 16bade97bb
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
View File

@ -3748,8 +3748,6 @@ typedef enum : NSUInteger {
- (void)didPasteAttachment:(SignalAttachment *_Nullable)attachment
{
OWSLogError(@"");
// If the thing we pasted is sticker-like, send it immediately
// and render it borderless.
if (attachment.isBorderless) {
@ -3781,8 +3779,6 @@ typedef enum : NSUInteger {
- (void)tryToSendAttachments:(NSArray<SignalAttachment *> *)attachments messageBody:(MessageBody *_Nullable)messageBody
{
OWSLogError(@"");
DispatchMainThreadSafe(^{
__weak ConversationViewController *weakSelf = self;
if ([self isBlockedConversation]) {

15
SignalMessaging/utils/OutboundMessage+OWS.swift
View File

@ -6,7 +6,7 @@ import Foundation
extension OutgoingMessagePreparer {
@objc
public convenience init(messageBody: MessageBody,
public convenience init(messageBody: MessageBody?,
mediaAttachments: [SignalAttachment],
thread: TSThread,
quotedReplyModel: OWSQuotedReplyModel?,
@ -14,18 +14,19 @@ extension OutgoingMessagePreparer {
var attachments = mediaAttachments
let truncatedText: String?
if messageBody.text.lengthOfBytes(using: .utf8) <= kOversizeTextMessageSizeThreshold {
truncatedText = messageBody.text
} else {
truncatedText = messageBody.text.truncated(toByteCount: kOversizeTextMessageSizeThreshold)
if let dataSource = DataSourceValue.dataSource(withOversizeText: messageBody.text) {
if let messageText = messageBody?.text, messageText.lengthOfBytes(using: .utf8) <= kOversizeTextMessageSizeThreshold {
truncatedText = messageText.truncated(toByteCount: kOversizeTextMessageSizeThreshold)
if let dataSource = DataSourceValue.dataSource(withOversizeText: messageText) {
let attachment = SignalAttachment.attachment(dataSource: dataSource,
dataUTI: kOversizeTextAttachmentUTI)
attachments.append(attachment)
} else {
owsFailDebug("dataSource was unexpectedly nil")
}
} else {
truncatedText = messageBody?.text
}
let expiresInSeconds: UInt32
@ -67,7 +68,7 @@ extension OutgoingMessagePreparer {
let message = TSOutgoingMessageBuilder(thread: thread,
messageBody: truncatedText,
bodyRanges: messageBody.ranges,
bodyRanges: messageBody?.ranges,
expiresInSeconds: expiresInSeconds,
isVoiceMessage: isVoiceMessage,
quotedMessage: quotedMessage,