From 7cfd7391861de030d600d45b02eaa16c232472f9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Sep 2019 11:51:24 +0200
Subject: [PATCH] Fixed history list showing display name but not history
 details

---
 .../java/org/linphone/history/HistoryActivity.java   |  2 +-
 .../org/linphone/history/HistoryDetailFragment.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/history/HistoryActivity.java b/app/src/main/java/org/linphone/history/HistoryActivity.java
index 5673d5997..1a5f48dfe 100644
--- a/app/src/main/java/org/linphone/history/HistoryActivity.java
+++ b/app/src/main/java/org/linphone/history/HistoryActivity.java
@@ -101,7 +101,7 @@ public class HistoryActivity extends MainActivity {
             String displayName =
                     contact != null
                             ? contact.getFullName()
-                            : LinphoneUtils.getAddressDisplayName(address.asStringUriOnly());
+                            : LinphoneUtils.getAddressDisplayName(address);
             String pictureUri =
                     contact != null && contact.getPhotoUri() != null
                             ? contact.getPhotoUri().toString()
diff --git a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
index acc4e28ec..ecad10346 100644
--- a/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
+++ b/app/src/main/java/org/linphone/history/HistoryDetailFragment.java
@@ -201,6 +201,10 @@ public class HistoryDetailFragment extends Fragment {
                 mContactAddress.setText(LinphoneUtils.getDisplayableAddress(address));
                 mContact = ContactsManager.getInstance().findContactFromAddress(address);
 
+                if (mDisplayName == null) {
+                    mDisplayName = LinphoneUtils.getAddressDisplayName(address);
+                }
+
                 if (mContact != null) {
                     mContactName.setText(mContact.getFullName());
                     ContactAvatar.displayAvatar(mContact, mAvatarLayout);
@@ -213,12 +217,8 @@ public class HistoryDetailFragment extends Fragment {
                         mChatSecured.setVisibility(View.VISIBLE);
                     }
                 } else {
-                    mContactName.setText(
-                            mDisplayName == null
-                                    ? LinphoneUtils.getAddressDisplayName(mSipUri)
-                                    : mDisplayName);
-                    ContactAvatar.displayAvatar(
-                            LinphoneUtils.getAddressDisplayName(address), mAvatarLayout);
+                    mContactName.setText(mDisplayName);
+                    ContactAvatar.displayAvatar(mDisplayName, mAvatarLayout);
                     mAddToContacts.setVisibility(View.VISIBLE);
                     mGoToContact.setVisibility(View.GONE);
                 }