Mastodon/Yuito-app-android
1
0
Fork 0
mirror of https://github.com/accelforce/Yuito synced 2025-02-15 19:10:44 +01:00
Code Issues Releases Wiki Activity

Revert "When a plaintext share contains EXTRA_TEXT and a distinct EXTRA_SUBJECT, use EXTRA_SUBJECT as the content warning for the shared status"

Browse Source 
This reverts commit dd8abad8cac3726406045fcfe0e0bd073cc2941f.
This commit is contained in:
kyori19 2020-05-09 22:21:26 +09:00
parent 095e7b96fe
commit 87707be3df
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,14 +253,15 @@ 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 = text ?: subject
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
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)