From d2ede2973d548a5c0016a31fe1a9692b37e18335 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Fri, 8 Jun 2018 09:31:36 +0200
Subject: [PATCH] Fix contacts management

---
 src/android/org/linphone/contacts/ContactsManager.java    | 8 ++++----
 .../org/linphone/contacts/LinphoneNumberOrAddress.java    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index 2fee4e56b..dd493f25b 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -264,7 +264,7 @@ public class ContactsManager extends ContentObserver {
 	}
 
 	public synchronized void setContacts(List<LinphoneContact> c) {
-		if (contacts.isEmpty()) {
+		if (contacts.isEmpty() || contacts.size() > c.size()) {
 			contacts = c;
 		} else {
 			for (LinphoneContact contact : c) {
@@ -273,10 +273,11 @@ public class ContactsManager extends ContentObserver {
 				}
 			}
 		}
+		Collections.sort(contacts);
 	}
 
 	public synchronized void setSipContacts(List<LinphoneContact> c) {
-		if (sipContacts.isEmpty()) {
+		if (sipContacts.isEmpty() || sipContacts.size() > c.size()) {
 			sipContacts = c;
 		} else {
 			for (LinphoneContact contact : c) {
@@ -285,6 +286,7 @@ public class ContactsManager extends ContentObserver {
 				}
 			}
 		}
+		Collections.sort(sipContacts);
 	}
 
 	public synchronized void refreshSipContact(Friend lf) {
@@ -466,8 +468,6 @@ public class ContactsManager extends ContentObserver {
 			Log.w("[Permission] Read contacts permission wasn't granted, only fetch Friends");
 		}
 
-		Collections.sort(contacts);
-		Collections.sort(sipContacts);
 		setContacts(contacts);
 		setSipContacts(sipContacts);
 
diff --git a/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java b/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
index dd63e581a..f40f75d45 100644
--- a/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
+++ b/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
@@ -40,7 +40,7 @@ public class LinphoneNumberOrAddress implements Serializable, Comparable<Linphon
 
 	@Override
 	public int compareTo(LinphoneNumberOrAddress noa) {
-		if (noa.isSIPAddress() == isSIPAddress()) {
+		if (noa.isSIPAddress() == isSIPAddress() && noa.getValue() != null) {
 			return noa.getValue().compareTo(getValue());
 		} else {
 			return isSIPAddress() ? -1 : 1;
@@ -51,7 +51,7 @@ public class LinphoneNumberOrAddress implements Serializable, Comparable<Linphon
 	public boolean equals(Object obj) {
 		if (obj.getClass() != LinphoneNumberOrAddress.class) return false;
 		LinphoneNumberOrAddress noa = (LinphoneNumberOrAddress) obj;
-		return (this.compareTo(noa) == 0);
+		return (this != null && this.compareTo(noa) == 0);
 	}
 
 	public boolean isSIPAddress() {