File tree Expand file tree Collapse file tree 1 file changed +17
-0
lines changed
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages Expand file tree Collapse file tree 1 file changed +17
-0
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.auth.LoginStateRepository
3232import org.thoughtcrime.securesms.database.RecipientRepository
3333import org.thoughtcrime.securesms.database.model.GroupThreadStatus
3434import org.thoughtcrime.securesms.database.model.MessageRecord
35+ import org.thoughtcrime.securesms.database.model.MmsMessageRecord
3536import org.thoughtcrime.securesms.database.model.ThreadRecord
3637import org.thoughtcrime.securesms.database.model.content.DisappearingMessageUpdate
3738import 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,
You can’t perform that action at this time.
0 commit comments