Enable conversation colors.

7 years ago · 8910f1f65a
parent ae84528dc3
commit 8910f1f65a
2 changed files with 0 additions and 4 deletions
--- 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) {
--- 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