From 8910f1f65a56b0066e73bbb12361165ebc6a6d9b Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 24 Sep 2018 15:22:00 -0400
Subject: [PATCH] Enable conversation colors.

---
 .../ThreadSettings/OWSConversationSettingsViewController.m      | 2 --
 SignalServiceKit/src/TSConstants.h                              | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index d601e1345..bafb30ed5 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -285,7 +285,6 @@ const CGFloat kIconViewLength = 24;
                                  [weakSelf showMediaGallery];
                              }]];
 
-#ifdef CONVERSATION_COLORS_ENABLED
     [mainSection addItem:[OWSTableItem
                              itemWithCustomCellBlock:^{
                                  NSString *colorName = self.thread.conversationColorName;
@@ -299,7 +298,6 @@ const CGFloat kIconViewLength = 24;
                              actionBlock:^{
                                  [weakSelf showColorPicker];
                              }]];
-#endif
 
     if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing
         && !self.hasExistingContact) {
diff --git a/SignalServiceKit/src/TSConstants.h b/SignalServiceKit/src/TSConstants.h
index 375f09609..391c514be 100644
--- a/SignalServiceKit/src/TSConstants.h
+++ b/SignalServiceKit/src/TSConstants.h
@@ -17,8 +17,6 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
 
 #define textSecureHTTPTimeOut 10
 
-//#define CONVERSATION_COLORS_ENABLED
-
 #define kLegalTermsUrlString @"https://signal.org/legal/"
 #define SHOW_LEGAL_TERMS_LINK