oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable conversation colors.

This commit is contained in:
Matthew Chen 2018-09-24 15:22:00 -04:00
parent ae84528dc3
commit 8910f1f65a
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
View File

@ -285,7 +285,6 @@ const CGFloat kIconViewLength = 24;
[weakSelf showMediaGallery]; [weakSelf showMediaGallery];
}]]; }]];
#ifdef CONVERSATION_COLORS_ENABLED
[mainSection addItem:[OWSTableItem [mainSection addItem:[OWSTableItem
itemWithCustomCellBlock:^{ itemWithCustomCellBlock:^{
NSString *colorName = self.thread.conversationColorName; NSString *colorName = self.thread.conversationColorName;
@ -299,7 +298,6 @@ const CGFloat kIconViewLength = 24;
actionBlock:^{ actionBlock:^{
[weakSelf showColorPicker]; [weakSelf showColorPicker];
}]]; }]];
#endif
if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing
&& !self.hasExistingContact) { && !self.hasExistingContact) {

2
SignalServiceKit/src/TSConstants.h
View File

@ -17,8 +17,6 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
#define textSecureHTTPTimeOut 10 #define textSecureHTTPTimeOut 10
//#define CONVERSATION_COLORS_ENABLED
#define kLegalTermsUrlString @"https://signal.org/legal/" #define kLegalTermsUrlString @"https://signal.org/legal/"
#define SHOW_LEGAL_TERMS_LINK #define SHOW_LEGAL_TERMS_LINK