From 0eb3d2d4e26cee7595ea84252fb3994b0b9c9940 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 15 Apr 2015 14:55:23 +0200
Subject: [PATCH] Fix about button Fix create new contact

---
 res/layout/about.xml                      | 36 +++++++++++++----------
 src/org/linphone/ContactsManager.java     |  2 +-
 src/org/linphone/EditContactFragment.java |  4 +--
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 6ac3de681..d0b492e13 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -49,27 +49,33 @@
 
     <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
 
-    <LinearLayout
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center">
+
+		<Button
+       		android:id="@+id/send_log"
+        	android:layout_width="match_parent"
+        	android:layout_height="wrap_content"
+       		android:text="@string/menu_send_log"/>
+
+		<Button
+            android:id="@+id/reset_log"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_reset_log"/>
+	</LinearLayout>
+
+	<LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="30dp">
 
-		<Button
-       		android:id="@+id/send_log"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-       		android:text="@string/menu_send_log"/>
-
-        <Button
-            android:id="@+id/reset_log"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_reset_log"
-            />
-
-        <Button android:id="@+id/exit"
+		<Button android:id="@+id/exit"
         	android:gravity="center"
         	android:layout_width="wrap_content"
         	android:layout_height="wrap_content"
diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 6e5ecbbdc..4c9f0ed26 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -300,7 +300,7 @@ public class ContactsManager {
 	public boolean isContactHasAddress(Contact contact, String address){
 		if(contact != null) {
 			contact.refresh(contentResolver);
-			if (contact.getNumbersOrAddresses().contains("sip:" + address))  {
+			if (contact.getNumbersOrAddresses().contains(address))  {
 				return true;
 			} else {
 				return false;
diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java
index edb2bb77e..a734ac9f1 100644
--- a/src/org/linphone/EditContactFragment.java
+++ b/src/org/linphone/EditContactFragment.java
@@ -392,10 +392,10 @@ public class EditContactFragment extends Fragment {
 
 	private void addLinphoneFriendIfNeeded(){
 		for (NewOrUpdatedNumberOrAddress numberOrAddress : numbersAndAddresses) {
-			if(numberOrAddress.newNumberOrAddress != null && numberOrAddress.isSipAddress && !contactsManager.isContactHasAddress(contact, numberOrAddress.newNumberOrAddress)) {
+			if(numberOrAddress.newNumberOrAddress != null && numberOrAddress.isSipAddress) {
 				if(isNewContact){
 					Contact c = contactsManager.findContactWithDisplayName(ContactsManager.getInstance().getDisplayName(firstName.getText().toString(), lastName.getText().toString()));
-					if (c != null) {
+					if (c != null && !contactsManager.isContactHasAddress(c, numberOrAddress.newNumberOrAddress)) {
 						contactsManager.createNewFriend(c, numberOrAddress.newNumberOrAddress);
 					}
 				} else {