Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[File sharing] fix Camera Image picking on Samsung devices

Browse source
This commit is contained in:
Brieuc Viel 2017-10-11 15:33:20 +02:00
parent 71a8005f55
commit 445b95e712
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/android/org/linphone/ChatFragment.java
View file

@ -1095,12 +1095,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if (progressDialog != null && progressDialog.isShowing()) { if (progressDialog != null && progressDialog.isShowing()) {
progressDialog.dismiss(); progressDialog.dismiss();
} }
String fileName = path.substring(path.lastIndexOf("/") + 1); String fileName = path.substring(path.lastIndexOf("/") + 1);
String extension = LinphoneUtils.getExtensionFromFileName(fileName); String extension = LinphoneUtils.getExtensionFromFileName(fileName);
LinphoneContent content = LinphoneCoreFactory.instance().createLinphoneContent("image", extension, result, null); LinphoneContent content = LinphoneCoreFactory.instance().createLinphoneContent("image", extension, result, null);
content.setName(fileName); content.setName(fileName);
LinphoneChatMessage message = chatRoom.createFileTransferMessage(content); LinphoneChatMessage message = chatRoom.createFileTransferMessage(content);
message.setListener(LinphoneManager.getInstance()); message.setListener(LinphoneManager.getInstance());
message.setAppData(path); message.setAppData(path);
@ -1198,7 +1196,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
} }
} else { } else {
LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG); if (LinphoneUtils.isExtensionImage(imageToUploadUri.getPath()))
sendImageMessage(imageToUploadUri.getPath(), 0);
} }
} }