From 77f02a5917151ecb56419fcd1b428cbfc5472c02 Mon Sep 17 00:00:00 2001 From: Harris Date: Wed, 15 Sep 2021 11:04:43 +1000 Subject: [PATCH] fix: copy message fixed for single messages --- .../conversation/v2/ConversationActivityV2.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index c439862ba..e0453e10c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -1338,12 +1338,21 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe override fun copyMessages(messages: Set) { val sortedMessages = messages.sortedBy { it.dateSent } + val messageSize = sortedMessages.size val builder = StringBuilder() - for (message in sortedMessages) { + val messageIterator = sortedMessages.iterator() + while (messageIterator.hasNext()) { + val message = messageIterator.next() val body = MentionUtilities.highlightMentions(message.body, threadID, this) if (TextUtils.isEmpty(body)) { continue } - val formattedTimestamp = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), message.timestamp) - builder.append("$formattedTimestamp: $body").append('\n') + if (messageSize > 1) { + val formattedTimestamp = DateUtils.getDisplayFormattedTimeSpanString(this, Locale.getDefault(), message.timestamp) + builder.append("$formattedTimestamp: ") + } + builder.append(body) + if (messageIterator.hasNext()) { + builder.append('\n') + } } if (builder.isNotEmpty() && builder[builder.length - 1] == '\n') { builder.deleteCharAt(builder.length - 1)