From 60e366e98afb3065c5f4d86678d328fcb0060082 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Fri, 8 Jul 2022 14:34:52 -0400 Subject: [PATCH] Fix delete group from message request state bug. Fixes #12193 --- .../securesms/jobs/MultiDeviceMessageRequestResponseJob.java | 4 ++-- .../securesms/messages/MessageContentProcessor.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java index b698e17f3d..0a206fc0bc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceMessageRequestResponseJob.java @@ -101,8 +101,8 @@ public class MultiDeviceMessageRequestResponseJob extends BaseJob { SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender(); Recipient recipient = Recipient.resolved(threadRecipient); - if (!recipient.hasServiceId()) { - Log.i(TAG, "Queued for recipient without ServiceId"); + if (!recipient.isGroup() && !recipient.hasServiceId()) { + Log.i(TAG, "Queued for non-group recipient without ServiceId"); return; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java index 65c7eac4f6..d51de77b70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java @@ -1102,7 +1102,7 @@ public final class MessageContentProcessor { if (response.getPerson().isPresent()) { recipient = Recipient.externalPush(response.getPerson().get()); } else if (response.getGroupId().isPresent()) { - GroupId groupId = GroupId.v1(response.getGroupId().get()); + GroupId groupId = GroupId.push(response.getGroupId().get()); recipient = Recipient.externalPossiblyMigratedGroup(groupId); } else { warn("Message request response was missing a thread recipient! Skipping.");