From 7642b7cc720951e482294053f2f56983842a5f6f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 10 Jun 2020 14:28:12 -0400
Subject: [PATCH] Fix issue with typing indicators in blocked groups.

---
 .../securesms/jobs/PushProcessMessageJob.java            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
index 296f43c6b0e..f12ad3834e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -1772,8 +1772,15 @@ private boolean shouldIgnore(@Nullable SignalServiceContent content)
       } else {
         return sender.isBlocked();
       }
-    } else if (content.getCallMessage().isPresent() || content.getTypingMessage().isPresent()) {
+    } else if (content.getCallMessage().isPresent()) {
       return sender.isBlocked();
+    } else if (content.getTypingMessage().isPresent()) {
+      if (content.getTypingMessage().get().getGroupId().isPresent()) {
+        GroupId groupId = GroupId.push(content.getTypingMessage().get().getGroupId().get());
+        return Recipient.externalGroup(context, groupId).isBlocked();
+      } else {
+        return sender.isBlocked();
+      }
     }
 
     return false;