TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 15:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not show contact address in subtitle."

Browse Source 
This reverts commit dae0d30367350b69f295e33729111cb9a636adec.
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

12
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);
} else {
this.subtitle.setText(recipient.getCustomLabel());
this.subtitle.setVisibility(View.VISIBLE); this.subtitle.setVisibility(View.VISIBLE);
this.subtitleContainer.setVisibility(View.VISIBLE); this.subtitleContainer.setVisibility(VISIBLE);
}
} }
} }