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

Fix IndexOutOfBounds crash in ComposeText.onMeasure

Browse Source
This commit is contained in:
Alex Hart
2025-12-01 11:35:57 -04:00
committed by jeffrey-signal
parent 3ba120cc10
commit fbbcf30737
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
View File

@@ -57,6 +57,7 @@ import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;
public class ComposeText extends EmojiEditText {
private static final String TAG = Log.tag(ComposeText.class);
private static final char EMOJI_STARTER = ':';
private static final int MAX_QUERY_LENGTH = 64;
private static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
@@ -99,11 +100,21 @@ public class ComposeText extends EmojiEditText {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
try {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} catch (IndexOutOfBoundsException e) {
Log.w(TAG, "IndexOutOfBoundsException during onMeasure, retrying", e);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
if (getLayout() != null && !TextUtils.isEmpty(hint)) {
setHintWithChecks(ellipsizeToWidth(hint));
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
try {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} catch (IndexOutOfBoundsException e) {
Log.w(TAG, "IndexOutOfBoundsException during hint onMeasure, retrying", e);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
}
}