From 693a82f133e39e31d91d872c49ab4321dfcd1b90 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 18 Jan 2022 12:16:53 -0500
Subject: [PATCH] Fix crash blocking a group after leaving it.

---
 .../org/thoughtcrime/securesms/recipients/RecipientUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2cc0599bd3..c3166f36be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
@@ -152,7 +152,7 @@ public class RecipientUtil {
 
     recipient = recipient.resolve();
 
-    if (recipient.isGroup() && recipient.getGroupId().get().isPush()) {
+    if (recipient.isGroup() && recipient.getGroupId().get().isPush() && recipient.isActiveGroup()) {
       GroupManager.leaveGroupFromBlockOrMessageRequest(context, recipient.getGroupId().get().requirePush());
     }