|
|
@ -256,19 +256,17 @@ class ComposeActivity : BaseActivity(), |
|
|
|
for (uri in uriList) { |
|
|
|
for (uri in uriList) { |
|
|
|
pickMedia(uri) |
|
|
|
pickMedia(uri) |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (type == "text/plain") { |
|
|
|
} else if (type == "text/plain" && intent.action == Intent.ACTION_SEND) { |
|
|
|
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) { |
|
|
|
val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT) |
|
|
|
if (!subject.isNullOrBlank() && subject !in shareBody) { |
|
|
|
val text = intent.getStringExtra(Intent.EXTRA_TEXT).orEmpty() |
|
|
|
composeContentWarningField.setText(subject) |
|
|
|
val shareBody = if (!subject.isNullOrBlank() && subject !in text) { |
|
|
|
viewModel.showContentWarning.value = true |
|
|
|
subject + '\n' + text |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
text |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (shareBody.isNotBlank()) { |
|
|
|
val start = composeEditField.selectionStart.coerceAtLeast(0) |
|
|
|
val start = composeEditField.selectionStart.coerceAtLeast(0) |
|
|
|
val end = composeEditField.selectionEnd.coerceAtLeast(0) |
|
|
|
val end = composeEditField.selectionEnd.coerceAtLeast(0) |
|
|
|
val left = min(start, end) |
|
|
|
val left = min(start, end) |
|
|
@ -279,7 +277,6 @@ class ComposeActivity : BaseActivity(), |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun setupReplyViews(replyingStatusAuthor: String?) { |
|
|
|
private fun setupReplyViews(replyingStatusAuthor: String?) { |
|
|
|
if (replyingStatusAuthor != null) { |
|
|
|
if (replyingStatusAuthor != null) { |
|
|
|