From 0a2696113c29848b2538fc35d353cfffe003403c Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 4 Aug 2022 10:54:29 -0300 Subject: [PATCH] Allow long form messages if stories aren't enabled. Fixes #12369 --- .../securesms/mediasend/v2/MediaSelectionRepository.kt | 2 +- .../securesms/mediasend/v2/review/AddMessageDialogFragment.kt | 4 +++- 2 files changed, 4 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 39acff3129..4679f35641 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 @@ -159,7 +159,7 @@ class MediaSelectionRepository(context: Context) { } private fun getTruncatedBody(body: String?): String? { - return if (body.isNullOrEmpty()) { + return if (!Stories.isFeatureEnabled() || body.isNullOrEmpty()) { body } else { val iterator = BreakIteratorCompat.getInstance() diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt index 23a22c673b..54e04a1742 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/AddMessageDialogFragment.kt @@ -79,7 +79,9 @@ class AddMessageDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_a override fun onViewCreated(view: View, savedInstanceState: Bundle?) { input = view.findViewById(R.id.add_a_message_input) - EditTextUtil.addGraphemeClusterLimitFilter(input, Stories.MAX_BODY_SIZE) + if (Stories.isFeatureEnabled()) { + EditTextUtil.addGraphemeClusterLimitFilter(input, Stories.MAX_BODY_SIZE) + } input.setText(requireArguments().getCharSequence(ARG_INITIAL_TEXT))