From 55a8bd86dea197ddd149cf48848512e713648e49 Mon Sep 17 00:00:00 2001
From: alex-signal <alex@signal.org>
Date: Wed, 9 Oct 2019 13:57:36 -0300
Subject: [PATCH] Consolidate profile display labels.

---
 res/layout/conversation_item_received.xml     | 14 -------
 res/layout/conversation_item_sent.xml         |  6 ---
 res/values/strings.xml                        |  1 +
 res/values/styles.xml                         |  3 +-
 .../securesms/ConfirmIdentityDialog.java      |  2 +-
 .../securesms/ConversationListActivity.java   |  2 +-
 .../securesms/ConversationListItem.java       |  2 +-
 .../securesms/GroupCreateActivity.java        |  2 +-
 .../securesms/GroupMembersDialog.java         |  7 +---
 .../securesms/MediaOverviewActivity.java      |  4 +-
 .../securesms/MediaPreviewActivity.java       |  2 +-
 .../RecipientPreferenceActivity.java          | 16 ++------
 .../securesms/VerifyIdentityActivity.java     |  2 +-
 .../securesms/WebRtcCallActivity.java         |  2 +-
 .../securesms/components/FromTextView.java    | 15 +------
 .../securesms/components/QuoteView.java       |  2 +-
 .../components/reminder/InviteReminder.java   |  2 +-
 .../components/webrtc/WebRtcCallScreen.java   | 12 +++---
 .../securesms/contacts/ContactRepository.java |  4 +-
 .../contacts/ContactSelectionListItem.java    |  5 +--
 .../contacts/ContactsCursorLoader.java        |  2 +-
 .../securesms/contacts/RecipientsEditor.java  |  8 ++--
 .../conversation/ConversationActivity.java    |  6 +--
 .../conversation/ConversationItem.java        | 15 +------
 .../conversation/ConversationTitleView.java   | 41 +++++--------------
 .../database/helpers/SQLCipherOpenHelper.java |  2 +-
 .../database/model/MessageRecord.java         | 20 ++++-----
 .../database/model/SmsMessageRecord.java      |  2 +-
 .../database/model/ThreadRecord.java          |  4 +-
 .../jobs/MultiDeviceContactUpdateJob.java     |  2 +-
 .../longmessage/LongMessageActivity.java      |  2 +-
 .../mediasend/MediaPickerFolderFragment.java  |  4 +-
 .../mediasend/MediaSendActivity.java          |  3 +-
 .../AbstractNotificationBuilder.java          |  2 +-
 .../MultipleRecipientNotificationBuilder.java |  4 +-
 .../notifications/NotificationChannels.java   | 13 ++++--
 .../SingleRecipientNotificationBuilder.java   |  6 +--
 .../preferences/BlockedContactListItem.java   |  2 +-
 .../securesms/profiles/UnknownSenderView.java |  4 +-
 .../securesms/recipients/Recipient.java       | 32 +++++++--------
 .../securesms/service/DirectShareService.java |  2 +-
 .../securesms/util/CommunicationActions.java  |  4 +-
 .../securesms/util/FeatureFlags.java          |  3 ++
 .../securesms/util/GroupUtil.java             |  4 +-
 .../securesms/util/IdentityUtil.java          |  6 +--
 .../util/SelectedRecipientsAdapter.java       |  2 +-
 .../webrtc/CallNotificationBuilder.java       |  2 +-
 47 files changed, 114 insertions(+), 188 deletions(-)

diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 172aee6941..c8f437f3e2 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -91,20 +91,6 @@
                     tools:text="+14152222222"
                     tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/group_message_sender_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="4sp"
-                    android:paddingEnd="4sp"
-                    style="@style/Signal.Text.Preview"
-                    android:fontFamily="sans-serif-regular"
-                    android:textColor="?conversation_item_received_text_primary_color"
-                    android:textStyle="italic"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    tools:text="~Clement Duval"/>
-
             </LinearLayout>
 
             <org.thoughtcrime.securesms.components.QuoteView
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 3a7d161349..f22bed75ac 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -143,12 +143,6 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/group_message_sender_profile"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
             <org.thoughtcrime.securesms.components.ConversationItemFooter
                 android:id="@+id/conversation_item_footer"
                 android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04d2ffcdcb..b857c26879 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1633,6 +1633,7 @@
     <string name="prompt_passphrase_activity__tap_to_unlock">TAP TO UNLOCK</string>
     <string name="RegistrationLockDialog_reminder">Reminder:</string>
     <string name="recipient_preferences__about">About</string>
+    <string name="Recipient_unknown">Unknown</string>
     <!-- EOF -->
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 137c142bc9..fac5e03dc4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -193,8 +193,7 @@
     <style name="ViewOnceVideo.Duration" parent="@android:style/TextAppearance">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/white</item>
-        <!-- TODO: change to transparent_black_60 after color swap -->
-        <item name="android:shadowColor">#99000000</item>
+        <item name="android:shadowColor">@color/transparent_black_60</item>
         <item name="android:shadowDx">0</item>
         <item name="android:shadowDy">0</item>
         <item name="android:shadowRadius">2</item>
diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
index 69a2b5081b..8c0c1a5d68 100644
--- a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
+++ b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
@@ -49,7 +49,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
     super(context);
 
       Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.toShortString();
+      String          name            = recipient.getDisplayName(context);
       String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
       SpannableString spannableString = new SpannableString(introduction + " " +
                                                             context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index e35f6425b8..cc75f23a83 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -183,7 +183,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
   private void initializeProfileIcon(@NonNull Recipient recipient) {
     ImageView     icon          = findViewById(R.id.toolbar_icon);
-    String        name          = Optional.fromNullable(recipient.getName()).or(Optional.fromNullable(TextSecurePreferences.getProfileName(this))).or("");
+    String        name          = Optional.fromNullable(recipient.getDisplayName(this)).or(Optional.fromNullable(TextSecurePreferences.getProfileName(this))).or("");
     MaterialColor fallbackColor = recipient.getColor();
 
     if (fallbackColor == ContactColors.UNKNOWN_COLOR && !TextUtils.isEmpty(name)) {
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index e0d5ccdda6..a7b4bf806e 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -145,7 +145,7 @@ public class ConversationListItem extends RelativeLayout
 
     this.recipient.observeForever(this);
     if (highlightSubstring != null) {
-      String name = recipient.get().isLocalNumber() ? getContext().getString(R.string.note_to_self) : recipient.get().getName();
+      String name = recipient.get().isLocalNumber() ? getContext().getString(R.string.note_to_self) : recipient.get().getDisplayName(getContext());
 
       this.fromView.setText(SearchUtil.getHighlightedSpan(locale, () -> new StyleSpan(Typeface.BOLD), name, highlightSubstring));
     } else {
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 06370e554c..bba19a2ad4 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -499,7 +499,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
         if (failIfNotPush && !isPush) {
           results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_cannot_add_non_push_to_existing_group,
-                                                                 recipient.toShortString())));
+                                                                 recipient.getDisplayName(activity))));
         } else if (TextUtils.equals(TextSecurePreferences.getLocalNumber(activity), recipient.getE164().or(""))) {
           results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_youre_already_in_the_group)));
         } else {
diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
index 4f20df653a..b5fb8dcb8f 100644
--- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java
+++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
@@ -105,12 +105,7 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
         if (recipient.isLocalNumber()) {
           recipientStrings.add(context.getString(R.string.GroupMembersDialog_me));
         } else {
-          String name = recipient.toShortString();
-
-          if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-            name += " ~" + recipient.getProfileName();
-          }
-
+          String name = recipient.getDisplayName(context);
           recipientStrings.add(name);
         }
       }
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index c467e0768d..032e729159 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -139,9 +139,9 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
 
   private void initializeToolbar() {
     setSupportActionBar(this.toolbar);
-    getSupportActionBar().setTitle(recipient.get().toShortString());
+    getSupportActionBar().setTitle(recipient.get().getDisplayName(this));
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    this.recipient.observe(this, recipient -> getSupportActionBar().setTitle(recipient.toShortString()));
+    this.recipient.observe(this, recipient -> getSupportActionBar().setTitle(recipient.getDisplayName(this)));
   }
 
   public void onEnterMultiSelect() {
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index da42f06c7c..5a96cc3ac1 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -160,7 +160,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       }
 
       if      (mediaItem.outgoing)          getSupportActionBar().setTitle(getString(R.string.MediaPreviewActivity_you));
-      else if (mediaItem.recipient != null) getSupportActionBar().setTitle(mediaItem.recipient.toShortString());
+      else if (mediaItem.recipient != null) getSupportActionBar().setTitle(mediaItem.recipient.getDisplayName(this));
       else                                  getSupportActionBar().setTitle("");
 
       getSupportActionBar().setSubtitle(relativeTimeSpan);
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 746aa86d48..92e4b9eba5 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -17,7 +17,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
 
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
@@ -30,8 +29,6 @@ import androidx.preference.PreferenceCategory;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.telephony.PhoneNumberUtils;
-
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
@@ -228,7 +225,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     else                      this.avatar.setScaleType(ImageView.ScaleType.CENTER_CROP);
 
     this.avatar.setBackgroundColor(recipient.getColor().toActionBarColor(this));
-    this.toolbarLayout.setTitle(recipient.toShortString());
+    this.toolbarLayout.setTitle(recipient.getDisplayName(this));
     this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
   }
 
@@ -423,8 +420,9 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
         colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
 
-        aboutPreference.setTitle(formatRecipient(recipient));
-        aboutPreference.setSummary(recipient.getCustomLabel());
+        aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
+
+        aboutPreference.setSummary(recipient.resolve().getE164().or(""));
         aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
 
         if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
@@ -452,12 +450,6 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       }
     }
 
-    private @NonNull String formatRecipient(@NonNull Recipient recipient) {
-      if      (recipient.getE164().isPresent())  return PhoneNumberUtils.formatNumber(recipient.requireE164());
-      else if (recipient.getEmail().isPresent()) return recipient.requireEmail();
-      else                                       return "";
-    }
-
     private @NonNull String getRingtoneSummary(@NonNull Context context, @Nullable Uri ringtone) {
       if (ringtone == null) {
         return context.getString(R.string.preferences__default);
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index a30bc25d3c..b1e918fc64 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -445,7 +445,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     }
 
     private void setRecipientText(Recipient recipient) {
-      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.toShortString())));
+      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
       description.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 65b2514c74..8760195b27 100644
--- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -172,7 +172,7 @@ public class WebRtcCallActivity extends Activity {
       Permissions.with(this)
                  .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
                  .ifNecessary()
-                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString()),
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().getDisplayName(this)),
                                       R.drawable.ic_mic_solid_24, R.drawable.ic_videocam_white_48dp)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
                  .onAllGranted(() -> {
diff --git a/src/org/thoughtcrime/securesms/components/FromTextView.java b/src/org/thoughtcrime/securesms/components/FromTextView.java
index 69647ce668..47f31f1bd5 100644
--- a/src/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/src/org/thoughtcrime/securesms/components/FromTextView.java
@@ -43,7 +43,7 @@ public class FromTextView extends EmojiTextView {
   }
 
   public void setText(Recipient recipient, boolean read, @Nullable String suffix) {
-    String fromString = recipient.toShortString();
+    String fromString = recipient.getDisplayName(getContext());
 
     int typeface;
 
@@ -62,19 +62,6 @@ public class FromTextView extends EmojiTextView {
 
     if (recipient.isLocalNumber()) {
       builder.append(getContext().getString(R.string.note_to_self));
-    } else if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-      SpannableString profileName = new SpannableString(" (~" + recipient.getProfileName() + ") ");
-      profileName.setSpan(new CenterAlignedRelativeSizeSpan(0.75f), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      profileName.setSpan(new TypefaceSpan("sans-serif-light"), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      profileName.setSpan(new ForegroundColorSpan(ResUtil.getColor(getContext(), R.attr.conversation_list_item_subject_color)), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-      if (ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL){
-        builder.append(profileName);
-        builder.append(fromSpan);
-      } else {
-        builder.append(fromSpan);
-        builder.append(profileName);
-      }
     } else {
       builder.append(fromSpan);
     }
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 9ab2c5d786..63b6e2e602 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -190,7 +190,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
 
     authorView.setText(author.isLocalNumber() ? getContext().getString(R.string.QuoteView_you)
-                                              : author.toShortString());
+                                              : author.getDisplayName(getContext()));
 
     // We use the raw color resource because Android 4.x was struggling with tints here
     quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing));
diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
index 32f68520db..37e022be2d 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
@@ -19,7 +19,7 @@ public class InviteReminder extends Reminder {
                         final @NonNull Recipient recipient)
   {
     super(context.getString(R.string.reminder_header_invite_title),
-          context.getString(R.string.reminder_header_invite_text, recipient.toShortString()));
+          context.getString(R.string.reminder_header_invite_text, recipient.getDisplayName(context)));
 
     setDismissListener(v -> SignalExecutors.BOUNDED.execute(() -> {
       DatabaseFactory.getRecipientDatabase(context).setSeenInviteReminder(recipient.getId(), true);
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index 9faffb6d2f..8acc772428 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -124,7 +124,7 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
   }
 
   public void setUntrustedIdentity(Recipient personInfo, IdentityKey untrustedIdentity) {
-    String          name            = recipient.get().toShortString();
+    String          name            = recipient.get().getDisplayName(getContext());
     String          introduction    = String.format(getContext().getString(R.string.WebRtcCallScreen_new_safety_numbers), name, name);
     SpannableString spannableString = new SpannableString(introduction + " " + getContext().getString(R.string.WebRtcCallScreen_you_may_wish_to_verify_this_contact));
 
@@ -305,13 +305,13 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObs
             .diskCacheStrategy(DiskCacheStrategy.ALL)
             .into(this.photo);
 
-    this.name.setText(recipient.getName());
+    this.name.setText(recipient.getDisplayName(getContext()));
 
-    if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-      // TODO [greyson] This will need to change in UI PR?
-      this.phoneNumber.setText(recipient.requireE164() + " (~" + recipient.getProfileName() + ")");
-    } else {
+    if (recipient.getE164().isPresent()) {
       this.phoneNumber.setText(recipient.requireE164());
+      this.phoneNumber.setVisibility(View.VISIBLE);
+    } else {
+      this.phoneNumber.setVisibility(View.GONE);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactRepository.java b/src/org/thoughtcrime/securesms/contacts/ContactRepository.java
index cc4d1a5d2c..acc477bd03 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactRepository.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactRepository.java
@@ -32,6 +32,7 @@ public class ContactRepository {
 
   private final RecipientDatabase recipientDatabase;
   private final String            noteToSelfTitle;
+  private final Context           context;
 
   public static final String ID_COLUMN           = "id";
          static final String NAME_COLUMN         = "name";
@@ -77,6 +78,7 @@ public class ContactRepository {
   public ContactRepository(@NonNull Context context) {
     this.recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
     this.noteToSelfTitle   = context.getString(R.string.note_to_self);
+    this.context           = context.getApplicationContext();
   }
 
   @WorkerThread
@@ -87,7 +89,7 @@ public class ContactRepository {
 
     if (noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
       Recipient self        = Recipient.self();
-      boolean   nameMatch   = self.getDisplayName().toLowerCase().contains(query.toLowerCase());
+      boolean   nameMatch   = self.getDisplayName(context).toLowerCase().contains(query.toLowerCase());
       boolean   numberMatch = self.getE164().isPresent() && self.requireE164().contains(query);
       boolean   shouldAdd   = !nameMatch && !numberMatch;
 
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index bf4b6df906..6986b500d8 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -75,10 +75,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
     } else if (recipientId != null) {
       this.recipient = Recipient.live(recipientId);
       this.recipient.observeForever(this);
-
-      if (this.recipient.get().getName() != null) {
-        name = this.recipient.get().getName();
-      }
+      name = this.recipient.get().getDisplayName(getContext());
     }
 
     Recipient recipientSnapshot = recipient != null ? recipient.get() : null;
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
index 8b9d0f5010..19a1306236 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
@@ -182,7 +182,7 @@ public class ContactsCursorLoader extends CursorLoader {
       ThreadRecord threadRecord;
       while ((threadRecord = reader.getNext()) != null) {
         recentConversations.addRow(new Object[] { threadRecord.getRecipient().getId().serialize(),
-                                                  threadRecord.getRecipient().toShortString(),
+                                                  threadRecord.getRecipient().getDisplayName(getContext()),
                                                   threadRecord.getRecipient().requireStringId(),
                                                   ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
                                                   "",
diff --git a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
index 5f4734e59d..0070ce354d 100644
--- a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
+++ b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
@@ -18,6 +18,8 @@
 package org.thoughtcrime.securesms.contacts;
 
 import android.content.Context;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
 import android.telephony.PhoneNumberUtils;
 import android.text.Annotation;
@@ -185,8 +187,8 @@ public class RecipientsEditor extends AppCompatMultiAutoCompleteTextView {
         return false;
     }*/
 
-    public static CharSequence contactToToken(Recipient c) {
-      String name       = c.getName();
+    public static CharSequence contactToToken(@NonNull Context context, @NonNull Recipient c) {
+      String name       = c.getDisplayName(context);
       String number     = c.getE164().or(c.getEmail()).or("");
       SpannableString s = new SpannableString(RecipientsFormatter.formatNameAndNumber(name, number));
       int len           = s.length();
@@ -209,7 +211,7 @@ public class RecipientsEditor extends AppCompatMultiAutoCompleteTextView {
                 sb.append(", ");
             }
 
-            sb.append(contactToToken(c));
+            sb.append(contactToToken(mContext, c));
         }
 
         setText(sb);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 23701d81a9..04359e6381 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1014,9 +1014,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       @Override
       protected void onPostExecute(IconCompat icon) {
         Context context  = getApplicationContext();
-        String  name     = Optional.fromNullable(recipient.get().getName())
-                                  .or(Optional.fromNullable(recipient.get().getProfileName()))
-                                  .or(recipient.get().toShortString());
+        String  name     = recipient.get().getDisplayName(ConversationActivity.this);
 
         ShortcutInfoCompat shortcutInfo = new ShortcutInfoCompat.Builder(context, recipient.get().getId().serialize() + '-' + System.currentTimeMillis())
                                                                 .setShortLabel(name)
@@ -2808,7 +2806,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         String[] unverifiedNames = new String[unverifiedIdentities.size()];
 
         for (int i=0;i<unverifiedIdentities.size();i++) {
-          unverifiedNames[i] = Recipient.resolved(unverifiedIdentities.get(i).getRecipientId()).toShortString();
+          unverifiedNames[i] = Recipient.resolved(unverifiedIdentities.get(i).getRecipientId()).getDisplayName(ConversationActivity.this);
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ConversationActivity.this);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 5d3fcf2a30..f7b224d90e 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -153,7 +153,6 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   private   ConversationItemFooter     footer;
   private   ConversationItemFooter     stickerFooter;
   private   TextView                   groupSender;
-  private   TextView                   groupSenderProfileName;
   private   View                       groupSenderHolder;
   private   AvatarImageView            contactPhoto;
   private   AlertView                  alertView;
@@ -208,7 +207,6 @@ public class ConversationItem extends LinearLayout implements BindableConversati
     this.footer                  =            findViewById(R.id.conversation_item_footer);
     this.stickerFooter           =            findViewById(R.id.conversation_item_sticker_footer);
     this.groupSender             =            findViewById(R.id.group_message_sender);
-    this.groupSenderProfileName  =            findViewById(R.id.group_message_sender_profile);
     this.alertView               =            findViewById(R.id.indicators_parent);
     this.contactPhoto            =            findViewById(R.id.contact_photo);
     this.contactPhotoHolder      =            findViewById(R.id.contact_photo_container);
@@ -944,28 +942,17 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   @SuppressLint("SetTextI18n")
   private void setGroupMessageStatus(MessageRecord messageRecord, Recipient recipient) {
     if (groupThread && !messageRecord.isOutgoing()) {
-      this.groupSender.setText(recipient.toShortString());
-
-      if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-        this.groupSenderProfileName.setText("~" + recipient.getProfileName());
-        this.groupSenderProfileName.setVisibility(View.VISIBLE);
-      } else {
-        this.groupSenderProfileName.setText(null);
-        this.groupSenderProfileName.setVisibility(View.GONE);
-      }
+      this.groupSender.setText(recipient.getDisplayName(getContext()));
     }
   }
 
   private void setGroupAuthorColor(@NonNull MessageRecord messageRecord) {
     if (shouldDrawBodyBubbleOutline(messageRecord)) {
       groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
-      groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
     } else if (hasSticker(messageRecord)) {
       groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
-      groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
     } else {
       groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color));
-      groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color));
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index a488e1774f..cf299d0c97 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -1,10 +1,9 @@
 package org.thoughtcrime.securesms.conversation;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.text.TextUtils;
+
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -19,7 +18,6 @@ import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class ConversationTitleView extends RelativeLayout {
@@ -106,19 +104,18 @@ public class ConversationTitleView extends RelativeLayout {
   }
 
   private void setRecipientTitle(Recipient recipient) {
-    if      (recipient.isGroup())           setGroupRecipientTitle(recipient);
+    if      (recipient.isGroup())                    setGroupRecipientTitle(recipient);
     else if (recipient.isLocalNumber())              setSelfTitle();
-    else if (TextUtils.isEmpty(recipient.getName())) setNonContactRecipientTitle(recipient);
-    else                                             setContactRecipientTitle(recipient);
+    else                                             setIndividualRecipientTitle(recipient);
   }
 
   private void setGroupRecipientTitle(Recipient recipient) {
     String localNumber = TextSecurePreferences.getLocalNumber(getContext());
 
-    this.title.setText(recipient.getName());
+    this.title.setText(recipient.getDisplayName(getContext()));
     this.subtitle.setText(Stream.of(recipient.getParticipants())
                                 .filterNot(Recipient::isLocalNumber)
-                                .map(Recipient::toShortString)
+                                .map(r -> r.getDisplayName(getContext()))
                                 .collect(Collectors.joining(", ")));
 
     this.subtitle.setVisibility(View.VISIBLE);
@@ -129,29 +126,11 @@ public class ConversationTitleView extends RelativeLayout {
     this.subtitleContainer.setVisibility(View.GONE);
   }
 
-  @SuppressLint("SetTextI18n")
-  private void setNonContactRecipientTitle(Recipient recipient) {
-    this.title.setText(Util.getFirstNonEmpty(recipient.getE164().orNull(), recipient.getUuid().orNull()));
-
-    if (TextUtils.isEmpty(recipient.getProfileName())) {
-      this.subtitle.setText(null);
-      this.subtitle.setVisibility(View.GONE);
-    } else {
-      this.subtitle.setText("~" + recipient.getProfileName());
-      this.subtitle.setVisibility(View.VISIBLE);
-    }
-  }
-
-  private void setContactRecipientTitle(Recipient recipient) {
-    this.title.setText(recipient.getName());
-
-    if (TextUtils.isEmpty(recipient.getCustomLabel())) {
-      this.subtitle.setText(null);
-      this.subtitle.setVisibility(View.GONE);
-    } else {
-      this.subtitle.setText(recipient.getCustomLabel());
-      this.subtitle.setVisibility(View.VISIBLE);
-    }
+  private void setIndividualRecipientTitle(Recipient recipient) {
+    final String displayName = recipient.getDisplayName(getContext());
+    this.title.setText(displayName);
+    this.subtitle.setText(null);
+    this.subtitle.setVisibility(View.GONE);
   }
 
   private void updateVerifiedSubtitleVisibility() {
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index d2c12e87a4..3f2f3e7c31 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -317,7 +317,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
             String  messageSound    = cursor.getString(cursor.getColumnIndexOrThrow("notification"));
             Uri     messageSoundUri = messageSound != null ? Uri.parse(messageSound) : null;
             int     vibrateState    = cursor.getInt(cursor.getColumnIndexOrThrow("vibrate"));
-            String  displayName     = NotificationChannels.getChannelDisplayNameFor(context, systemName, profileName, address);
+            String  displayName     = NotificationChannels.getChannelDisplayNameFor(context, systemName, profileName, null, address);
             boolean vibrateEnabled  = vibrateState == 0 ? TextSecurePreferences.isNotificationVibrateEnabled(context) : vibrateState == 1;
 
             if (GroupUtil.isEncodedGroup(address)) {
diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
index f09523d3c7..5509211c9f 100644
--- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -96,32 +96,32 @@ public abstract class MessageRecord extends DisplayRecord {
     } else if (isGroupQuit() && isOutgoing()) {
       return new SpannableString(context.getString(R.string.MessageRecord_left_group));
     } else if (isGroupQuit()) {
-      return new SpannableString(context.getString(R.string.ConversationItem_group_action_left, getIndividualRecipient().toShortString()));
+      return new SpannableString(context.getString(R.string.ConversationItem_group_action_left, getIndividualRecipient().getDisplayName(context)));
     } else if (isIncomingCall()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_s_called_you, getIndividualRecipient().toShortString()));
+      return new SpannableString(context.getString(R.string.MessageRecord_s_called_you, getIndividualRecipient().getDisplayName(context)));
     } else if (isOutgoingCall()) {
       return new SpannableString(context.getString(R.string.MessageRecord_you_called));
     } else if (isMissedCall()) {
       return new SpannableString(context.getString(R.string.MessageRecord_missed_call));
     } else if (isJoined()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().toShortString()));
+      return new SpannableString(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().getDisplayName(context)));
     } else if (isExpirationTimerUpdate()) {
       int seconds = (int)(getExpiresIn() / 1000);
       if (seconds <= 0) {
         return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_disabled_disappearing_messages))
-                            : new SpannableString(context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, getIndividualRecipient().toShortString()));
+                            : new SpannableString(context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, getIndividualRecipient().getDisplayName(context)));
       }
       String time = ExpirationUtil.getExpirationDisplayValue(context, seconds);
       return isOutgoing() ? new SpannableString(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time))
-                          : new SpannableString(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, getIndividualRecipient().toShortString(), time));
+                          : new SpannableString(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, getIndividualRecipient().getDisplayName(context), time));
     } else if (isIdentityUpdate()) {
-      return new SpannableString(context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, getIndividualRecipient().toShortString()));
+      return new SpannableString(context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, getIndividualRecipient().getDisplayName(context)));
     } else if (isIdentityVerified()) {
-      if (isOutgoing()) return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified, getIndividualRecipient().toShortString()));
-      else              return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device, getIndividualRecipient().toShortString()));
+      if (isOutgoing()) return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified, getIndividualRecipient().getDisplayName(context)));
+      else              return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device, getIndividualRecipient().getDisplayName(context)));
     } else if (isIdentityDefault()) {
-      if (isOutgoing()) return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified, getIndividualRecipient().toShortString()));
-      else              return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device, getIndividualRecipient().toShortString()));
+      if (isOutgoing()) return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified, getIndividualRecipient().getDisplayName(context)));
+      else              return new SpannableString(context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device, getIndividualRecipient().getDisplayName(context)));
     }
 
     return new SpannableString(getBody());
diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
index 09b16f1ae2..181051fdfe 100644
--- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
@@ -83,7 +83,7 @@ public class SmsMessageRecord extends MessageRecord {
     } else if (isEndSession() && isOutgoing()) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
     } else if (isEndSession()) {
-      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset_s, getIndividualRecipient().toShortString()));
+      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset_s, getIndividualRecipient().getDisplayName(context)));
     } else if (SmsDatabase.Types.isUnsupportedMessageType(type)) {
       return emphasisAdded(context.getString(R.string.SmsMessageRecord_this_message_could_not_be_processed_because_it_was_sent_from_a_newer_version));
     } else if (SmsDatabase.Types.isInvalidMessageType(type)) {
diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index 1ba78cb37a..0331712fda 100644
--- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -101,7 +101,7 @@ public class ThreadRecord extends DisplayRecord {
     } else if (SmsDatabase.Types.isMissedCall(type)) {
       return emphasisAdded(context.getString(org.thoughtcrime.securesms.R.string.ThreadRecord_missed_call));
     } else if (SmsDatabase.Types.isJoinedType(type)) {
-      return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal, getRecipient().toShortString()));
+      return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal, getRecipient().getDisplayName(context)));
     } else if (SmsDatabase.Types.isExpirationTimerUpdate(type)) {
       int seconds = (int)(getExpiresIn() / 1000);
       if (seconds <= 0) {
@@ -111,7 +111,7 @@ public class ThreadRecord extends DisplayRecord {
       return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time));
     } else if (SmsDatabase.Types.isIdentityUpdate(type)) {
       if (getRecipient().isGroup()) return emphasisAdded(context.getString(R.string.ThreadRecord_safety_number_changed));
-      else                                   return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, getRecipient().toShortString()));
+      else                                   return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, getRecipient().getDisplayName(context)));
     } else if (SmsDatabase.Types.isIdentityVerified(type)) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_you_marked_verified));
     } else if (SmsDatabase.Types.isIdentityDefault(type)) {
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 30c54e5457..63f4c9be4d 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -130,7 +130,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
       Optional<VerifiedMessage>                 verifiedMessage = getVerifiedMessage(recipient, identityRecord);
 
       out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient),
-                                  Optional.fromNullable(recipient.getName()),
+                                  Optional.of(recipient.getDisplayName(context)),
                                   getAvatar(recipient.getContactUri()),
                                   Optional.fromNullable(recipient.getColor().serialize()),
                                   verifiedMessage,
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
index d07c0e31e6..ea2954ec5f 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
@@ -131,7 +131,7 @@ public class LongMessageActivity extends PassphraseRequiredActionBarActivity {
         getSupportActionBar().setTitle(getString(R.string.LongMessageActivity_your_message));
       } else {
         Recipient recipient = message.get().getMessageRecord().getRecipient();
-        String    name      = Util.getFirstNonEmpty(recipient.getName(), recipient.getProfileName(), recipient.getE164().orNull(), recipient.getEmail().orNull()) ;
+        String    name      = recipient.getDisplayName(this);
         getSupportActionBar().setTitle(getString(R.string.LongMessageActivity_message_from_s, name));
       }
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
index 909fd6cc84..c480fda6df 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
@@ -39,9 +39,7 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
     String toolbarTitle;
 
     if (recipient != null) {
-      String name = Optional.fromNullable(recipient.getName())
-                     .or(Optional.fromNullable(recipient.getProfileName()))
-                     .or(recipient.toShortString());
+      String name = recipient.getDisplayName(context);
       toolbarTitle = context.getString(R.string.MediaPickerActivity_send_to, name);
     } else {
       toolbarTitle = "";
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index f6a1945d4f..79e70a1770 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -704,8 +704,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
     } else if (recipient.isLocalNumber()) {
       composeText.setHint(getString(R.string.note_to_self), null);
     } else {
-      String displayName = Util.getFirstNonEmpty(recipient.getName(), recipient.getProfileName(), recipient.getE164().orNull(), recipient.getEmail().orNull());
-      composeText.setHint(getString(R.string.MediaSendActivity_message_to_s, displayName), null);
+      composeText.setHint(getString(R.string.MediaSendActivity_message_to_s, recipient.getDisplayName(this)), null);
     }
 
   }
diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
index 4c6f245a64..6353a41715 100644
--- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
@@ -39,7 +39,7 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
 
   protected CharSequence getStyledMessage(@NonNull Recipient recipient, @Nullable CharSequence message) {
     SpannableStringBuilder builder = new SpannableStringBuilder();
-    builder.append(Util.getBoldedString(recipient.toShortString()));
+    builder.append(Util.getBoldedString(recipient.getDisplayName(context)));
     builder.append(": ");
     builder.append(message == null ? "" : message);
 
diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index 218cb67a29..5050a5b875 100644
--- a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -47,7 +47,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
   public void setMostRecentSender(Recipient recipient) {
     if (privacy.isDisplayContact()) {
       setContentText(context.getString(R.string.MessageNotifier_most_recent_from_s,
-                                       recipient.toShortString()));
+                                       recipient.getDisplayName(context)));
     }
 
     if (recipient.getNotificationChannel() != null) {
@@ -67,7 +67,7 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu
     if (privacy.isDisplayMessage()) {
       messageBodies.add(getStyledMessage(sender, body));
     } else if (privacy.isDisplayContact()) {
-      messageBodies.add(Util.getBoldedString(sender.toShortString()));
+      messageBodies.add(Util.getBoldedString(sender.getDisplayName(context)));
     }
 
     if (privacy.isDisplayContact() && sender.getContactUri() != null) {
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
index 22faedb384..7d71a5f54b 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
@@ -125,11 +125,18 @@ public class NotificationChannels {
   /**
    * @return A name suitable to be displayed as the notification channel title.
    */
-  public static @NonNull String getChannelDisplayNameFor(@NonNull Context context, @Nullable String systemName, @Nullable String profileName, @NonNull String address) {
+  public static @NonNull String getChannelDisplayNameFor(@NonNull Context context,
+                                                         @Nullable String systemName,
+                                                         @Nullable String profileName,
+                                                         @Nullable String username,
+                                                         @NonNull String address)
+  {
     if (!TextUtils.isEmpty(systemName)) {
       return systemName;
     } else if (!TextUtils.isEmpty(profileName)) {
       return profileName;
+    } else if (!TextUtils.isEmpty(username)) {
+      return username;
     } else if (!TextUtils.isEmpty(address)) {
       return address;
     } else {
@@ -147,7 +154,7 @@ public class NotificationChannels {
     VibrateState vibrateState     = recipient.getMessageVibrate();
     boolean      vibrationEnabled = vibrateState == VibrateState.DEFAULT ? TextSecurePreferences.isNotificationVibrateEnabled(context) : vibrateState == VibrateState.ENABLED;
     Uri          messageRingtone  = recipient.getMessageRingtone() != null ? recipient.getMessageRingtone() : getMessageRingtone(context);
-    String       displayName      = getChannelDisplayNameFor(context, recipient.getName(), recipient.getProfileName(), recipient.getSmsAddress().or(""));
+    String       displayName      = recipient.getDisplayName(context);
 
     return createChannelFor(context, generateChannelIdFor(recipient), displayName, messageRingtone, vibrationEnabled);
   }
@@ -384,7 +391,7 @@ public class NotificationChannels {
     }
 
     NotificationChannel channel = new NotificationChannel(recipient.getNotificationChannel(),
-                                                          getChannelDisplayNameFor(context, recipient.getName(), recipient.getProfileName(), recipient.getSmsAddress().or("")),
+                                                          recipient.getDisplayName(context),
                                                           NotificationManager.IMPORTANCE_HIGH);
     channel.setGroup(CATEGORY_MESSAGES);
     notificationManager.createNotificationChannel(channel);
diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index fba001bb62..7622677c0c 100644
--- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -66,7 +66,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     setChannelId(channelId != null ? channelId : NotificationChannels.getMessagesChannel(context));
 
     if (privacy.isDisplayContact()) {
-      setContentTitle(recipient.toShortString());
+      setContentTitle(recipient.getDisplayName(context));
 
       if (recipient.getContactUri() != null) {
         addPerson(recipient.getContactUri().toString());
@@ -111,7 +111,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
     if (privacy.isDisplayContact() && threadRecipients.isGroup()) {
-      stringBuilder.append(Util.getBoldedString(individualRecipient.toShortString() + ": "));
+      stringBuilder.append(Util.getBoldedString(individualRecipient.getDisplayName(context) + ": "));
     }
 
     if (privacy.isDisplayMessage()) {
@@ -203,7 +203,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     SpannableStringBuilder stringBuilder = new SpannableStringBuilder();
 
     if (privacy.isDisplayContact() && threadRecipient.isGroup()) {
-      stringBuilder.append(Util.getBoldedString(individualRecipient.toShortString() + ": "));
+      stringBuilder.append(Util.getBoldedString(individualRecipient.getDisplayName(context) + ": "));
     }
 
     if (privacy.isDisplayMessage()) {
diff --git a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
index 9e66a6e637..9ff069209f 100644
--- a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
+++ b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
@@ -63,7 +63,7 @@ public class BlockedContactListItem extends RelativeLayout implements RecipientF
     final TextView        nameView          = this.nameView;
 
     contactPhotoImage.setAvatar(glideRequests, recipient, false);
-    nameView.setText(recipient.toShortString());
+    nameView.setText(recipient.getDisplayName(getContext()));
   }
 
   public Recipient getRecipient() {
diff --git a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
index e0c92fe160..6aaa831bdd 100644
--- a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
+++ b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
@@ -40,7 +40,7 @@ public class UnknownSenderView extends FrameLayout {
 
     new AlertDialog.Builder(getContext())
         .setIconAttribute(R.attr.dialog_alert_icon)
-        .setTitle(getContext().getString(R.string.UnknownSenderView_block_s, recipient.toShortString()))
+        .setTitle(getContext().getString(R.string.UnknownSenderView_block_s, recipient.getDisplayName(context)))
         .setMessage(R.string.UnknownSenderView_blocked_contacts_will_no_longer_be_able_to_send_you_messages_or_call_you)
         .setPositiveButton(R.string.UnknownSenderView_block, (dialog, which) -> {
           new AsyncTask<Void, Void, Void>() {
@@ -66,7 +66,7 @@ public class UnknownSenderView extends FrameLayout {
 
     new AlertDialog.Builder(getContext())
         .setIconAttribute(R.attr.dialog_info_icon)
-        .setTitle(getContext().getString(R.string.UnknownSenderView_share_profile_with_s, recipient.toShortString()))
+        .setTitle(getContext().getString(R.string.UnknownSenderView_share_profile_with_s, recipient.getDisplayName(context)))
         .setMessage(R.string.UnknownSenderView_the_easiest_way_to_share_your_profile_information_is_to_add_the_sender_to_your_contacts)
         .setPositiveButton(R.string.UnknownSenderView_share_profile, (dialog, which) -> {
           new AsyncTask<Void, Void, Void>() {
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index ae9be23f52..2a2010f22c 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.phonenumbers.NumberUtil;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -294,12 +295,12 @@ public class Recipient {
     return contactUri;
   }
 
-  public @Nullable String getName() {
+  public @Nullable String getName(@NonNull Context context) {
     if (this.name == null && groupId != null && GroupUtil.isMmsGroup(groupId)) {
       List<String> names = new LinkedList<>();
 
       for (Recipient recipient : participants) {
-        names.add(recipient.toShortString());
+        names.add(recipient.getDisplayName(context));
       }
 
       return Util.join(names, ", ");
@@ -308,18 +309,21 @@ public class Recipient {
     return this.name;
   }
 
-  public @NonNull String getDisplayName() {
-    String name = getName();
-    if (!TextUtils.isEmpty(name)) {
-      return name;
-    }
+  public @NonNull String getDisplayName(@NonNull Context context) {
+    return Util.getFirstNonEmpty(getName(context),
+                                 getProfileName(),
+                                 getUsername(),
+                                 e164,
+                                 email,
+                                 context.getString(R.string.Recipient_unknown));
+  }
 
-    String profileName = getProfileName();
-    if (!TextUtils.isEmpty(profileName)) {
-      return profileName;
+  private @NonNull String getUsername() {
+    if (FeatureFlags.USERNAMES) {
+      // TODO [greyson] Replace with actual username
+      return "@caycepollard";
     }
-
-    return getSmsAddress().or("");
+    return "";
   }
 
   public @NonNull MaterialColor getColor() {
@@ -480,10 +484,6 @@ public class Recipient {
     return new ArrayList<>(participants);
   }
 
-  public @NonNull String toShortString() {
-    return Optional.fromNullable(getName()).or(getE164()).or(getEmail()).or("");
-  }
-
   public @NonNull Drawable getFallbackContactPhotoDrawable(Context context, boolean inverted) {
     return getFallbackContactPhoto().asDrawable(context, getColor().toAvatarColor(context), inverted);
   }
diff --git a/src/org/thoughtcrime/securesms/service/DirectShareService.java b/src/org/thoughtcrime/securesms/service/DirectShareService.java
index 2c5c54349e..334c4e5855 100644
--- a/src/org/thoughtcrime/securesms/service/DirectShareService.java
+++ b/src/org/thoughtcrime/securesms/service/DirectShareService.java
@@ -50,7 +50,7 @@ public class DirectShareService extends ChooserTargetService {
 
       while ((record = reader.getNext()) != null) {
           Recipient recipient = Recipient.resolved(record.getRecipient().getId());
-          String    name      = recipient.toShortString();
+          String    name      = recipient.getDisplayName(this);
 
           Bitmap avatar;
 
diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
index 76b5a62440..cb04f5d9ce 100644
--- a/src/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -35,10 +35,10 @@ public class CommunicationActions {
     Permissions.with(activity)
         .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
         .ifNecessary()
-        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera, recipient.toShortString()),
+        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera, recipient.getDisplayName(activity)),
                              R.drawable.ic_mic_solid_24,
                              R.drawable.ic_videocam_white_48dp)
-        .withPermanentDenialDialog(activity.getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.toShortString()))
+        .withPermanentDenialDialog(activity.getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.getDisplayName(activity)))
         .onAllGranted(() -> {
           Intent intent = new Intent(activity, WebRtcCallService.class);
           intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL);
diff --git a/src/org/thoughtcrime/securesms/util/FeatureFlags.java b/src/org/thoughtcrime/securesms/util/FeatureFlags.java
index 704ee96ca1..fa9bbf71c8 100644
--- a/src/org/thoughtcrime/securesms/util/FeatureFlags.java
+++ b/src/org/thoughtcrime/securesms/util/FeatureFlags.java
@@ -10,4 +10,7 @@ public class FeatureFlags {
 
   /** UUID-related stuff that shouldn't be activated until the user-facing launch. */
   public static final boolean UUIDS = false;
+
+  /** Usernames. */
+  public static final boolean USERNAMES = false;
 }
diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/src/org/thoughtcrime/securesms/util/GroupUtil.java
index ff18659590..c22f3e033a 100644
--- a/src/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/src/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -117,7 +117,7 @@ public class GroupUtil {
 
     public String toString(Recipient sender) {
       StringBuilder description = new StringBuilder();
-      description.append(context.getString(R.string.MessageRecord_s_updated_group, sender.toShortString()));
+      description.append(context.getString(R.string.MessageRecord_s_updated_group, sender.getDisplayName(context)));
 
       if (groupContext == null) {
         return description.toString();
@@ -160,7 +160,7 @@ public class GroupUtil {
       String result = "";
 
       for (int i=0;i<recipients.size();i++) {
-        result += recipients.get(i).toShortString();
+        result += recipients.get(i).getDisplayName(context);
 
       if (i != recipients.size() -1 )
         result += ", ";
diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/src/org/thoughtcrime/securesms/util/IdentityUtil.java
index 136904d85a..d9c9e0343b 100644
--- a/src/org/thoughtcrime/securesms/util/IdentityUtil.java
+++ b/src/org/thoughtcrime/securesms/util/IdentityUtil.java
@@ -231,11 +231,11 @@ public class IdentityUtil {
     if (recipients.isEmpty()) return null;
 
     if (recipients.size() == 1) {
-      String name = recipients.get(0).toShortString();
+      String name = recipients.get(0).getDisplayName(context);
       return context.getString(resourceOne, name);
     } else {
-      String firstName  = recipients.get(0).toShortString();
-      String secondName = recipients.get(1).toShortString();
+      String firstName  = recipients.get(0).getDisplayName(context);
+      String secondName = recipients.get(1).getDisplayName(context);
 
       if (recipients.size() == 2) {
         return context.getString(resourceTwo, firstName, secondName);
diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
index 4e6cbec944..e0db8112ec 100644
--- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
+++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
@@ -105,7 +105,7 @@ public class SelectedRecipientsAdapter extends BaseAdapter {
     TextView    phone  = (TextView)    v.findViewById(R.id.phone);
     ImageButton delete = (ImageButton) v.findViewById(R.id.delete);
 
-    name.setText(p.getName());
+    name.setText(p.getDisplayName(v.getContext()));
     phone.setText(p.getE164().or(""));
     delete.setVisibility(modifiable ? View.VISIBLE : View.GONE);
     delete.setOnClickListener(new View.OnClickListener() {
diff --git a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
index dfd799b4ed..b3527534ec 100644
--- a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
@@ -46,7 +46,7 @@ public class CallNotificationBuilder {
                                                                .setSmallIcon(R.drawable.ic_call_secure_white_24dp)
                                                                .setContentIntent(pendingIntent)
                                                                .setOngoing(true)
-                                                               .setContentTitle(recipient.getName());
+                                                               .setContentTitle(recipient.getDisplayName(context));
 
     if (type == TYPE_INCOMING_CONNECTING) {
       builder.setContentText(context.getString(R.string.CallNotificationBuilder_connecting));