Skip to content

Fix message formatting #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 3 commits into from
Dec 17, 2025
Merged

Fix message formatting #1788

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae510cc
Fix message formatting
SessionHero01 Dec 16, 2025
04a63b3
Merge branch 'dev' into fix-group-message-formatting
SessionHero01 Dec 16, 2025
d981244
Merge branch 'dev' into fix-group-message-formatting
SessionHero01 Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
import android.content.Context
import android.text.Spannable
import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.style.ForegroundColorSpan
import com.squareup.phrase.Phrase
import network.loki.messenger.R
Expand Down Expand Up @@ -177,29 +178,34 @@ class MessageFormatter @Inject constructor(
context.getString(R.string.communityInvitation)
}

// Show a placeholder text for messages with attachments
lastMessage is MmsMessageRecord -> {
val placeholderBody = lastMessage.slideDeck.body
val messageBody = lastMessage.body

if (placeholderBody.isNotBlank()) {
if (messageBody.isNotBlank()) {
"$placeholderBody: $messageBody"
} else {
placeholderBody
}
} else {
messageBody
}
}

else -> {
val text = formatMessageBody(
val bodyText = formatMessageBody(
context = context,
message = lastMessage,
threadRecipient = thread.recipient
)

// This is used to show a placeholder text for MMS messages in the snippet,
// for example, "<image> Attachment"
val mmsPlaceholderBody = (lastMessage as? MmsMessageRecord)?.slideDeck?.body

val text = when {
// If both body and placeholder are blank, return empty string
bodyText.isBlank() && mmsPlaceholderBody.isNullOrBlank() -> ""

// If both body and placeholder are non-blank, combine them
bodyText.isNotBlank() && !mmsPlaceholderBody.isNullOrBlank() ->
SpannableStringBuilder(mmsPlaceholderBody)
.append(": ")
.append(bodyText)

// If only placeholder is non-blank, use it
!mmsPlaceholderBody.isNullOrBlank() -> mmsPlaceholderBody

// Otherwise, use the body text
else -> bodyText
}

when {
// There are certain messages that we want to keep their formatting
lastMessage.groupUpdateMessage?.isGroupLeavingKind() == true ||
Expand Down