empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Do not show contact address in subtitle."

Browse source 
This reverts commit dae0d30367.
This commit is contained in:
Greyson Parrelli 2019-06-04 03:30:24 -04:00
parent d2cb6098fc
commit 262012887c
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
View file

@ -138,14 +138,10 @@ public class ConversationTitleView extends RelativeLayout {
private void setContactRecipientTitle(Recipient recipient) { private void setContactRecipientTitle(Recipient recipient) {
this.title.setText(recipient.getName()); this.title.setText(recipient.getName());
if (TextUtils.isEmpty(recipient.getCustomLabel())) { if (recipient.getCustomLabel() != null) this.subtitle.setText(recipient.getCustomLabel());
this.subtitle.setText(null); else this.subtitle.setText(recipient.getAddress().serialize());
this.subtitle.setVisibility(View.GONE);
this.subtitleContainer.setVisibility(View.GONE); this.subtitle.setVisibility(View.VISIBLE);
} else { this.subtitleContainer.setVisibility(VISIBLE);
this.subtitle.setText(recipient.getCustomLabel());
this.subtitle.setVisibility(View.VISIBLE);
this.subtitleContainer.setVisibility(View.VISIBLE);
}
} }
} }