From c92722f7cec301970c87da5869625891d8b89bf6 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 24 Oct 2018 12:43:31 +0200
Subject: [PATCH] Fixed camera captured image sending using chat

---
 src/android/org/linphone/chat/GroupChatFragment.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index cb1c1ab84..19908d83f 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -338,14 +338,15 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
                     fileToUploadPath = mImageToUploadUri.getPath();
                 }
 
+                if (fileToUploadPath.startsWith("content://") || fileToUploadPath.startsWith("file://")) {
+                    fileToUploadPath = LinphoneUtils.getFilePath(getActivity().getApplicationContext(), Uri.parse(fileToUploadPath));
+                } else if (fileToUploadPath.contains("com.android.contacts/contacts/")) {
+                    fileToUploadPath = LinphoneUtils.getCVSPathFromLookupUri(fileToUploadPath).toString();
+                }
+
                 if (LinphoneUtils.isExtensionImage(fileToUploadPath)) {
                     addImageToPendingList(fileToUploadPath);
                 } else {
-                    if (fileToUploadPath.startsWith("content://") || fileToUploadPath.startsWith("file://")) {
-                        fileToUploadPath = LinphoneUtils.getFilePath(getActivity().getApplicationContext(), Uri.parse(fileToUploadPath));
-                    } else if (fileToUploadPath.contains("com.android.contacts/contacts/")) {
-                        fileToUploadPath = LinphoneUtils.getCVSPathFromLookupUri(fileToUploadPath).toString();
-                    }
                     addFileToPendingList(fileToUploadPath);
                 }
             } else {