empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix NPE in ComposeText.

Browse source
This commit is contained in:
Cody Henthorne 2021-04-14 16:33:01 -04:00
parent e27089157d
commit 8d6d8019fe
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
View file

@ -40,6 +40,7 @@ import org.thoughtcrime.securesms.util.StringUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.util.List; import java.util.List;
import java.util.Objects;
import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER; import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;
@ -84,13 +85,13 @@ public class ComposeText extends EmojiEditText {
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (!TextUtils.isEmpty(hint)) { if (getLayout() != null && !TextUtils.isEmpty(hint)) {
if (!TextUtils.isEmpty(subHint)) { if (!TextUtils.isEmpty(subHint)) {
setHint(new SpannableStringBuilder().append(ellipsizeToWidth(hint)) setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(hint))
.append("\n") .append("\n")
.append(ellipsizeToWidth(subHint))); .append(ellipsizeToWidth(subHint)));
} else { } else {
setHint(ellipsizeToWidth(hint)); setHintWithChecks(ellipsizeToWidth(hint));
} }
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
@ -160,14 +161,14 @@ public class ComposeText extends EmojiEditText {
} }
if (this.subHint != null) { if (this.subHint != null) {
super.setHint(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint)) setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint))
.append("\n") .append("\n")
.append(ellipsizeToWidth(this.subHint))); .append(ellipsizeToWidth(this.subHint)));
} else { } else {
super.setHint(ellipsizeToWidth(this.hint)); setHintWithChecks(ellipsizeToWidth(this.hint));
} }
super.setHint(hint); setHintWithChecks(hint);
} }
public void appendInvite(String invite) { public void appendInvite(String invite) {
@ -264,6 +265,14 @@ public class ComposeText extends EmojiEditText {
addTextChangedListener(mentionValidatorWatcher); addTextChangedListener(mentionValidatorWatcher);
} }
private void setHintWithChecks(@Nullable CharSequence newHint) {
if (getLayout() == null || Objects.equals(getHint(), newHint)) {
return;
}
setHint(newHint);
}
private boolean changeSelectionForPartialMentions(@NonNull Spanned spanned, int selectionStart, int selectionEnd) { private boolean changeSelectionForPartialMentions(@NonNull Spanned spanned, int selectionStart, int selectionEnd) {
Annotation[] annotations = spanned.getSpans(0, spanned.length(), Annotation.class); Annotation[] annotations = spanned.getSpans(0, spanned.length(), Annotation.class);
for (Annotation annotation : annotations) { for (Annotation annotation : annotations) {