feature gate color syncing

// FREEBIE
pull/1/head
Michael Kirk 7 years ago
parent a66c88e3cf
commit f0175c0b6f

@ -281,9 +281,7 @@ const CGFloat kIconViewLength = 24;
[weakSelf showMediaGallery]; [weakSelf showMediaGallery];
}]]; }]];
#ifdef CONVERSATION_COLORS_ENABLED
//#define SHOW_CONVERSATION_COLORS_UI
#ifdef SHOW_CONVERSATION_COLORS_UI
[mainSection addItem:[OWSTableItem [mainSection addItem:[OWSTableItem
itemWithCustomCellBlock:^{ itemWithCustomCellBlock:^{
NSString *colorName = self.thread.conversationColorName; NSString *colorName = self.thread.conversationColorName;

@ -34,7 +34,9 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration
OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new]; OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new];
[contactBuilder setName:signalAccount.contact.fullName]; [contactBuilder setName:signalAccount.contact.fullName];
[contactBuilder setNumber:signalAccount.recipientId]; [contactBuilder setNumber:signalAccount.recipientId];
#ifdef CONVERSATION_COLORS_ENABLED
[contactBuilder setColor:conversationColorName]; [contactBuilder setColor:conversationColorName];
#endif
if (recipientIdentity != nil) { if (recipientIdentity != nil) {
OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new]; OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];

@ -26,7 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
[groupBuilder setId:group.groupId]; [groupBuilder setId:group.groupId];
[groupBuilder setName:group.groupName]; [groupBuilder setName:group.groupName];
[groupBuilder setMembersArray:group.groupMemberIds]; [groupBuilder setMembersArray:group.groupMemberIds];
#ifdef CONVERSATION_COLORS_ENABLED
[groupBuilder setColor:groupThread.conversationColorName]; [groupBuilder setColor:groupThread.conversationColorName];
#endif
NSData *avatarPng; NSData *avatarPng;
if (group.groupImage) { if (group.groupImage) {

@ -17,6 +17,8 @@ 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

Loading…
Cancel
Save