From d3910e618b0bbc7e9205f3718bb22005401b3f40 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Sun, 21 Jun 2020 18:25:17 +0200 Subject: [PATCH] don't create a CW when sharing text to Tusky (#1836) --- .../components/compose/ComposeActivity.kt | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 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 dde5d0e1..305a732a 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 @@ -256,25 +256,22 @@ class ComposeActivity : BaseActivity(), for (uri in uriList) { pickMedia(uri) } - } else if (type == "text/plain") { - val action = intent.action - if (action != null && action == Intent.ACTION_SEND) { - val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT) - val text = intent.getStringExtra(Intent.EXTRA_TEXT) - val shareBody = text ?: subject - - if (shareBody != null) { - if (!subject.isNullOrBlank() && subject !in shareBody) { - composeContentWarningField.setText(subject) - viewModel.showContentWarning.value = true - } + } else if (type == "text/plain" && intent.action == Intent.ACTION_SEND) { - val start = composeEditField.selectionStart.coerceAtLeast(0) - val end = composeEditField.selectionEnd.coerceAtLeast(0) - val left = min(start, end) - val right = max(start, end) - composeEditField.text.replace(left, right, shareBody, 0, shareBody.length) - } + val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT) + val text = intent.getStringExtra(Intent.EXTRA_TEXT).orEmpty() + val shareBody = if (!subject.isNullOrBlank() && subject !in text) { + subject + '\n' + text + } else { + text + } + + if (shareBody.isNotBlank()) { + val start = composeEditField.selectionStart.coerceAtLeast(0) + val end = composeEditField.selectionEnd.coerceAtLeast(0) + val left = min(start, end) + val right = max(start, end) + composeEditField.text.replace(left, right, shareBody, 0, shareBody.length) } } }