From 4d472fccd2c8f9fcbe2b451364ac9450153cc053 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 12 May 2021 20:06:03 -0400 Subject: [PATCH] Fix bugs with the bio preference in AppSettings. - Always show the profile name. - Pretty-print the phone number. - Show the correct avatar when none is set. --- .../components/settings/app/AppSettingsFragment.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index 9d171ec650..840b2ce32c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.components.settings.PreferenceViewHolder import org.thoughtcrime.securesms.components.settings.configure import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.mms.GlideApp +import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.util.FeatureFlags import org.thoughtcrime.securesms.util.MappingAdapter @@ -166,9 +167,9 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men itemView.setOnClickListener { model.onClick() } - titleView.text = model.recipient.getDisplayName(itemView.context) - summaryView.text = model.recipient.requireE164() - avatarView.setAvatar(GlideApp.with(itemView), model.recipient, false, true) + titleView.text = model.recipient.profileName.toString() + summaryView.text = PhoneNumberFormatter.prettyPrint(model.recipient.requireE164()) + avatarView.setRecipient(Recipient.self()) titleView.visibility = View.VISIBLE summaryView.visibility = View.VISIBLE