From 418083d0c73c107ae0a0a884ee5d329da8e6b4f1 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 20 Oct 2022 11:42:14 -0400 Subject: [PATCH] Fix delete-for-everyone issue with stories. --- .../securesms/recipients/Recipient.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index af8c3eab32..ff6e729aa8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -979,22 +979,25 @@ public class Recipient { } public @NonNull RegisteredState getRegistered() { - if (isPushGroup()) return RegisteredState.REGISTERED; - else if (isMmsGroup()) return RegisteredState.NOT_REGISTERED; - - return registered; + if (isPushGroup() || isDistributionList()) { + return RegisteredState.REGISTERED; + } else if (isMmsGroup()) { + return RegisteredState.NOT_REGISTERED; + } else { + return registered; + } } public boolean isRegistered() { - return registered == RegisteredState.REGISTERED || isPushGroup(); + return getRegistered() == RegisteredState.REGISTERED; } public boolean isMaybeRegistered() { - return registered != RegisteredState.NOT_REGISTERED || isPushGroup(); + return getRegistered() != RegisteredState.NOT_REGISTERED; } public boolean isUnregistered() { - return registered == RegisteredState.NOT_REGISTERED && !isPushGroup(); + return getRegistered() == RegisteredState.NOT_REGISTERED; } public @Nullable String getNotificationChannel() {