From 903d2154bfede221d612fb6c6643ea0339cc88bc Mon Sep 17 00:00:00 2001 From: Levi Bard Date: Wed, 26 Feb 2020 20:41:02 +0100 Subject: [PATCH] When a plaintext share contains EXTRA_TEXT and a distinct EXTRA_SUBJECT, use EXTRA_SUBJECT as the content warning for the shared status (#1712) --- .../tusky/components/compose/ComposeActivity.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index d53bd6a5..87bc3e44 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -207,15 +207,14 @@ class ComposeActivity : BaseActivity(), if (action != null && action == Intent.ACTION_SEND) { val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT) val text = intent.getStringExtra(Intent.EXTRA_TEXT) - val shareBody = if (subject != null && text != null) { - if (subject != text && !text.contains(subject)) { - String.format("%s\n%s", subject, text) - } else { - text - } - } else text ?: subject + val shareBody = text ?: subject if (shareBody != null) { + if (!subject.isNullOrBlank() && subject !in shareBody) { + composeContentWarningField.setText(subject) + viewModel.showContentWarning.value = true + } + val start = composeEditField.selectionStart.coerceAtLeast(0) val end = composeEditField.selectionEnd.coerceAtLeast(0) val left = min(start, end)