mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash when opening file

Browse source
This commit is contained in:
Jehan Monnier 2018-07-23 16:30:27 +02:00
parent b7a88220c4
commit 7e39833d9d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -285,7 +285,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
} else {
for (LinphoneContact c : mParticipants) {
if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
if (c != null && remoteSender!=null && c.hasAddress(remoteSender.asStringUriOnly())) {
contact = c;
break;
}
@ -466,13 +466,13 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
if (path.startsWith("file://")) {
path = path.substring("file://".length());
file = new File(path);
contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file);
contentUri = FileProvider.getUriForFile(mContext, "com.orange.msiphone.provider", file);
} else if (path.startsWith("content://")) {
contentUri = Uri.parse(path);
} else {
file = new File(path);
try {
contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file);
contentUri = FileProvider.getUriForFile(mContext, "com.orange.msiphone.provider", file);
} catch (Exception e) {
contentUri = Uri.parse(path);
}