Skip to content

Commit 4d7aa6d

Browse files
Fix missing attachment placeholder (#1777)
1 parent 02f5d8f commit 4d7aa6d

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/MessageFormatter.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.auth.LoginStateRepository
3232
import org.thoughtcrime.securesms.database.RecipientRepository
3333
import org.thoughtcrime.securesms.database.model.GroupThreadStatus
3434
import org.thoughtcrime.securesms.database.model.MessageRecord
35+
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
3536
import org.thoughtcrime.securesms.database.model.ThreadRecord
3637
import org.thoughtcrime.securesms.database.model.content.DisappearingMessageUpdate
3738
import org.thoughtcrime.securesms.ui.getSubbedCharSequence
@@ -176,6 +177,22 @@ class MessageFormatter @Inject constructor(
176177
context.getString(R.string.communityInvitation)
177178
}
178179

180+
// Show a placeholder text for messages with attachments
181+
lastMessage is MmsMessageRecord -> {
182+
val placeholderBody = lastMessage.slideDeck.body
183+
val messageBody = lastMessage.body
184+
185+
if (placeholderBody.isNotBlank()) {
186+
if (messageBody.isNotBlank()) {
187+
"$placeholderBody: $messageBody"
188+
} else {
189+
placeholderBody
190+
}
191+
} else {
192+
messageBody
193+
}
194+
}
195+
179196
else -> {
180197
val text = formatMessageBody(
181198
context = context,

0 commit comments

Comments
 (0)