From 713fa606dc1fd5094d1f10a71cbc986eb80a6e46 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 28 Jan 2019 11:20:10 +0100 Subject: [PATCH] Fix crash in history view and imdn view --- src/android/org/linphone/chat/ImdnFragment.java | 12 ++++++------ .../linphone/fragments/HistoryDetailFragment.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java index 9bdd98c4e..3715e2529 100644 --- a/src/android/org/linphone/chat/ImdnFragment.java +++ b/src/android/org/linphone/chat/ImdnFragment.java @@ -125,7 +125,7 @@ public class ImdnFragment extends Fragment { mBubble.messageStatus.setVisibility(View.GONE); mBubble.messageSendingInProgress.setVisibility(View.GONE); mBubble.imdmLayout.setVisibility(View.INVISIBLE); - mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + //mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); mMessage = mRoom.findMessage(mMessageId); mListener = new ChatMessageListenerStub() { @@ -144,13 +144,13 @@ public class ImdnFragment extends Fragment { Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font3); Compatibility.setTextAppearance(mBubble.fileTransferAction, getActivity(), R.style.font15); mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button); - mBubble.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing); + //mBubble.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing); } else { mBubble.background.setBackgroundColor(0x19595959); Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font9); Compatibility.setTextAppearance(mBubble.fileTransferAction, getActivity(), R.style.font8); mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button); - mBubble.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask); + //mBubble.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask); } return view; @@ -206,13 +206,13 @@ public class ImdnFragment extends Fragment { displayName = LinphoneUtils.getAddressDisplayName(remoteSender); } - mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + /*mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); if (contact.hasPhoto()) { LinphoneUtils.setThumbnailPictureFromUri(getActivity(), mBubble.contactPicture, contact.getThumbnailUri()); - } + }*/ } else { displayName = LinphoneUtils.getAddressDisplayName(remoteSender); - mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); + //mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap()); } mBubble.contactName.setText(LinphoneUtils.timestampToHumanDate(getActivity(), mMessage.getTime(), R.string.messages_date_format, true) + " - " + displayName); diff --git a/src/android/org/linphone/fragments/HistoryDetailFragment.java b/src/android/org/linphone/fragments/HistoryDetailFragment.java index 6a0824c67..38b10ff9e 100644 --- a/src/android/org/linphone/fragments/HistoryDetailFragment.java +++ b/src/android/org/linphone/fragments/HistoryDetailFragment.java @@ -165,7 +165,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { contact = ContactsManager.getInstance().findContactFromAddress(lAddress); ProxyConfig prx = LinphoneManager.getLc().getDefaultProxyConfig(); Address ourUri = (prx != null) ? prx.getIdentityAddress() : null; - ChatRoomSecurityLevel securityLevel = getSecurityLevelForSipUri(LinphoneManager.getLc(), ourUri, contact.getFriend().getAddress()); + ChatRoomSecurityLevel securityLevel = getSecurityLevelForSipUri(LinphoneManager.getLc(), ourUri, (contact != null) ? contact.getFriend().getAddress() : lAddress); if (securityLevel == ChatRoomSecurityLevel.Safe) { contactPicture.setImageResource(R.drawable.avatar_medium_secure2); } else if (securityLevel == ChatRoomSecurityLevel.Unsafe) {