mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-04-17 12:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed sharing text multiple times from a third party app to Linphone not working after first one

Browse source
This commit is contained in:
Sylvain Berfini 2026-03-31 14:27:03 +02:00
parent facc19f60e
commit 84ad32a65e
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/linphone/ui/main/MainActivity.kt
View file

@ -642,15 +642,6 @@ class MainActivity : GenericActivity() {
private fun handleSendIntent(intent: Intent, multiple: Boolean) {
val parcelablesUri = arrayListOf<Uri>()
if (intent.type == "text/plain") {
Log.i("$TAG Intent type is [${intent.type}], expecting text in Intent.EXTRA_TEXT")
intent.getStringExtra(Intent.EXTRA_TEXT)?.let { extraText ->
Log.i("$TAG Found extra text in intent, long of [${extraText.length}]")
sharedViewModel.textToShareFromIntent.value = extraText
}
}
if (multiple) {
val parcelables =
intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM)
@ -698,11 +689,23 @@ class MainActivity : GenericActivity() {
if (path != null) list.add(path)
}
var textToShare = ""
if (intent.type == "text/plain") {
Log.i("$TAG Intent type is [${intent.type}], expecting text in Intent.EXTRA_TEXT")
textToShare = intent.getStringExtra(Intent.EXTRA_TEXT).orEmpty()
if (textToShare.isEmpty()) {
Log.e("$TAG Intent.EXTRA_TEXT not found in intent!")
} else {
Log.i("$TAG Found extra text in intent, long of [${textToShare.length}]")
}
}
if (list.isNotEmpty()) {
sharedViewModel.filesToShareFromIntent.value = list
} else {
if (sharedViewModel.textToShareFromIntent.value.orEmpty().isNotEmpty()) {
if (textToShare.isNotEmpty()) {
Log.i("$TAG Found plain text to share")
sharedViewModel.textToShareFromIntent.value = textToShare
} else {
Log.w("$TAG Failed to find at least one file or text to share!")
}

2
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -1002,7 +1002,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
}
sharedViewModel.textToShareFromIntent.observe(viewLifecycleOwner) { text ->
if (text.isNotEmpty()) {
if (text.isNotEmpty() && sharedViewModel.displayedChatRoom != null) {
Log.i("$TAG Found text to share from intent")
sendMessageViewModel.textToSend.value = text