diff --git a/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java b/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java index ca7d6b795..28b1fa08a 100644 --- a/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java +++ b/app/src/main/java/org/linphone/chat/GroupInfoAdapter.java @@ -60,7 +60,7 @@ class GroupInfoAdapter extends RecyclerView.Adapter { LinphoneContact c = ca.getContact(); holder.name.setText( - (c.getFullName() != null) + (c != null && c.getFullName() != null) ? c.getFullName() : (ca.getDisplayName() != null) ? ca.getDisplayName() : ca.getUsername()); diff --git a/app/src/main/java/org/linphone/contacts/ContactAddress.java b/app/src/main/java/org/linphone/contacts/ContactAddress.java index 5003ffd2d..9d873ff8c 100644 --- a/app/src/main/java/org/linphone/contacts/ContactAddress.java +++ b/app/src/main/java/org/linphone/contacts/ContactAddress.java @@ -78,11 +78,14 @@ public class ContactAddress implements Serializable { } public Address getAddress() { - String presence = - mContact.getContactFromPresenceModelForUriOrTel( - (mPhoneNumber != null && !mPhoneNumber.isEmpty()) - ? mPhoneNumber - : mAddress); + String presence = null; + if (mContact != null) { + presence = + mContact.getContactFromPresenceModelForUriOrTel( + (mPhoneNumber != null && !mPhoneNumber.isEmpty()) + ? mPhoneNumber + : mAddress); + } Address addr = Factory.instance().createAddress(presence != null ? presence : mAddress); // Remove the user=phone URI param if existing, it will break everything otherwise if (addr.hasUriParam("user")) {