diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index 7b00a8fe7..27370af3f 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -947,7 +947,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC for (ContactAddress c : searchAdapter.contacts) { String address = c.address; if (address.startsWith("sip:")) address = address.substring(4); - if (c.contact.getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault())) + if (c.contact.getFullName() != null && c.contact.getFullName().toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault())) || address.toLowerCase(Locale.getDefault()).startsWith(search.toLowerCase(Locale.getDefault()))) { result.add(c); } diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index a01e25ab8..36ecfca49 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -717,6 +717,8 @@ public class LinphonePreferences { } public int getDefaultAccountIndex() { + if (getLc() == null) + return -1; LinphoneProxyConfig defaultPrxCfg = getLc().getDefaultProxyConfig(); if (defaultPrxCfg == null) return -1;