From c1b4b5678e3ec37e30958d0786def03aef7cc6c4 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 11 Apr 2014 16:47:39 +0200
Subject: [PATCH] Fix removeContactFromLists crash

---
 src/org/linphone/LinphoneActivity.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 88fb48e57..b3fe683e2 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1084,13 +1084,20 @@ public class LinphoneActivity extends FragmentActivity implements
 	}
 	
 	public void removeContactFromLists(Contact contact) {
-		if (contactList.contains(contact)) {
-			contactList.remove(contact);
-			contactCursor = Compatibility.getContactsCursor(getContentResolver());
+		for (Contact c : contactList) {
+			if (c != null && c.getID().equals(contact.getID())) {
+				contactList.remove(c);
+				contactCursor = Compatibility.getContactsCursor(getContentResolver());
+				break;
+			}
 		}
-		if (sipContactList.contains(contact)) {
-			sipContactList.remove(contact);
-			sipContactCursor = Compatibility.getSIPContactsCursor(getContentResolver());
+		
+		for (Contact c : sipContactList) {
+			if (c != null && c.getID().equals(contact.getID())) {
+				sipContactList.remove(c);
+				sipContactCursor = Compatibility.getSIPContactsCursor(getContentResolver());
+				break;
+			}
 		}
 	}