Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix styling issues when covering mentions.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-06 11:35:05 -04:00
parent 71aa17bad6
commit eae066b3a2
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragmentArgs.kt
View File

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.attachments.Attachment
import org.thoughtcrime.securesms.color.ViewColorSet
import org.thoughtcrime.securesms.conversation.ConversationMessage
import org.thoughtcrime.securesms.conversation.MessageStyler
import org.thoughtcrime.securesms.conversation.mutiselect.Multiselect
import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
import org.thoughtcrime.securesms.database.SignalDatabase
@@ -117,7 +118,6 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
.withMentions(conversationMessage.mentions)
.withTimestamp(conversationMessage.messageRecord.timestamp)
.withExpiration(conversationMessage.messageRecord.expireStarted + conversationMessage.messageRecord.expiresIn)
.withBodyRanges(conversationMessage.messageRecord.messageRanges)
if (conversationMessage.multiselectCollection.isTextSelected(selectedParts)) {
val mediaMessage: MmsMessageRecord? = conversationMessage.messageRecord as? MmsMessageRecord
@@ -126,10 +126,14 @@ data class MultiselectForwardFragmentArgs @JvmOverloads constructor(
PartAuthority.getAttachmentStream(context, textSlideUri).use {
val body = StreamUtil.readFullyAsString(it)
val msg = ConversationMessage.ConversationMessageFactory.createWithUnresolvedData(context, mediaMessage, body, conversationMessage.threadRecipient)
builder.withDraftText(msg.getDisplayBody(context).toString())
val displayText = msg.getDisplayBody(context)
builder.withDraftText(displayText.toString())
.withBodyRanges(MessageStyler.getStyling(displayText))
}
} else {
builder.withDraftText(conversationMessage.getDisplayBody(context).toString())
val displayText = conversationMessage.getDisplayBody(context)
builder.withDraftText(displayText.toString())
.withBodyRanges(MessageStyler.getStyling(displayText))
}
val linkPreview = mediaMessage?.linkPreviews?.firstOrNull()