mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash when getLayout() is null.

fork-5.53.8
Lucio Maciel 2021-08-13 18:39:06 -03:00 zatwierdzone przez GitHub
rodzic a5790edb2b
commit d4cabce876
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 8 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
Wyświetl plik

@ -153,7 +153,7 @@ public class EmojiTextView extends AppCompatTextView {
@Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
CharSequence text = getText(); CharSequence text = getText();
if (!measureLastLine || text == null || text.length() == 0) { if (getLayout() == null || !measureLastLine || text == null || text.length() == 0) {
lastLineWidth = -1; lastLineWidth = -1;
} else { } else {
Layout layout = getLayout(); Layout layout = getLayout();
@ -175,7 +175,7 @@ public class EmojiTextView extends AppCompatTextView {
} }
public boolean isSingleLine() { public boolean isSingleLine() {
return getLayout().getLineCount() == 1; return getLayout() != null && getLayout().getLineCount() == 1;
} }
public void setOverflowText(@Nullable CharSequence overflowText) { public void setOverflowText(@Nullable CharSequence overflowText) {

7
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
Wyświetl plik

@ -387,7 +387,12 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
} }
} }
if (!updatingFooter && !isCaptionlessMms(messageRecord) && !isViewOnceMessage(messageRecord) && isFooterVisible(messageRecord, nextMessageRecord, groupThread)) { if (!updatingFooter &&
!isCaptionlessMms(messageRecord) &&
!isViewOnceMessage(messageRecord) &&
isFooterVisible(messageRecord, nextMessageRecord, groupThread) &&
bodyText.getLastLineWidth() > 0)
{
int footerWidth = footer.getMeasuredWidth(); int footerWidth = footer.getMeasuredWidth();
int availableWidth = getAvailableMessageBubbleWidth(bodyText); int availableWidth = getAvailableMessageBubbleWidth(bodyText);
if (bodyText.isSingleLine()) { if (bodyText.isSingleLine()) {