blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix rendering of remote-deleted view-once messages.

master
Greyson Parrelli 2020-10-08 14:04:00 -04:00
parent 58c4582f15
commit 8965388d05
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,7 +652,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
{ {
boolean showControls = !messageRecord.isFailed(); boolean showControls = !messageRecord.isFailed();
if (isViewOnceMessage(messageRecord)) { if (isViewOnceMessage(messageRecord) && !messageRecord.isRemoteDelete()) {
revealableStub.get().setVisibility(VISIBLE); revealableStub.get().setVisibility(VISIBLE);
if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE);

6
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View File

@ -1220,10 +1220,10 @@ public class ThreadDatabase extends Database {
return Extra.forMessageRequest(); return Extra.forMessageRequest();
} }
if (record.isViewOnce()) { if (record.isRemoteDelete()) {
return Extra.forViewOnce();
} else if (record.isRemoteDelete()) {
return Extra.forRemoteDelete(); return Extra.forRemoteDelete();
} else if (record.isViewOnce()) {
return Extra.forViewOnce();
} else if (record.isMms() && ((MmsMessageRecord) record).getSlideDeck().getStickerSlide() != null) { } else if (record.isMms() && ((MmsMessageRecord) record).getSlideDeck().getStickerSlide() != null) {
StickerSlide slide = Objects.requireNonNull(((MmsMessageRecord) record).getSlideDeck().getStickerSlide()); StickerSlide slide = Objects.requireNonNull(((MmsMessageRecord) record).getSlideDeck().getStickerSlide());
return Extra.forSticker(slide.getEmoji()); return Extra.forSticker(slide.getEmoji());