From 0b643e27d47ac1a680a3dd40e81a50df9ec970fe Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 24 Oct 2018 12:14:18 +0200
Subject: [PATCH] Fixed avatar issue in history list

---
 src/android/org/linphone/call/CallHistoryAdapter.java | 2 +-
 src/android/org/linphone/ui/ContactAvatar.java        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/android/org/linphone/call/CallHistoryAdapter.java b/src/android/org/linphone/call/CallHistoryAdapter.java
index f9b611092..33a6dafb7 100644
--- a/src/android/org/linphone/call/CallHistoryAdapter.java
+++ b/src/android/org/linphone/call/CallHistoryAdapter.java
@@ -181,7 +181,7 @@ public class CallHistoryAdapter extends SelectableAdapter<CallHistoryAdapter.Vie
         if (c != null) {
             ContactAvatar.displayAvatar(c, holder.avatarLayout);
         } else {
-            ContactAvatar.displayAvatar(displayName, holder.avatarLayout);
+            ContactAvatar.displayAvatar(holder.contact.getText().toString(), holder.avatarLayout);
         }
 
         holder.detail.setVisibility(isEditionEnabled() ? View.INVISIBLE : View.VISIBLE);
diff --git a/src/android/org/linphone/ui/ContactAvatar.java b/src/android/org/linphone/ui/ContactAvatar.java
index d86e0bf6c..87767b9c1 100644
--- a/src/android/org/linphone/ui/ContactAvatar.java
+++ b/src/android/org/linphone/ui/ContactAvatar.java
@@ -44,6 +44,12 @@ class ContactAvatarHolder {
         securityLevel = v.findViewById(R.id.security_level);
         generatedAvatar = v.findViewById(R.id.generated_avatar);
     }
+
+    public void init() {
+        contactPicture.setVisibility(View.VISIBLE);
+        generatedAvatar.setVisibility(View.VISIBLE);
+        securityLevel.setVisibility(View.GONE);
+    }
 }
 
 public class ContactAvatar {
@@ -66,6 +72,7 @@ public class ContactAvatar {
         if (displayName == null || v == null) return;
 
         ContactAvatarHolder holder = new ContactAvatarHolder(v);
+        holder.init();
 
         if (displayName.startsWith("+")) {
             // If display name is a phone number, use default avatar because generated one will be +...
@@ -82,6 +89,7 @@ public class ContactAvatar {
 
         Bitmap bm = null;
         ContactAvatarHolder holder = new ContactAvatarHolder(v);
+        holder.init();
 
         if (contact.getThumbnailUri() != null && contact.getThumbnailUri().getScheme().startsWith("http")) {
             bm = LinphoneUtils.downloadBitmap(contact.getThumbnailUri());