Fix issue with typing indicators in blocked groups.

signalapp · Jun 10, 2020 · 7642b7c · 7642b7c
1 parent e12ea60
commit 7642b7c
Showing 1 changed file with 8 additions and 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
@@ -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;