From 27c9b4bf7da15f8c638513f0ee6fec77c1cacb4e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 10 Oct 2012 17:22:17 +0200 Subject: [PATCH] Fix FC depending on contact(s) --- src/org/linphone/ChatListFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index 5c708f5dd..4e76f4843 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -239,7 +239,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte TextView sipUri = (TextView) view.findViewById(R.id.sipUri); - if (getResources().getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(address.getDisplayName())) { + if (getResources().getBoolean(R.bool.only_display_username_if_unknown) && address.getDisplayName() != null && LinphoneUtils.isSipAddress(address.getDisplayName())) { address.setDisplayName(LinphoneUtils.getUsernameFromAddress(address.getDisplayName())); } else if (getResources().getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(contact)) { contact = LinphoneUtils.getUsernameFromAddress(contact);