signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/syncConversationColors'

Browse Source
This commit is contained in:
Matthew Chen 2018-08-16 15:21:52 -04:00
commit e148ec7856
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SignalServiceKit/src/Devices/OWSContactsOutputStream.m
View File

@ -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,

2
SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
View File

@ -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) {