Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when getting update body on main thread.

Browse Source
This commit is contained in:
Cody Henthorne
2021-09-21 11:17:31 -04:00
committed by GitHub
parent e2dbaa605b
commit 5175375483
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -1055,7 +1055,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
mediaThumbnailStub.require().setDownloadClickListener(downloadClickListener);
mediaThumbnailStub.require().setOnLongClickListener(passthroughClickListener);
mediaThumbnailStub.require().setOnClickListener(passthroughClickListener);
mediaThumbnailStub.require().showShade(TextUtils.isEmpty(messageRecord.getDisplayBody(getContext())) && !hasExtraText(messageRecord));
mediaThumbnailStub.require().showShade(messageRecord.isDisplayBodyEmpty(getContext()) && !hasExtraText(messageRecord));
if (!messageRecord.isOutgoing()) {
mediaThumbnailStub.require().setConversationColor(getDefaultBubbleColor(hasWallpaper));
@@ -1166,7 +1166,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
}
if (!TextUtils.isEmpty(current.getDisplayBody(getContext()))) {
if (!current.isDisplayBodyEmpty(getContext())) {
bottomStart = 0;
bottomEnd = 0;
}
@@ -1194,7 +1194,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
private void setSharedContactCorners(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
if (TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))){
if (messageRecord.isDisplayBodyEmpty(getContext())){
if (isSingularMessage(current, previous, next, isGroupThread) || isEndOfMessageCluster(current, next, isGroupThread)) {
sharedContactStub.get().setSingularStyle();
} else if (current.isOutgoing()) {
@@ -1414,9 +1414,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
private ConversationItemFooter getActiveFooter(@NonNull MessageRecord messageRecord) {
if (hasNoBubble(messageRecord) && stickerFooter != null) {
return stickerFooter;
} else if (hasSharedContact(messageRecord) && TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))) {
} else if (hasSharedContact(messageRecord) && messageRecord.isDisplayBodyEmpty(getContext())) {
return sharedContactStub.get().getFooter();
} else if (hasOnlyThumbnail(messageRecord) && TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))) {
} else if (hasOnlyThumbnail(messageRecord) && messageRecord.isDisplayBodyEmpty(getContext())) {
return mediaThumbnailStub.require().getFooter();
} else {
return footer;