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

Clean up proto utils.

Browse Source
This commit is contained in:
Matthew Chen 2018-10-05 16:17:32 -04:00
parent d9c8a218bc
commit 7ef39bf258
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
SignalServiceKit/src/Protocols/ProtoUtils.m
View File

@ -13,32 +13,37 @@ NS_ASSUME_NONNULL_BEGIN
@implementation ProtoUtils
#pragma mark - Dependencies
+ (id<ProfileManagerProtocol>)profileManager {
return SSKEnvironment.shared.profileManager;
}
+ (OWSAES256Key *)localProfileKey
{
return self.profileManager.localProfileKey;
}
#pragma mark -
+ (BOOL)shouldMessageHaveLocalProfileKey:(TSThread *)thread recipientId:(NSString *_Nullable)recipientId
{
OWSAssertDebug(thread);
id<ProfileManagerProtocol> profileManager = SSKEnvironment.shared.profileManager;
// For 1:1 threads, we want to include the profile key IFF the
// contact is in the whitelist.
//
// For Group threads, we want to include the profile key IFF the
// recipient OR the group is in the whitelist.
if (recipientId.length > 0 && [profileManager isUserInProfileWhitelist:recipientId]) {
if (recipientId.length > 0 && [self.profileManager isUserInProfileWhitelist:recipientId]) {
return YES;
} else if ([profileManager isThreadInProfileWhitelist:thread]) {
} else if ([self.profileManager isThreadInProfileWhitelist:thread]) {
return YES;
}
return NO;
}
+ (OWSAES256Key *)localProfileKey
{
id<ProfileManagerProtocol> profileManager = SSKEnvironment.shared.profileManager;
return profileManager.localProfileKey;
}
+ (void)addLocalProfileKeyIfNecessary:(TSThread *)thread
recipientId:(NSString *_Nullable)recipientId
dataMessageBuilder:(SSKProtoDataMessageBuilder *)dataMessageBuilder
@ -52,10 +57,9 @@ NS_ASSUME_NONNULL_BEGIN
if (recipientId.length > 0) {
// Once we've shared our profile key with a user (perhaps due to being
// a member of a whitelisted group), make sure they're whitelisted.
id<ProfileManagerProtocol> profileManager = SSKEnvironment.shared.profileManager;
// FIXME PERF avoid this dispatch. It's going to happen for *each* recipient in a group message.
dispatch_async(dispatch_get_main_queue(), ^{
[profileManager addUserToProfileWhitelist:recipientId];
[self.profileManager addUserToProfileWhitelist:recipientId];
});
}
}
@ -81,10 +85,9 @@ NS_ASSUME_NONNULL_BEGIN
// Once we've shared our profile key with a user (perhaps due to being
// a member of a whitelisted group), make sure they're whitelisted.
id<ProfileManagerProtocol> profileManager = SSKEnvironment.shared.profileManager;
// FIXME PERF avoid this dispatch. It's going to happen for *each* recipient in a group message.
dispatch_async(dispatch_get_main_queue(), ^{
[profileManager addUserToProfileWhitelist:recipientId];
[self.profileManager addUserToProfileWhitelist:recipientId];
});
}
}