From c7b47c68a1059067f917946339423d69614d595f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 27 Jun 2016 13:06:14 +0200
Subject: [PATCH] Do the setName after the setAddress when creationg
 LinphoneFriend to prevent warning in logs + prevent crash if fullname is null

---
 src/org/linphone/ContactsManager.java | 12 ++++++++----
 src/org/linphone/LinphoneContact.java |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 59611a8f3..78b7ef8b5 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -126,8 +126,10 @@ public class ContactsManager extends ContentObserver {
 		search = search.toLowerCase(Locale.getDefault());
 		List<LinphoneContact> searchContacts = new ArrayList<LinphoneContact>();
 		for (LinphoneContact contact : contacts) {
-			if (contact.getFullName().toLowerCase(Locale.getDefault()).contains(search)) {
-				searchContacts.add(contact);
+			if (contact.getFullName() != null) {
+				if (contact.getFullName().toLowerCase(Locale.getDefault()).contains(search)) {
+					searchContacts.add(contact);
+				}
 			}
 		}
 		return searchContacts;
@@ -137,8 +139,10 @@ public class ContactsManager extends ContentObserver {
 		search = search.toLowerCase(Locale.getDefault());
 		List<LinphoneContact> searchContacts = new ArrayList<LinphoneContact>();
 		for (LinphoneContact contact : sipContacts) {
-			if (contact.getFullName().toLowerCase(Locale.getDefault()).contains(search)) {
-				searchContacts.add(contact);
+			if (contact.getFullName() != null) {
+				if (contact.getFullName().toLowerCase(Locale.getDefault()).contains(search)) {
+					searchContacts.add(contact);
+				}
 			}
 		}
 		return searchContacts;
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 66a2920f5..dbe7bd0d0 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -317,7 +317,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 			if (lc == null) return;
 			
 			friend.edit();
-			friend.setName(fullName);
 			//TODO: handle removal of all existing SIP addresses
 			for (LinphoneNumberOrAddress address : addresses) {
 				try {
@@ -331,6 +330,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 					Log.e(e);
 				}
 			}
+			friend.setName(fullName);
 			friend.done();
 			
 			if (friend.getAddress() != null) {
@@ -383,7 +383,6 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 				// Disable subscribes for now
 				friend.enableSubscribes(false);
 				friend.setIncSubscribePolicy(SubscribePolicy.SPDeny);
-				friend.setName(fullName);
 				if (hasSipAddress) {
 					for (LinphoneNumberOrAddress noa : addresses) {
 						if (noa.isSIPAddress()) {
@@ -398,6 +397,7 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 						}
 					}
 				}
+				friend.setName(fullName);
 				LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 				if (lc != null && friend.getAddress() != null) {
 					try {