From 7c134a6c9dabdee52f5b91b66d38f985e2c79431 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 27 Aug 2021 13:24:47 -0400 Subject: [PATCH] Fix issue where group leave failed to send in announcement group. --- .../securesms/jobs/PushGroupSendJob.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index 0650dae3d..1a848ed37 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -173,12 +173,6 @@ public final class PushGroupSendJob extends PushSendJob { throw new MmsException("No GV1 messages can be sent anymore!"); } - Optional groupRecord = DatabaseFactory.getGroupDatabase(context).getGroup(groupRecipient.requireGroupId()); - - if (groupRecord.isPresent() && groupRecord.get().isAnnouncementGroup() && !groupRecord.get().isAdmin(Recipient.self())) { - throw new MmsException("Non-admins cannot send messages in announcement groups!"); - } - try { log(TAG, String.valueOf(message.getSentTimeMillis()), "Sending message: " + messageId + ", Recipient: " + message.getRecipient().getId() + ", Thread: " + threadId + ", Attachments: " + buildAttachmentString(message.getAttachments())); @@ -327,6 +321,12 @@ public final class PushGroupSendJob extends PushSendJob { throw new UndeliverableMessageException("Messages can no longer be sent to V1 groups!"); } } else { + Optional groupRecord = DatabaseFactory.getGroupDatabase(context).getGroup(groupRecipient.requireGroupId()); + + if (groupRecord.isPresent() && groupRecord.get().isAnnouncementGroup() && !groupRecord.get().isAdmin(Recipient.self())) { + throw new UndeliverableMessageException("Non-admins cannot send messages in announcement groups!"); + } + SignalServiceDataMessage.Builder builder = SignalServiceDataMessage.newBuilder() .withTimestamp(message.getSentTimeMillis());