From 614c6022cf97d356e710d100e8dcb0386aa8d856 Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Thu, 28 Apr 2016 16:12:16 +0200
Subject: [PATCH] [Presenc] update avatar icon

---
 src/org/linphone/LinphoneManager.java            |  2 +-
 src/org/linphone/ui/AvatarWithPresenceImage.java | 14 ++++++++++----
 submodules/linphone                              |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index e906d90f3..ebeeef6b7 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -598,7 +598,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 			e.printStackTrace();
 		}
 		finally {
-			mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
+          	    mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
 			mLc = null;
 		}
 	}
diff --git a/src/org/linphone/ui/AvatarWithPresenceImage.java b/src/org/linphone/ui/AvatarWithPresenceImage.java
index cb502ef36..1afaa0213 100644
--- a/src/org/linphone/ui/AvatarWithPresenceImage.java
+++ b/src/org/linphone/ui/AvatarWithPresenceImage.java
@@ -12,6 +12,7 @@ import org.linphone.LinphoneManager;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneFriendList;
 import org.linphone.core.OnlineStatus;
 import org.linphone.core.PresenceActivity;
 import org.linphone.core.PresenceActivityType;
@@ -106,8 +107,13 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
                 PresenceModel presenceModel = contact.getFriendPresenceModel();
                 PresenceBasicStatus basicStatus = presenceModel.getBasicStatus();
                 if (basicStatus == PresenceBasicStatus.Closed) {
-                    friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
-                    friendStatusBig.setImageResource(R.drawable.presence_unregistered);
+                    if(friend.getPresenceModel() != null){
+                        friendStatusSmall.setImageResource(R.drawable.presence_away);
+                        friendStatusBig.setImageResource(R.drawable.presence_away);
+                    }else {
+                        friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
+                        friendStatusBig.setImageResource(R.drawable.presence_unregistered);
+                    }
                 } else if ((presenceModel.getActivity().getType() == PresenceActivityType.TV )) {
                     friendStatusSmall.setImageResource(R.drawable.presence_online);
                     friendStatusBig.setImageResource(R.drawable.presence_online);
@@ -119,10 +125,10 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
                 friendStatusSmall.setImageResource(R.drawable.presence_away);
                 friendStatusBig.setImageResource(R.drawable.presence_away);
             */
-            } else{
+            }/* else{
                 friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
                 friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
-            }
+            }*/
         }
     }
 }
diff --git a/submodules/linphone b/submodules/linphone
index bc80229ec..f10471de2 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bc80229ec26b5da6f318096a2f79bf9c4c281318
+Subproject commit f10471de2e2316958ccce54a2dbcde41cd9bb05f