Sync conversation colors.

7 years ago · 52be2127ff
parent a712a20da0
commit 52be2127ff
2 changed files with 0 additions and 4 deletions
--- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
@ -34,9 +34,7 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration
    SSKProtoContactDetailsBuilder *contactBuilder = [SSKProtoContactDetailsBuilder new];
    [contactBuilder setName:signalAccount.contact.fullName];
    [contactBuilder setNumber:signalAccount.recipientId];
-#ifdef CONVERSATION_COLORS_ENABLED
    [contactBuilder setColor:conversationColorName];
-#endif

    if (recipientIdentity != nil) {
        SSKProtoVerified *_Nullable verified = BuildVerifiedProtoWithRecipientId(recipientIdentity.recipientId,
--- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
@ -25,9 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
    [groupBuilder setId:group.groupId];
    [groupBuilder setName:group.groupName];
    [groupBuilder setMembers:group.groupMemberIds];
-#ifdef CONVERSATION_COLORS_ENABLED
    [groupBuilder setColor:groupThread.conversationColorName];
-#endif

    NSData *avatarPng;
    if (group.groupImage) {