From ea4ac9db30acac270512bacacba5ede1e2d28844 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 22 Jun 2018 09:40:32 -0700 Subject: [PATCH] Fixed issue where self-sends didn't auto download. 1) There was an issue where we wouldn't auto-download group syncs. 2) There was another issue where we didn't show the download controls for messages you sent yourself. Fixed #7920 --- src/org/thoughtcrime/securesms/ConversationItem.java | 2 +- src/org/thoughtcrime/securesms/util/AttachmentUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index fd310e9084..6544a10516 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -413,7 +413,7 @@ public class ConversationItem extends LinearLayout } private void setMediaAttributes(MessageRecord messageRecord) { - boolean showControls = !messageRecord.isFailed() && (!messageRecord.isOutgoing() || messageRecord.isPending()); + boolean showControls = !messageRecord.isFailed(); if (hasSharedContact(messageRecord)) { sharedContactStub.get().setVisibility(VISIBLE); diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java index d9107476eb..5755782441 100644 --- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -106,7 +106,7 @@ public class AttachmentUtil { try (Cursor messageCursor = DatabaseFactory.getMmsDatabase(context).getMessage(attachment.getMmsId())) { final MessageRecord message = DatabaseFactory.getMmsDatabase(context).readerFor(messageCursor).getNext(); - if (message == null || !message.getRecipient().isSystemContact()) { + if (message == null || (!message.getRecipient().isSystemContact() && !message.isOutgoing() && !Util.isOwnNumber(context, message.getRecipient().getAddress()))) { return true; } }