From 99b51822b96acdb11b72409b8dfb571dad07b9b4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 11 Apr 2018 15:06:38 +0200 Subject: [PATCH] Fixed crash in IMDN view if participant isn't a contact --- src/android/org/linphone/chat/ImdnFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java index fed558bc2..fd0e9acba 100644 --- a/src/android/org/linphone/chat/ImdnFragment.java +++ b/src/android/org/linphone/chat/ImdnFragment.java @@ -178,7 +178,7 @@ public class ImdnFragment extends Fragment { v.findViewById(R.id.separator).setVisibility(first ? View.GONE : View.VISIBLE); ((TextView)v.findViewById(R.id.time)).setText(LinphoneUtils.timestampToHumanDate(getActivity(), participant.getStateChangeTime(), R.string.messages_date_format)); ((TextView)v.findViewById(R.id.name)).setText(participantDisplayName); - if (participantContact.hasPhoto()) { + if (participantContact != null && participantContact.hasPhoto()) { LinphoneUtils.setThumbnailPictureFromUri(getActivity(), ((ImageView)v.findViewById(R.id.contact_picture)), participantContact.getThumbnailUri()); } else { ((ImageView)v.findViewById(R.id.contact_picture)).setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); @@ -200,7 +200,7 @@ public class ImdnFragment extends Fragment { v.findViewById(R.id.separator).setVisibility(first ? View.GONE : View.VISIBLE); ((TextView)v.findViewById(R.id.time)).setText(LinphoneUtils.timestampToHumanDate(getActivity(), participant.getStateChangeTime(), R.string.messages_date_format)); ((TextView)v.findViewById(R.id.name)).setText(participantDisplayName); - if (participantContact.hasPhoto()) { + if (participantContact != null && participantContact.hasPhoto()) { LinphoneUtils.setThumbnailPictureFromUri(getActivity(), ((ImageView)v.findViewById(R.id.contact_picture)), participantContact.getThumbnailUri()); } else { ((ImageView)v.findViewById(R.id.contact_picture)).setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); @@ -221,7 +221,7 @@ public class ImdnFragment extends Fragment { View v = mInflater.inflate(R.layout.chat_imdn_cell, container, false); v.findViewById(R.id.separator).setVisibility(first ? View.GONE : View.VISIBLE); ((TextView)v.findViewById(R.id.name)).setText(participantDisplayName); - if (participantContact.hasPhoto()) { + if (participantContact != null && participantContact.hasPhoto()) { LinphoneUtils.setThumbnailPictureFromUri(getActivity(), ((ImageView)v.findViewById(R.id.contact_picture)), participantContact.getThumbnailUri()); } else { ((ImageView)v.findViewById(R.id.contact_picture)).setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());