From a33ab34bd442ea8c591c2915d50bb2020c3bc202 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 10 Oct 2012 14:55:21 +0200
Subject: [PATCH] Revert previous commit causing FC on contacts

---
 src/org/linphone/IncomingCallActivity.java |  3 +-
 src/org/linphone/LinphoneActivity.java     | 64 +++++++++++++---------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index f76640347..188883b73 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -128,9 +128,10 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 	private void decline() {
 		LinphoneManager.getLc().terminateCall(mCall);
 	}
+	
 	private void answer() {
 		LinphoneCallParams params = LinphoneManager.getLc().createDefaultCallParameters();
-		if (mCall.getRemoteParams().getVideoEnabled() && LinphoneManager.getInstance().isAutoAcceptCamera()) {
+		if (mCall != null && mCall.getRemoteParams().getVideoEnabled() && LinphoneManager.getInstance().isAutoAcceptCamera()) {
 			params.setVideoEnabled(true);
 		} else {
 			params.setVideoEnabled(false);
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 1d4248019..b5b25c2b9 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1051,33 +1051,47 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
 		
 		contactCursor = Compatibility.getContactsCursor(getContentResolver());
 		sipContactCursor = Compatibility.getSIPContactsCursor(getContentResolver());
-		if (contactCursor != null && sipContactCursor != null) {
-			contactList = new ArrayList<Contact>();
-			sipContactList = new ArrayList<Contact>();
-			
-			Thread contactsHandler = new Thread(new Runnable() {
-				@Override
-				public void run() {
-					for (int i = 0; i < contactCursor.getCount(); i++) {
-						Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
-						contact.refresh(getContentResolver());
-						
-						for (String aon : contact.getNumerosOrAddresses()) {
-							if (LinphoneUtils.isSipAddress(aon)) {
-								if (!isContactPresenceDisabled) {
-									searchFriendAndAddToContact(contact);
-								}
-								if (!sipContactList.contains(contact)) {
-									sipContactList.add(contact);
-								}
-							}
-						}
-						contactList.add(contact);
+		
+		Thread sipContactsHandler = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				for (int i = 0; i < sipContactCursor.getCount(); i++) {
+					Contact contact = Compatibility.getContact(getContentResolver(), sipContactCursor, i);
+					contact.refresh(getContentResolver());
+					if (getResources().getBoolean(R.bool.enable_linphone_friends)) {
+						searchFriendAndAddToContact(contact);
 					}
+					sipContactList.add(contact);
 				}
-			});
-			contactsHandler.start();
-		}
+			}
+		});
+		sipContactsHandler.start();
+			
+		contactList = new ArrayList<Contact>();
+		sipContactList = new ArrayList<Contact>();
+		
+		Thread contactsHandler = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				for (int i = 0; i < contactCursor.getCount(); i++) {
+					Contact contact = Compatibility.getContact(getContentResolver(), contactCursor, i);
+//						contact.refresh(getContentResolver());
+//						
+//						for (String aon : contact.getNumerosOrAddresses()) {
+//							if (LinphoneUtils.isSipAddress(aon)) {
+//								if (!isContactPresenceDisabled) {
+//									searchFriendAndAddToContact(contact);
+//								}
+//								if (!sipContactList.contains(contact)) {
+//									sipContactList.add(contact);
+//								}
+//							}
+//						}
+					contactList.add(contact);
+				}
+			}
+		});
+		contactsHandler.start();
 	}
 	
 	private void initInCallMenuLayout(boolean callTransfer) {