From 698a136a1243e515bdba8cdb026a3268e16efd60 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 15 Sep 2016 15:11:29 +0200
Subject: [PATCH] Manage linphone contact from presence model

---
 res/layout/contact_control_row.xml           | 35 +++++++++++++++-----
 src/org/linphone/ContactDetailsFragment.java | 24 ++++++++++++--
 src/org/linphone/ContactsManager.java        |  2 +-
 src/org/linphone/LinphoneContact.java        |  7 ++++
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index fac6b763a..03d21fda1 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -17,14 +17,33 @@
 			android:layout_marginRight="10dp"
 			android:background="@color/colorE"/>
 
-		<TextView
-			android:id="@+id/address_label"
-			android:layout_marginTop="10dp"
-			android:layout_gravity="center"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAllCaps="true"
-			android:textColor="@color/colorE" />
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+
+			<TextView
+				android:id="@+id/address_label"
+				android:layout_marginTop="10dp"
+				android:layout_centerInParent="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAllCaps="true"
+				android:textColor="@color/colorE" />
+
+
+			<ImageView
+				android:id="@+id/friendLinphone"
+				android:visibility="gone"
+				android:layout_width="20dp"
+				android:layout_height="20dp"
+				android:layout_alignParentRight="true"
+				android:layout_centerVertical="true"
+				android:adjustViewBounds="true"
+				android:layout_marginRight="10dp"
+				android:scaleType="centerInside"
+				android:src="@drawable/linphone_user" />
+		</RelativeLayout>
 
 		<TextView
 			android:id="@+id/numeroOrAddress"
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 1b43f9254..e9488576a 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -133,10 +133,19 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress);
 			tv.setText(displayednumberOrAddress);
 			tv.setSelected(true);
+
+			String contactAddress = contact.getPresenceModelForUri(noa.getValue());
+			if(contactAddress != null) {
+				v.findViewById(R.id.friendLinphone).setVisibility(View.VISIBLE);
+			}
 			
 			if (!displayChatAddressOnly) {
 				v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
-				v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_call).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+				}
 			} else {
 				v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 			}
@@ -146,9 +155,18 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			if (lpc != null) {
 				String username = lpc.normalizePhoneNumber(LinphoneUtils.getUsernameFromAddress(noa.getValue()));
 				String tag = LinphoneUtils.getFullAddressFromUsername(username);
-				v.findViewById(R.id.contact_chat).setTag(tag);
+
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_chat).setTag(tag);
+				}
 			} else {
-				v.findViewById(R.id.contact_chat).setTag(noa.getValue());
+				if(contactAddress != null){
+					v.findViewById(R.id.contact_chat).setTag(contact.getPresenceModelForUri(noa.getValue()));
+				} else {
+					v.findViewById(R.id.contact_chat).setTag(noa.getValue());
+				}
 			}
 			
 			if (getResources().getBoolean(R.bool.disable_chat)) {
diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index f36f83896..9ac69ca72 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -217,7 +217,7 @@ public class ContactsManager extends ContentObserver {
 		contacts = c;
 		sipContacts = new ArrayList<LinphoneContact>();
 		for (LinphoneContact contact : contacts) {
-			if (contact.hasAddress()) {
+			if (contact.hasAddress() || contact.isInLinphoneFriendList()) {
 				sipContacts.add(contact);
 			}
 		}
diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index ef7f2fa48..d909c952d 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -635,6 +635,13 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		return (friend != null && friend.getPresenceModel() != null &&  friend.getPresenceModel().getBasicStatus().equals(PresenceBasicStatus.Open));
 	}
 
+	public String getPresenceModelForUri(String uri) {
+		if (friend != null && friend.getPresenceModelForUri(uri) != null){
+			return friend.getPresenceModelForUri(uri).getContact();
+		}
+		return null;
+	}
+
 	public void setFriend(LinphoneFriend f) {
 		friend = f;
 	}