Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-26 22:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash and bug with ellipsizing 'About' in Settings screen.

Browse Source 
Fixes #12895
Closes #12905
This commit is contained in:
Cody Henthorne
2023-05-17 13:35:27 -04:00
committed by Greyson Parrelli
parent aaebf029db
commit 99d3f9918f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
View File

@@ -366,7 +366,9 @@ public class EmojiTextView extends AppCompatTextView {
newContent.append(getText().subSequence(0, overflowStart).toString())
.append(ellipsized.subSequence(0, ellipsized.length()).toString());
TextUtils.copySpansFrom(getText(newContent.length() - 1), 0, newContent.length() - 1, Object.class, newContent, 0);
if (newContent.length() > 0) {
TextUtils.copySpansFrom(getText(newContent.length() - 1), 0, newContent.length() - 1, Object.class, newContent, 0);
}
newContent.append(Optional.ofNullable(overflowText).orElse(""));

7
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt
View File

@@ -13,6 +13,7 @@ import org.greenrobot.eventbus.ThreadMode
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.badges.BadgeImageView
import org.thoughtcrime.securesms.components.AvatarImageView
import org.thoughtcrime.securesms.components.emoji.EmojiTextView
import org.thoughtcrime.securesms.components.reminder.ExpiredBuildReminder
import org.thoughtcrime.securesms.components.reminder.Reminder
import org.thoughtcrime.securesms.components.reminder.ReminderView
@@ -321,10 +322,14 @@ class AppSettingsFragment : DSLSettingsFragment(
private class BioPreferenceViewHolder(itemView: View) : PreferenceViewHolder<BioPreference>(itemView) {
private val avatarView: AvatarImageView = itemView.findViewById(R.id.icon)
private val aboutView: TextView = itemView.findViewById(R.id.about)
private val aboutView: EmojiTextView = itemView.findViewById(R.id.about)
private val badgeView: BadgeImageView = itemView.findViewById(R.id.badge)
private val qrButton: View = itemView.findViewById(R.id.qr_button)
init {
aboutView.setOverflowText(" ")
}
override fun bind(model: BioPreference) {
super.bind(model)