From 8965388d05466332dd9c4577dac585a2054f0b32 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 8 Oct 2020 14:04:00 -0400 Subject: [PATCH] Fix rendering of remote-deleted view-once messages. --- .../securesms/conversation/ConversationItem.java | 2 +- .../org/thoughtcrime/securesms/database/ThreadDatabase.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index df74b7ea9..949824712 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -652,7 +652,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati { boolean showControls = !messageRecord.isFailed(); - if (isViewOnceMessage(messageRecord)) { + if (isViewOnceMessage(messageRecord) && !messageRecord.isRemoteDelete()) { revealableStub.get().setVisibility(VISIBLE); if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 911c97de0..d7235a304 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -1220,10 +1220,10 @@ public class ThreadDatabase extends Database { return Extra.forMessageRequest(); } - if (record.isViewOnce()) { - return Extra.forViewOnce(); - } else if (record.isRemoteDelete()) { + if (record.isRemoteDelete()) { return Extra.forRemoteDelete(); + } else if (record.isViewOnce()) { + return Extra.forViewOnce(); } else if (record.isMms() && ((MmsMessageRecord) record).getSlideDeck().getStickerSlide() != null) { StickerSlide slide = Objects.requireNonNull(((MmsMessageRecord) record).getSlideDeck().getStickerSlide()); return Extra.forSticker(slide.getEmoji());