From 5a122150a8dbd2322f65d2036db5e92a13c2b4aa Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 9 Aug 2016 09:53:15 +0200 Subject: [PATCH] Improved display of chat messages in some situations --- src/org/linphone/ChatFragment.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index 0fe954352..7968aaa0a 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -77,7 +77,6 @@ import android.text.Spanned; import android.text.TextWatcher; import android.text.method.LinkMovementMethod; import android.view.ContextMenu; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -1065,10 +1064,15 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC holder.messageStatus.setVisibility(View.INVISIBLE); holder.messageSendingInProgress.setVisibility(View.GONE); - String displayName = message.getFrom().getUserName(); + String displayName = message.getFrom().getDisplayName(); + if (displayName == null) { + displayName = message.getFrom().getUserName(); + } if (!message.isOutgoing()) { if (contact != null) { - displayName = contact.getFullName(); + if (contact != null && contact.getFullName() != null) { + displayName = contact.getFullName(); + } if (contact.hasPhoto()) { Bitmap photo = contact.getPhoto(); if (photo != null) { @@ -1085,7 +1089,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } else { holder.contactPicture.setImageResource(R.drawable.avatar); } - holder.contactName.setText(timestampToHumanDate(context, message.getTime()) + " - " + displayName); if (status == LinphoneChatMessage.State.NotDelivered) { @@ -1096,8 +1099,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } if (externalBodyUrl != null || fileTransferContent != null) { - holder.messageText.setVisibility(View.GONE); - holder.fileTransferProgressBar.setProgress(0); String appData = message.getAppData(); if (message.isOutgoing() && appData != null){