From b04acd8ae0071ad7219ad0299dd7cd9cd1bb38f2 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 22 Mar 2022 15:12:44 -0300 Subject: [PATCH] Add caption to outgoing stories. --- .../securesms/mediasend/v2/MediaSelectionRepository.kt | 1 + .../securesms/stories/viewer/page/StoryViewerPageFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt index 16b53bab3..7ac5d60cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionRepository.kt @@ -93,6 +93,7 @@ class MediaSelectionRepository(context: Context) { for (media in updatedMedia) { Log.w(TAG, media.uri.toString() + " : " + media.transformProperties.map { t: TransformProperties -> "" + t.isVideoTrim }.orElse("null")) + media.setCaption(trimmedBody) } val singleRecipient: Recipient? = singleContact?.let { Recipient.resolved(it.recipientId) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index 453a9b7e6..f1f8b2f0c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -477,8 +477,8 @@ class StoryViewerPageFragment : @SuppressLint("SetTextI18n") private fun presentCaption(caption: TextView, largeCaption: TextView, largeCaptionOverlay: View, storyPost: StoryPost) { - val displayBody = if (storyPost.content is StoryPost.Content.AttachmentContent) { - storyPost.conversationMessage.getDisplayBody(requireContext()) + val displayBody: String = if (storyPost.content is StoryPost.Content.AttachmentContent) { + storyPost.content.attachment.caption ?: "" } else { "" }