Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

don't create a CW when sharing text to Tusky (#1836)

This commit is contained in:
Konrad Pozniak 2020-06-21 18:25:17 +02:00 committed by GitHub
parent 74bd493878
commit 836b7f3f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View File

@ -203,19 +203,17 @@ 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
} else if (type == "text/plain" && intent.action == Intent.ACTION_SEND) {
if (shareBody != null) {
if (!subject.isNullOrBlank() && subject !in shareBody) {
composeContentWarningField.setText(subject)
viewModel.showContentWarning.value = true
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)
@ -226,7 +224,6 @@ class ComposeActivity : BaseActivity(),
}
}
}
}
private fun setupReplyViews(replyingStatusAuthor: String?) {
if (replyingStatusAuthor != null) {