From a6d38623509567e6bd5987d900294d8de61f5938 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Wed, 30 Sep 2020 10:08:21 -0300
Subject: [PATCH] Ignore bad messages from blocked senders.

---
 .../thoughtcrime/securesms/jobs/PushProcessMessageJob.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 4a98b2809a..a78f191643 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushProcessMessageJob.java
@@ -455,6 +455,13 @@ public final class PushProcessMessageJob extends BaseJob {
   }
 
   private void handleExceptionMessage(@NonNull ExceptionMetadata e, @NonNull Optional<Long> smsMessageId) {
+    Recipient sender = Recipient.external(context, e.sender);
+
+    if (sender.isBlocked()) {
+      Log.w(TAG, "Ignoring exception content from blocked sender, message state:" + messageState);
+      return;
+    }
+
     switch (messageState) {
 
       case INVALID_VERSION: