From 445b95e7121139ec5b51f50df7e5e968e9a97883 Mon Sep 17 00:00:00 2001 From: Brieuc Viel Date: Wed, 11 Oct 2017 15:33:20 +0200 Subject: [PATCH] [File sharing] fix Camera Image picking on Samsung devices --- src/android/org/linphone/ChatFragment.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java index 0811b2045..eb97f330d 100644 --- a/src/android/org/linphone/ChatFragment.java +++ b/src/android/org/linphone/ChatFragment.java @@ -1095,12 +1095,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC if (progressDialog != null && progressDialog.isShowing()) { progressDialog.dismiss(); } - String fileName = path.substring(path.lastIndexOf("/") + 1); String extension = LinphoneUtils.getExtensionFromFileName(fileName); LinphoneContent content = LinphoneCoreFactory.instance().createLinphoneContent("image", extension, result, null); content.setName(fileName); - LinphoneChatMessage message = chatRoom.createFileTransferMessage(content); message.setListener(LinphoneManager.getInstance()); message.setAppData(path); @@ -1198,7 +1196,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC super.onActivityResult(requestCode, resultCode, data); } } else { - LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG); + if (LinphoneUtils.isExtensionImage(imageToUploadUri.getPath())) + sendImageMessage(imageToUploadUri.getPath(), 0); } }