From 99dd1167a5988fe998be73c514aefd097f06ea5a Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Mon, 4 Jun 2018 11:33:18 +0200
Subject: [PATCH] Fix contacts duplication

---
 src/android/org/linphone/contacts/ContactsManager.java | 10 +++++++++-
 src/android/org/linphone/contacts/LinphoneContact.java |  7 +++++++
 .../org/linphone/contacts/LinphoneNumberOrAddress.java |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index 0a60449eb..2fee4e56b 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -264,7 +264,15 @@ public class ContactsManager extends ContentObserver {
 	}
 
 	public synchronized void setContacts(List<LinphoneContact> c) {
-		contacts = c;
+		if (contacts.isEmpty()) {
+			contacts = c;
+		} else {
+			for (LinphoneContact contact : c) {
+				if (!contacts.contains(contact)) {
+					contacts.add(contact);
+				}
+			}
+		}
 	}
 
 	public synchronized void setSipContacts(List<LinphoneContact> c) {
diff --git a/src/android/org/linphone/contacts/LinphoneContact.java b/src/android/org/linphone/contacts/LinphoneContact.java
index 0b83dffa8..0c5f5399a 100644
--- a/src/android/org/linphone/contacts/LinphoneContact.java
+++ b/src/android/org/linphone/contacts/LinphoneContact.java
@@ -75,6 +75,13 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		return fullName.compareTo(contactFullName);
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (obj.getClass() != LinphoneContact.class) return false;
+		LinphoneContact contact = (LinphoneContact) obj;
+		return (this.compareTo(contact) == 0);
+	}
+
 	public void setFullName(String name) {
 		fullName = name;
 	}
diff --git a/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java b/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
index 869f21fc1..dd63e581a 100644
--- a/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
+++ b/src/android/org/linphone/contacts/LinphoneNumberOrAddress.java
@@ -47,6 +47,13 @@ public class LinphoneNumberOrAddress implements Serializable, Comparable<Linphon
 		}
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (obj.getClass() != LinphoneNumberOrAddress.class) return false;
+		LinphoneNumberOrAddress noa = (LinphoneNumberOrAddress) obj;
+		return (this.compareTo(noa) == 0);
+	}
+
 	public boolean isSIPAddress() {
 		return isSIPAddress;
 	}