From 262012887c8e76db418462fc6dc595973ed1fd9f Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 4 Jun 2019 03:30:24 -0400 Subject: [PATCH] Revert "Do not show contact address in subtitle." This reverts commit dae0d30367350b69f295e33729111cb9a636adec. --- .../conversation/ConversationTitleView.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java index 37458f67f6..3e349c0174 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java @@ -138,14 +138,10 @@ public class ConversationTitleView extends RelativeLayout { private void setContactRecipientTitle(Recipient recipient) { this.title.setText(recipient.getName()); - if (TextUtils.isEmpty(recipient.getCustomLabel())) { - this.subtitle.setText(null); - this.subtitle.setVisibility(View.GONE); - this.subtitleContainer.setVisibility(View.GONE); - } else { - this.subtitle.setText(recipient.getCustomLabel()); - this.subtitle.setVisibility(View.VISIBLE); - this.subtitleContainer.setVisibility(View.VISIBLE); - } + if (recipient.getCustomLabel() != null) this.subtitle.setText(recipient.getCustomLabel()); + else this.subtitle.setText(recipient.getAddress().serialize()); + + this.subtitle.setVisibility(View.VISIBLE); + this.subtitleContainer.setVisibility(VISIBLE); } }