From 428ab65d8ad87357309f2bf355620ab4fe5f6d93 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 24 Oct 2022 14:07:44 -0300 Subject: [PATCH] Prevent expiry timers from being sent to distribution lists. --- .../org/thoughtcrime/securesms/recipients/RecipientUtil.java | 2 +- .../java/org/thoughtcrime/securesms/sms/MessageSender.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java index 8ac34b8bc1..8796c7287d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java @@ -313,7 +313,7 @@ public class RecipientUtil { @WorkerThread public static boolean setAndSendUniversalExpireTimerIfNecessary(@NonNull Context context, @NonNull Recipient recipient, long threadId) { int defaultTimer = SignalStore.settings().getUniversalExpireTimer(); - if (defaultTimer == 0 || recipient.isGroup() || recipient.getExpiresInSeconds() != 0 || !recipient.isRegistered()) { + if (defaultTimer == 0 || recipient.isGroup() || recipient.isDistributionList() || recipient.getExpiresInSeconds() != 0 || !recipient.isRegistered()) { return false; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java index 8cdd864389..876e49e287 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java @@ -153,9 +153,8 @@ public class MessageSender { database.beginTransaction(); for (OutgoingSecureMediaMessage message : messages) { - long allocatedThreadId = threadDatabase.getOrCreateValidThreadId(message.getRecipient(), -1L, message.getDistributionType()); - Recipient recipient = message.getRecipient(); - long messageId = database.insertMessageOutbox(applyUniversalExpireTimerIfNecessary(context, recipient, message.stripAttachments(), allocatedThreadId), allocatedThreadId, false, insertListener); + long allocatedThreadId = threadDatabase.getOrCreateValidThreadId(message.getRecipient(), -1L, message.getDistributionType()); + long messageId = database.insertMessageOutbox(message.stripAttachments(), allocatedThreadId, false, insertListener); messageIds.add(messageId); threads.add(allocatedThreadId);