From f140f054e53bf88d5bd4e00383985b32d8b9f844 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Thu, 23 Jul 2020 12:33:17 -0300
Subject: [PATCH] Ignore typing indicators from blocked group members.

---
 .../thoughtcrime/securesms/jobs/PushProcessMessageJob.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 35f7b95e4f..c1c8bbc7d5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -1781,12 +1781,14 @@ public final class PushProcessMessageJob extends BaseJob {
     } else if (content.getCallMessage().isPresent()) {
       return sender.isBlocked();
     } else if (content.getTypingMessage().isPresent()) {
+      if (sender.isBlocked()) {
+        return true;
+      }
+
       if (content.getTypingMessage().get().getGroupId().isPresent()) {
         GroupId   groupId        = GroupId.push(content.getTypingMessage().get().getGroupId().get());
         Recipient groupRecipient = Recipient.externalGroup(context, groupId);
         return groupRecipient.isBlocked() || !groupRecipient.isActiveGroup();
-      } else {
-        return sender.isBlocked();
       }
     }