From 55d0db8c46c9f41870927c40b832c11e90f9d37c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Mon, 28 Aug 2017 17:37:10 -0400
Subject: [PATCH] Disable profile-key sending with feature flag

// FREEBIE
---
 Signal/src/Profiles/OWSProfileManager.m | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m
index 52cf696b0..cf5d820a7 100644
--- a/Signal/src/Profiles/OWSProfileManager.m
+++ b/Signal/src/Profiles/OWSProfileManager.m
@@ -1367,9 +1367,19 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
                       messageSender:(OWSMessageSender *)messageSender
                             success:(void (^)())successHandler
 {
+    AssertIsOnMainThread();
 
     OWSProfileKeyMessage *message =
         [[OWSProfileKeyMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:thread];
+
+    BOOL isFeatureEnabled = NO;
+    if (!isFeatureEnabled) {
+        DDLogWarn(@"%@ skipping sending profile-key message because the feature is not yet fully available.", self.tag);
+        [OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread];
+        successHandler();
+        return;
+    }
+
     [messageSender sendMessage:message
         success:^{
             DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.tag, thread);