From caff7b87d71bfd1a9fe1984b3f08e8142841164a Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 29 Nov 2016 10:59:41 +0100
Subject: [PATCH] Fix crash in search chat view when a contact didn't have a
 name

---
 src/org/linphone/ChatFragment.java        | 2 +-
 src/org/linphone/LinphonePreferences.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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;