From e8895acd6876dea2944e19b600871163dc9d54a7 Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Fri, 29 Apr 2016 09:02:56 +0200
Subject: [PATCH] [Presence] isPresenceReceived updated

---
 src/org/linphone/LinphoneContact.java            | 4 ++++
 src/org/linphone/LinphoneManager.java            | 2 +-
 src/org/linphone/ui/AvatarWithPresenceImage.java | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/LinphoneContact.java b/src/org/linphone/LinphoneContact.java
index 36993f483..14b36cd44 100644
--- a/src/org/linphone/LinphoneContact.java
+++ b/src/org/linphone/LinphoneContact.java
@@ -457,6 +457,10 @@ public class LinphoneContact implements Serializable, Comparable<LinphoneContact
 		return this.friend.equals(mFriend);
 	}
 
+    public boolean isPresenceReceived(){
+        return this.friend.isPresenceReceived();
+    }
+
 	public static LinphoneContact createContact() {
 		if (ContactsManager.getInstance().hasContactsAccess()) {
 			return createAndroidContact();
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index ebeeef6b7..aa7831edd 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -655,7 +655,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		PreferencesMigrator prefMigrator = new PreferencesMigrator(mServiceContext);
 		prefMigrator.migrateRemoteProvisioningUriIfNeeded();
 		prefMigrator.migrateSharingServerUrlIfNeeded();
-		
+
 		if (prefMigrator.isMigrationNeeded()) {
 			prefMigrator.doMigration();
 		}
diff --git a/src/org/linphone/ui/AvatarWithPresenceImage.java b/src/org/linphone/ui/AvatarWithPresenceImage.java
index 1afaa0213..c6bcde60c 100644
--- a/src/org/linphone/ui/AvatarWithPresenceImage.java
+++ b/src/org/linphone/ui/AvatarWithPresenceImage.java
@@ -107,7 +107,8 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
                 PresenceModel presenceModel = contact.getFriendPresenceModel();
                 PresenceBasicStatus basicStatus = presenceModel.getBasicStatus();
                 if (basicStatus == PresenceBasicStatus.Closed) {
-                    if(friend.getPresenceModel() != null){
+                    if(presenceModel.getActivity() != null && contact.isPresenceReceived() ){
+                        Log.e("===>>> updatePresenceIcon 1");
                         friendStatusSmall.setImageResource(R.drawable.presence_away);
                         friendStatusBig.setImageResource(R.drawable.presence_away);
                     }else {
@@ -118,6 +119,7 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
                     friendStatusSmall.setImageResource(R.drawable.presence_online);
                     friendStatusBig.setImageResource(R.drawable.presence_online);
                 } else {
+                    Log.e("===>>> updatePresenceIcon 2");
                     friendStatusSmall.setImageResource(R.drawable.presence_away);
                     friendStatusBig.setImageResource(R.drawable.presence_away);
                 }