From 90b1f522aeb6aa94ab4d9bb6c6fb3361b54fe444 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 12 Jan 2021 15:13:39 +0100 Subject: [PATCH] Fixed picking a GIF from the keyboard while inside a chat room --- .../main/java/org/linphone/activities/main/MainActivity.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt index 0fa45178e..c83af23cd 100644 --- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt +++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt @@ -298,7 +298,12 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin sharedViewModel.filesToShare.value = list } - handleSendChatRoom(intent) + // Check that the current fragment hasn't already handled the event on filesToShare + // If it has, don't go further. + // For example this may happen when picking a GIF from the keyboard while inside a chat room + if (!sharedViewModel.filesToShare.value.isNullOrEmpty()) { + handleSendChatRoom(intent) + } } private suspend fun handleSendMultipleFiles(intent: Intent) {