empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add handling for text slide deck in sendMessage.

Browse source
This commit is contained in:
Alex Hart 2023-07-13 14:35:13 -03:00 • committed by Nicholas Tinsley
parent 676412019c
commit 82b3036b77
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRepository.kt
View file

@ -45,6 +45,7 @@ import org.thoughtcrime.securesms.components.reminder.UnauthorizedReminder
import org.thoughtcrime.securesms.contactshare.Contact
import org.thoughtcrime.securesms.contactshare.ContactUtil
import org.thoughtcrime.securesms.conversation.ConversationMessage
import org.thoughtcrime.securesms.conversation.MessageSendType
import org.thoughtcrime.securesms.conversation.colors.GroupAuthorNameColorHelper
import org.thoughtcrime.securesms.conversation.colors.NameColor
import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
@ -93,6 +94,7 @@ import org.thoughtcrime.securesms.sms.MessageSender.PreUploadResult
import org.thoughtcrime.securesms.util.BitmapUtil
import org.thoughtcrime.securesms.util.DrawableUtil
import org.thoughtcrime.securesms.util.MediaUtil
import org.thoughtcrime.securesms.util.MessageUtil
import org.thoughtcrime.securesms.util.SignalLocalMetrics
import org.thoughtcrime.securesms.util.Util
import org.thoughtcrime.securesms.util.hasLinkPreview
@ -214,10 +216,22 @@ class ConversationRepository(
return@create
}
val splitMessage: MessageUtil.SplitResult = MessageUtil.getSplitMessage(
applicationContext,
body,
MessageSendType.SignalMessageSendType.calculateCharacters(body).maxPrimaryMessageSize
)
val outgoingMessageSlideDeck: SlideDeck? = splitMessage.textSlide.map {
(slideDeck ?: SlideDeck()).apply {
addSlide(it)
}
}.orElse(slideDeck)
val message = OutgoingMessage(
threadRecipient = threadRecipient,
sentTimeMillis = System.currentTimeMillis(),
body = body,
body = splitMessage.body,
expiresIn = threadRecipient.expiresInSeconds.seconds.inWholeMilliseconds,
isUrgent = true,
isSecure = true,
@ -228,7 +242,7 @@ class ConversationRepository(
mentions = mentions,
sharedContacts = contacts,
linkPreviews = linkPreviews,
attachments = slideDeck?.asAttachments() ?: emptyList()
attachments = outgoingMessageSlideDeck?.asAttachments() ?: emptyList()
)
if (preUploadResults.isEmpty()) {