From af4faaa60191b4a043b387e0f186f9ad94d1903a Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Sat, 1 Apr 2017 11:25:14 -0400
Subject: [PATCH] Filter incoming messages using the blacklist.

// FREEBIE
---
 src/Messages/TSMessagesManager.m | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Messages/TSMessagesManager.m b/src/Messages/TSMessagesManager.m
index 4ea23fc6d..af1af9cfb 100644
--- a/src/Messages/TSMessagesManager.m
+++ b/src/Messages/TSMessagesManager.m
@@ -24,6 +24,7 @@
 #import "OWSSyncGroupsMessage.h"
 #import "TSAccountManager.h"
 #import "TSAttachmentStream.h"
+#import "TSBlockingManager.h"
 #import "TSCall.h"
 #import "TSContactThread.h"
 #import "TSDatabaseView.h"
@@ -37,7 +38,6 @@
 #import "TextSecureKitEnv.h"
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/SessionCipher.h>
-#import "TSBlockingManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -157,6 +157,14 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert([NSThread isMainThread]);
 
     DDLogInfo(@"%@ received envelope: %@", self.tag, [self descriptionForEnvelope:envelope]);
+
+    // TODO: Can we trust envelope.source to be properly formatted?
+    BOOL isEnvelopeBlocked = [_blockingManager.blockedPhoneNumbers containsObject:envelope.source];
+    if (isEnvelopeBlocked) {
+        DDLogInfo(@"%@ ignoring blocked envelope: %@", self.tag, envelope.source);
+        return;
+    }
+
     @try {
         switch (envelope.type) {
             case OWSSignalServiceProtosEnvelopeTypeCiphertext: {